Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better

Display a message for EEPROM version mismatch
MarlinFirmware · Mar 4, 2017 · 20addc6 · 20addc6
2 parents 177ad24 + 8f4e4b1
commit 20addc6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
@@ -458,13 +458,16 @@ void Config_Postprocess() {
     uint16_t stored_checksum;
     EEPROM_READ(stored_checksum);
 
-    //  SERIAL_ECHOPAIR("Version: [", version);
-    //  SERIAL_ECHOPAIR("] Stored version: [", stored_ver);
-    //  SERIAL_CHAR(']');
-    //  SERIAL_EOL;
-
     // Version has to match or defaults are used
     if (strncmp(version, stored_ver, 3) != 0) {
+      if (stored_ver[0] != 'V') {
+        stored_ver[0] = '?';
+        stored_ver[1] = '\0';
+      }
+      SERIAL_ECHO_START;
+      SERIAL_ECHOPGM("EEPROM version mismatch ");
+      SERIAL_ECHOPAIR("(EEPROM=", stored_ver);
+      SERIAL_ECHOLNPGM(" Marlin=" EEPROM_VERSION ")");
       Config_ResetDefault();
     }
     else {