|
@@ -103,15 +103,15 @@ class AnycubicSerialClass : public Stream {
|
103
|
103
|
extern void serialEventRun(void) __attribute__((weak));
|
104
|
104
|
|
105
|
105
|
#define ANYCUBIC_SERIAL_PROTOCOL(x) (AnycubicSerial.print(x))
|
106
|
|
-#define ANYCUBIC_SERIAL_PROTOCOL_F(x,y) (AnycubicSerial.print(x,y))
|
|
106
|
+#define ANYCUBIC_SERIAL_PROTOCOL_F(x,y) (AnycubicSerial.print(x, y))
|
107
|
107
|
#define ANYCUBIC_SERIAL_PROTOCOLPGM(x) (AnycubicSerialprintPGM(PSTR(x)))
|
108
|
|
-#define ANYCUBIC_SERIAL_(x) (AnycubicSerial.print(x),AnycubicSerial.write('\n'))
|
109
|
|
-#define ANYCUBIC_SERIAL_PROTOCOLLN(x) (AnycubicSerial.print(x),AnycubicSerial.write('\r'),AnycubicSerial.write('\n'))
|
110
|
|
-#define ANYCUBIC_SERIAL_PROTOCOLLNPGM(x) (AnycubicSerialprintPGM(PSTR(x)),AnycubicSerial.write('\r'),AnycubicSerial.write('\n'))
|
|
108
|
+#define ANYCUBIC_SERIAL_(x) (AnycubicSerial.print(x), AnycubicSerial.write('\n'))
|
|
109
|
+#define ANYCUBIC_SERIAL_PROTOCOLLN(x) (AnycubicSerial.print(x), AnycubicSerial.write('\r'), AnycubicSerial.write('\n'))
|
|
110
|
+#define ANYCUBIC_SERIAL_PROTOCOLLNPGM(x) (AnycubicSerialprintPGM(PSTR(x)), AnycubicSerial.write('\r'), AnycubicSerial.write('\n'))
|
111
|
111
|
|
112
|
|
-#define ANYCUBIC_SERIAL_START() (AnycubicSerial.write('\r'),AnycubicSerial.write('\n'))
|
113
|
|
-#define ANYCUBIC_SERIAL_CMD_SEND(x) (AnycubicSerialprintPGM(PSTR(x)),AnycubicSerial.write('\r'),AnycubicSerial.write('\n'))
|
114
|
|
-#define ANYCUBIC_SERIAL_ENTER() (AnycubicSerial.write('\r'),AnycubicSerial.write('\n'))
|
|
112
|
+#define ANYCUBIC_SERIAL_START() (AnycubicSerial.write('\r'), AnycubicSerial.write('\n'))
|
|
113
|
+#define ANYCUBIC_SERIAL_CMD_SEND(x) (AnycubicSerialprintPGM(PSTR(x)), AnycubicSerial.write('\r'), AnycubicSerial.write('\n'))
|
|
114
|
+#define ANYCUBIC_SERIAL_ENTER() (AnycubicSerial.write('\r'), AnycubicSerial.write('\n'))
|
115
|
115
|
#define ANYCUBIC_SERIAL_SPACE() (AnycubicSerial.write(' '))
|
116
|
116
|
|
117
|
117
|
const char newErr[] PROGMEM = "ERR ";
|
|
@@ -130,14 +130,16 @@ const char newSucc[] PROGMEM = "OK";
|
130
|
130
|
#define ANYCUBIC_SERIAL_ECHOPGM(x) ANYCUBIC_SERIAL_PROTOCOLPGM(x)
|
131
|
131
|
#define ANYCUBIC_SERIAL_ECHO(x) ANYCUBIC_SERIAL_PROTOCOL(x)
|
132
|
132
|
|
133
|
|
-FORCE_INLINE void AnycubicSerialprintPGM(const char *str) {
|
134
|
|
- char ch = pgm_read_byte(str);
|
135
|
|
- while (ch) {
|
136
|
|
- AnycubicSerialClass::write(ch);
|
137
|
|
- ch = pgm_read_byte(++str);
|
138
|
|
- }
|
139
|
|
-}
|
140
|
|
-
|
141
|
133
|
#ifdef UBRR3H
|
|
134
|
+
|
142
|
135
|
extern AnycubicSerialClass AnycubicSerial;
|
|
136
|
+
|
|
137
|
+ FORCE_INLINE void AnycubicSerialprintPGM(const char *str) {
|
|
138
|
+ char ch = pgm_read_byte(str);
|
|
139
|
+ while (ch) {
|
|
140
|
+ AnycubicSerial.write(ch);
|
|
141
|
+ ch = pgm_read_byte(++str);
|
|
142
|
+ }
|
|
143
|
+ }
|
|
144
|
+
|
143
|
145
|
#endif
|