Procházet zdrojové kódy

Tweak parser warning

Scott Lahteine před 4 roky
rodič
revize
38873596ec

+ 2
- 3
Marlin/src/core/serial.h Zobrazit soubor

260
 #define SERIAL_ERROR_START()        serial_error_start()
260
 #define SERIAL_ERROR_START()        serial_error_start()
261
 #define SERIAL_EOL()                SERIAL_CHAR('\n')
261
 #define SERIAL_EOL()                SERIAL_CHAR('\n')
262
 
262
 
263
-#define SERIAL_ECHO_MSG(S)          do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPGM(S); }while(0)
264
-#define SERIAL_ERROR_MSG(S)         do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(S); }while(0)
263
+#define SERIAL_ECHO_MSG(V...)       do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
264
+#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPAIR(V); }while(0)
265
 
265
 
266
 #define SERIAL_ECHO_SP(C)           serial_spaces(C)
266
 #define SERIAL_ECHO_SP(C)           serial_spaces(C)
267
 
267
 
292
 void serial_spaces(uint8_t count);
292
 void serial_spaces(uint8_t count);
293
 
293
 
294
 void print_bin(const uint16_t val);
294
 void print_bin(const uint16_t val);
295
-
296
 void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
295
 void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
297
 
296
 
298
 inline void print_xyz(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
297
 inline void print_xyz(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {

+ 3
- 3
Marlin/src/gcode/gcode.cpp Zobrazit soubor

353
         case 800: parser.debug(); break;                          // G800: GCode Parser Test for G
353
         case 800: parser.debug(); break;                          // G800: GCode Parser Test for G
354
       #endif
354
       #endif
355
 
355
 
356
-      default: parser.unknown_command_error(); break;
356
+      default: parser.unknown_command_warning(); break;
357
     }
357
     }
358
     break;
358
     break;
359
 
359
 
856
         case 7219: M7219(); break;                                // M7219: Set LEDs, columns, and rows
856
         case 7219: M7219(); break;                                // M7219: Set LEDs, columns, and rows
857
       #endif
857
       #endif
858
 
858
 
859
-      default: parser.unknown_command_error(); break;
859
+      default: parser.unknown_command_warning(); break;
860
     }
860
     }
861
     break;
861
     break;
862
 
862
 
866
       #if ENABLED(WIFI_CUSTOM_COMMAND)
866
       #if ENABLED(WIFI_CUSTOM_COMMAND)
867
         if (wifi_custom_command(parser.command_ptr)) break;
867
         if (wifi_custom_command(parser.command_ptr)) break;
868
       #endif
868
       #endif
869
-      parser.unknown_command_error();
869
+      parser.unknown_command_warning();
870
   }
870
   }
871
 
871
 
872
   if (!no_ok) queue.ok_to_send();
872
   if (!no_ok) queue.ok_to_send();

+ 6
- 4
Marlin/src/gcode/parser.cpp Zobrazit soubor

333
 
333
 
334
 #endif // CNC_COORDINATE_SYSTEMS
334
 #endif // CNC_COORDINATE_SYSTEMS
335
 
335
 
336
-void GCodeParser::unknown_command_error() {
337
-  SERIAL_ECHO_START();
338
-  SERIAL_ECHOLNPAIR(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
336
+void GCodeParser::unknown_command_warning() {
337
+  SERIAL_ECHO_MSG(MSG_UNKNOWN_COMMAND, command_ptr, "\"");
339
 }
338
 }
340
 
339
 
341
 #if ENABLED(DEBUG_GCODE_PARSER)
340
 #if ENABLED(DEBUG_GCODE_PARSER)
351
     #else
350
     #else
352
       SERIAL_ECHOPAIR(" args: { ", command_args, " }");
351
       SERIAL_ECHOPAIR(" args: { ", command_args, " }");
353
     #endif
352
     #endif
354
-    if (string_arg) SERIAL_ECHOPAIR(" string: \"", string_arg, "\"");
353
+    if (string_arg) {
354
+      SERIAL_ECHOPAIR(" string: \"", string_arg);
355
+      SERIAL_CHAR('"');
356
+    }
355
     SERIAL_ECHOLNPGM("\n");
357
     SERIAL_ECHOLNPGM("\n");
356
     for (char c = 'A'; c <= 'Z'; ++c) {
358
     for (char c = 'A'; c <= 'Z'; ++c) {
357
       if (seen(c)) {
359
       if (seen(c)) {

+ 1
- 1
Marlin/src/gcode/parser.h Zobrazit soubor

366
 
366
 
367
   static inline feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
367
   static inline feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
368
 
368
 
369
-  void unknown_command_error();
369
+  void unknown_command_warning();
370
 
370
 
371
   // Provide simple value accessors with default option
371
   // Provide simple value accessors with default option
372
   static inline float    floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }
372
   static inline float    floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }

Loading…
Zrušit
Uložit