瀏覽代碼

[2.0.x] Fix compile errors (#9141)

* Update persistent_store_impl.cpp
* Remove define BYTE from serial functions since Arduino docs typically show 0 for the normal case.
Thomas Moore 7 年之前
父節點
當前提交
84de428d30

+ 4
- 5
Marlin/src/HAL/HAL_AVR/MarlinSerial.h 查看文件

@@ -75,7 +75,6 @@
75 75
 #define HEX 16
76 76
 #define OCT 8
77 77
 #define BIN 2
78
-#define BYTE 0
79 78
 
80 79
 #ifndef USBCON
81 80
   // We're using a ring buffer (I think), in which rx_buffer_head is the index of the
@@ -126,8 +125,8 @@
126 125
       FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); }
127 126
       FORCE_INLINE static void print(const char* str) { write(str); }
128 127
 
129
-      static void print(char, int = BYTE);
130
-      static void print(unsigned char, int = BYTE);
128
+      static void print(char, int = 0);
129
+      static void print(unsigned char, int = 0);
131 130
       static void print(int, int = DEC);
132 131
       static void print(unsigned int, int = DEC);
133 132
       static void print(long, int = DEC);
@@ -136,8 +135,8 @@
136 135
 
137 136
       static void println(const String& s);
138 137
       static void println(const char[]);
139
-      static void println(char, int = BYTE);
140
-      static void println(unsigned char, int = BYTE);
138
+      static void println(char, int = 0);
139
+      static void println(unsigned char, int = 0);
141 140
       static void println(int, int = DEC);
142 141
       static void println(unsigned int, int = DEC);
143 142
       static void println(long, int = DEC);

+ 4
- 5
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.h 查看文件

@@ -38,7 +38,6 @@
38 38
 #define HEX 16
39 39
 #define OCT 8
40 40
 #define BIN 2
41
-#define BYTE 0
42 41
 
43 42
 class MarlinSerialUSB {
44 43
 
@@ -65,8 +64,8 @@ public:
65 64
   static FORCE_INLINE void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); }
66 65
   static FORCE_INLINE void print(const char* str) { write(str); }
67 66
 
68
-  static void print(char, int = BYTE);
69
-  static void print(unsigned char, int = BYTE);
67
+  static void print(char, int = 0);
68
+  static void print(unsigned char, int = 0);
70 69
   static void print(int, int = DEC);
71 70
   static void print(unsigned int, int = DEC);
72 71
   static void print(long, int = DEC);
@@ -75,8 +74,8 @@ public:
75 74
 
76 75
   static void println(const String& s);
77 76
   static void println(const char[]);
78
-  static void println(char, int = BYTE);
79
-  static void println(unsigned char, int = BYTE);
77
+  static void println(char, int = 0);
78
+  static void println(unsigned char, int = 0);
80 79
   static void println(int, int = DEC);
81 80
   static void println(unsigned int, int = DEC);
82 81
   static void println(long, int = DEC);

+ 4
- 5
Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h 查看文件

@@ -39,7 +39,6 @@
39 39
 #define HEX 16
40 40
 #define OCT 8
41 41
 #define BIN 2
42
-#define BYTE 0
43 42
 
44 43
 // Define constants and variables for buffering incoming serial data.  We're
45 44
 // using a ring buffer (I think), in which rx_buffer_head is the index of the
@@ -106,8 +105,8 @@ public:
106 105
   FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); }
107 106
   FORCE_INLINE static void print(const char* str) { write(str); }
108 107
 
109
-  static void print(char, int = BYTE);
110
-  static void print(unsigned char, int = BYTE);
108
+  static void print(char, int = 0);
109
+  static void print(unsigned char, int = 0);
111 110
   static void print(int, int = DEC);
112 111
   static void print(unsigned int, int = DEC);
113 112
   static void print(long, int = DEC);
@@ -116,8 +115,8 @@ public:
116 115
 
117 116
   static void println(const String& s);
118 117
   static void println(const char[]);
119
-  static void println(char, int = BYTE);
120
-  static void println(unsigned char, int = BYTE);
118
+  static void println(char, int = 0);
119
+  static void println(unsigned char, int = 0);
121 120
   static void println(int, int = DEC);
122 121
   static void println(unsigned int, int = DEC);
123 122
   static void println(long, int = DEC);

+ 0
- 2
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.h 查看文件

@@ -77,8 +77,6 @@ public:
77 77
   #define HEX 16
78 78
   #define OCT 8
79 79
   #define BIN 2
80
-  #define BYTE 0
81
-
82 80
 
83 81
   void print_bin(uint32_t value, uint8_t num_digits) {
84 82
     uint32_t mask = 1 << (num_digits -1);

+ 0
- 1
Marlin/src/HAL/HAL_LPC1768/serial.h 查看文件

@@ -129,7 +129,6 @@ public:
129 129
   #define HEX 16
130 130
   #define OCT 8
131 131
   #define BIN 2
132
-  #define BYTE 0
133 132
 
134 133
   void print_bin(uint32_t value, uint8_t num_digits) {
135 134
     uint32_t mask = 1 << (num_digits -1);

+ 1
- 1
Marlin/src/module/configuration_store.h 查看文件

@@ -116,7 +116,7 @@ class MarlinSettings {
116 116
       );
117 117
       static bool size_error(const uint16_t size
118 118
         #if ADD_PORT_ARG
119
-          const int8_t port=-1
119
+          , const int8_t port=-1
120 120
         #endif
121 121
       );
122 122
     #endif

Loading…
取消
儲存