Преглед на файлове

Reverting changes to error messages on serial console

This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
Gina Häußge преди 9 години
родител
ревизия
ab246ab032
променени са 3 файла, в които са добавени 5 реда и са изтрити 8 реда
  1. 3
    4
      Marlin/Marlin_main.cpp
  2. 1
    2
      Marlin/configurator/config/language.h
  3. 1
    2
      Marlin/language.h

+ 3
- 4
Marlin/Marlin_main.cpp Целия файл

@@ -757,10 +757,9 @@ void get_command() {
757 757
         gcode_N = (strtol(strchr_pointer + 1, NULL, 10));
758 758
         if (gcode_N != gcode_LastN + 1 && strstr_P(command, PSTR("M110")) == NULL) {
759 759
           SERIAL_ERROR_START;
760
-          SERIAL_ERRORPGM(MSG_ERR_LINE_NO1);
761
-          SERIAL_ERROR(gcode_LastN + 1);
762
-          SERIAL_ERRORPGM(MSG_ERR_LINE_NO2);
763
-          SERIAL_ERRORLN(gcode_N);
760
+          SERIAL_ERRORPGM(MSG_ERR_LINE_NO);
761
+          SERIAL_ERRORLN(gcode_LastN);
762
+          //Serial.println(gcode_N);
764 763
           FlushSerialRequestResend();
765 764
           serial_count = 0;
766 765
           return;

+ 1
- 2
Marlin/configurator/config/language.h Целия файл

@@ -123,8 +123,7 @@
123 123
 #define MSG_PLANNER_BUFFER_BYTES            "  PlannerBufferBytes: "
124 124
 #define MSG_OK                              "ok"
125 125
 #define MSG_FILE_SAVED                      "Done saving file."
126
-#define MSG_ERR_LINE_NO1                    "Line Number out of sequence. Expected: "
127
-#define MSG_ERR_LINE_NO2                    " Got: "
126
+#define MSG_ERR_LINE_NO                     "Line Number is not Last Line Number+1, Last Line: "
128 127
 #define MSG_ERR_CHECKSUM_MISMATCH           "checksum mismatch, Last Line: "
129 128
 #define MSG_ERR_NO_CHECKSUM                 "No Checksum with line number, Last Line: "
130 129
 #define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "

+ 1
- 2
Marlin/language.h Целия файл

@@ -123,8 +123,7 @@
123 123
 #define MSG_PLANNER_BUFFER_BYTES            "  PlannerBufferBytes: "
124 124
 #define MSG_OK                              "ok"
125 125
 #define MSG_FILE_SAVED                      "Done saving file."
126
-#define MSG_ERR_LINE_NO1                    "Line Number out of sequence. Expected: "
127
-#define MSG_ERR_LINE_NO2                    " Got: "
126
+#define MSG_ERR_LINE_NO                     "Line Number is not Last Line Number+1, Last Line: "
128 127
 #define MSG_ERR_CHECKSUM_MISMATCH           "checksum mismatch, Last Line: "
129 128
 #define MSG_ERR_NO_CHECKSUM                 "No Checksum with line number, Last Line: "
130 129
 #define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "

Loading…
Отказ
Запис