From ab246ab032d1ea1706d03fb044429a8938271575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 4 May 2015 15:03:00 +0200
Subject: [PATCH] Reverting changes to error messages on serial console
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f52c9b71b486e7778d7fb44ea67fad6
---
Marlin/Marlin_main.cpp | 7 +++----
Marlin/configurator/config/language.h | 3 +--
Marlin/language.h | 3 +--
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 9541fc8a7a..759a0fea98 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -757,10 +757,9 @@ void get_command() {
gcode_N = (strtol(strchr_pointer + 1, NULL, 10));
if (gcode_N != gcode_LastN + 1 && strstr_P(command, PSTR("M110")) == NULL) {
SERIAL_ERROR_START;
- SERIAL_ERRORPGM(MSG_ERR_LINE_NO1);
- SERIAL_ERROR(gcode_LastN + 1);
- SERIAL_ERRORPGM(MSG_ERR_LINE_NO2);
- SERIAL_ERRORLN(gcode_N);
+ SERIAL_ERRORPGM(MSG_ERR_LINE_NO);
+ SERIAL_ERRORLN(gcode_LastN);
+ //Serial.println(gcode_N);
FlushSerialRequestResend();
serial_count = 0;
return;
diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h
index 02235aac70..40d8dbe663 100644
--- a/Marlin/configurator/config/language.h
+++ b/Marlin/configurator/config/language.h
@@ -123,8 +123,7 @@
#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define MSG_OK "ok"
#define MSG_FILE_SAVED "Done saving file."
-#define MSG_ERR_LINE_NO1 "Line Number out of sequence. Expected: "
-#define MSG_ERR_LINE_NO2 " Got: "
+#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
#define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "
diff --git a/Marlin/language.h b/Marlin/language.h
index 02235aac70..40d8dbe663 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -123,8 +123,7 @@
#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define MSG_OK "ok"
#define MSG_FILE_SAVED "Done saving file."
-#define MSG_ERR_LINE_NO1 "Line Number out of sequence. Expected: "
-#define MSG_ERR_LINE_NO2 " Got: "
+#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
#define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "
--
GitLab