From dcec7178d17445be1b4181131ab82645a6057042 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Jul 2017 21:30:46 -0500 Subject: [PATCH 1/2] Expose DISABLE_M503 option as a test option --- Marlin/Configuration.h | 4 ++-- Marlin/Marlin_main.cpp | 23 +++++++++++-------- Marlin/configuration_store.cpp | 2 +- Marlin/configuration_store.h | 2 +- .../Anet/A6/Configuration.h | 4 ++-- .../Anet/A8/Configuration.h | 4 ++-- .../CL-260/Configuration.h | 4 ++-- .../Cartesio/Configuration.h | 4 ++-- .../Felix/Configuration.h | 4 ++-- .../Felix/DUAL/Configuration.h | 4 ++-- .../FolgerTech-i3-2020/Configuration.h | 4 ++-- .../Hephestos/Configuration.h | 4 ++-- .../Hephestos_2/Configuration.h | 4 ++-- .../K8200/Configuration.h | 4 ++-- .../K8400/Configuration.h | 4 ++-- .../K8400/Dual-head/Configuration.h | 4 ++-- .../M150/Configuration.h | 4 ++-- .../RepRapWorld/Megatronics/Configuration.h | 4 ++-- .../RigidBot/Configuration.h | 4 ++-- .../SCARA/Configuration.h | 4 ++-- .../TAZ4/Configuration.h | 4 ++-- .../TinyBoy2/Configuration.h | 4 ++-- .../WITBOX/Configuration.h | 4 ++-- .../adafruit/ST7565/Configuration.h | 4 ++-- .../FLSUN/auto_calibrate/Configuration.h | 4 ++-- .../delta/FLSUN/kossel_mini/Configuration.h | 4 ++-- .../delta/generic/Configuration.h | 4 ++-- .../delta/kossel_mini/Configuration.h | 4 ++-- .../delta/kossel_pro/Configuration.h | 4 ++-- .../delta/kossel_xl/Configuration.h | 4 ++-- .../gCreate_gMax1.5+/Configuration.h | 4 ++-- .../makibox/Configuration.h | 4 ++-- .../tvrrug/Round2/Configuration.h | 4 ++-- .../wt150/Configuration.h | 4 ++-- 34 files changed, 78 insertions(+), 73 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 082d5a999..05e193f13 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -992,8 +992,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 98fb0e60b..f19a89818 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -9279,12 +9279,14 @@ inline void gcode_M502() { (void)settings.reset(); } -/** - * M503: print settings currently in memory - */ -inline void gcode_M503() { - (void)settings.report(!parser.boolval('S', true)); -} +#if DISABLED(DISABLE_M503) + /** + * M503: print settings currently in memory + */ + inline void gcode_M503() { + (void)settings.report(!parser.boolval('S', true)); + } +#endif #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) @@ -11022,9 +11024,12 @@ void process_next_command() { case 502: // M502: Revert to default settings gcode_M502(); break; - case 503: // M503: print settings currently in memory - gcode_M503(); - break; + + #if DISABLED(DISABLE_M503) + case 503: // M503: print settings currently in memory + gcode_M503(); + break; + #endif #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) case 540: // M540: Set abort on endstop hit for SD printing diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 840d6b88f..8dd5eedef 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -1051,7 +1051,7 @@ void MarlinSettings::postprocess() { #endif } - #if ENABLED(EEPROM_CHITCHAT) + #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503) report(); #endif diff --git a/Marlin/configuration_store.h b/Marlin/configuration_store.h index 23a716a94..99e951120 100644 --- a/Marlin/configuration_store.h +++ b/Marlin/configuration_store.h @@ -55,7 +55,7 @@ class MarlinSettings { static void report(bool forReplay=false); #else FORCE_INLINE - static void report(bool forReplay=false) { } + static void report(bool forReplay=false) { UNUSED(forReplay); } #endif private: diff --git a/Marlin/example_configurations/Anet/A6/Configuration.h b/Marlin/example_configurations/Anet/A6/Configuration.h index 4e954bae1..a05c5864a 100644 --- a/Marlin/example_configurations/Anet/A6/Configuration.h +++ b/Marlin/example_configurations/Anet/A6/Configuration.h @@ -1148,8 +1148,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Anet/A8/Configuration.h b/Marlin/example_configurations/Anet/A8/Configuration.h index 070121fa6..3cae7b59b 100644 --- a/Marlin/example_configurations/Anet/A8/Configuration.h +++ b/Marlin/example_configurations/Anet/A8/Configuration.h @@ -998,8 +998,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/CL-260/Configuration.h b/Marlin/example_configurations/CL-260/Configuration.h index a8cad55df..f10203a21 100644 --- a/Marlin/example_configurations/CL-260/Configuration.h +++ b/Marlin/example_configurations/CL-260/Configuration.h @@ -989,8 +989,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index ac543164c..1e195fff0 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -986,8 +986,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index a7dcb118c..c339a163c 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -970,8 +970,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 7904e3cc5..26cfe5774 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -970,8 +970,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h index 36ff1f2b4..ac0401873 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h @@ -992,8 +992,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index dfa01e944..a5d558f85 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -978,8 +978,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 63767298e..bcb676574 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -981,8 +981,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 4ecaf9c8c..6842ecf92 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -1017,8 +1017,8 @@ #define EEPROM_SETTINGS // K8200: uses EEPROM by default #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index c7b0db6b3..9a1dacf39 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -988,8 +988,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 68359941d..8f23d29f4 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -988,8 +988,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/M150/Configuration.h b/Marlin/example_configurations/M150/Configuration.h index c8043291a..5e99290d8 100644 --- a/Marlin/example_configurations/M150/Configuration.h +++ b/Marlin/example_configurations/M150/Configuration.h @@ -1015,8 +1015,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index e3a159955..7369f7ac8 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -988,8 +988,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 5473a3207..799ad46dc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -986,8 +986,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index d6a97d72e..e04d12e86 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -1000,8 +1000,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index bdf7d9419..0b2897bce 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -1007,8 +1007,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index b3f58f0cb..4d35c063a 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -1044,8 +1044,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index cb280b344..691abb497 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -978,8 +978,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 3b3cb2c4c..5b1dbf648 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -988,8 +988,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index 8426456df..6706efd51 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -1108,8 +1108,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 97ea09ca8..8e402bcb0 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -1110,8 +1110,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 2bc238b84..2f69a232e 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -1099,8 +1099,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index d2a21e3c9..9596a58c4 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -1102,8 +1102,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index d321556c0..621975602 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -1107,8 +1107,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index d9071e3f1..99271bf5f 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -1165,8 +1165,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h index 727d5ac43..cde1f7648 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h @@ -1004,8 +1004,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 3580a15eb..7992697df 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -991,8 +991,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 1eb267ccf..8a54d1734 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -983,8 +983,8 @@ //#define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index cc324f83e..9be759d37 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -994,8 +994,8 @@ #define EEPROM_SETTINGS #if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. + //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! + #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on. #endif // From cf96109056a303eda0bb45bdfc11f72bb884dfcd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Jul 2017 21:48:18 -0500 Subject: [PATCH 2/2] Implement the EEPROM_CHITCHAT option --- Marlin/configuration_store.cpp | 104 +++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 8dd5eedef..c86ba0859 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -655,10 +655,12 @@ void MarlinSettings::postprocess() { EEPROM_WRITE(final_crc); // Report storage size - SERIAL_ECHO_START(); - SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET)); - SERIAL_ECHOPAIR(" bytes; crc ", final_crc); - SERIAL_ECHOLNPGM(")"); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ECHO_START(); + SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET)); + SERIAL_ECHOPAIR(" bytes; crc ", final_crc); + SERIAL_ECHOLNPGM(")"); + #endif } #if ENABLED(UBL_SAVE_ACTIVE_ON_M500) @@ -689,10 +691,12 @@ void MarlinSettings::postprocess() { 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 ")"); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ECHO_START(); + SERIAL_ECHOPGM("EEPROM version mismatch "); + SERIAL_ECHOPAIR("(EEPROM=", stored_ver); + SERIAL_ECHOLNPGM(" Marlin=" EEPROM_VERSION ")"); + #endif reset(); } else { @@ -1004,20 +1008,24 @@ void MarlinSettings::postprocess() { #endif if (working_crc == stored_crc) { - postprocess(); + postprocess(); + #if ENABLED(EEPROM_CHITCHAT) SERIAL_ECHO_START(); SERIAL_ECHO(version); SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET)); SERIAL_ECHOPAIR(" bytes; crc ", working_crc); SERIAL_ECHOLNPGM(")"); + #endif } else { - SERIAL_ERROR_START(); - SERIAL_ERRORPGM("EEPROM CRC mismatch - (stored) "); - SERIAL_ERROR(stored_crc); - SERIAL_ERRORPGM(" != "); - SERIAL_ERROR(working_crc); - SERIAL_ERRORLNPGM(" (calculated)!"); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ERROR_START(); + SERIAL_ERRORPGM("EEPROM CRC mismatch - (stored) "); + SERIAL_ERROR(stored_crc); + SERIAL_ERRORPGM(" != "); + SERIAL_ERROR(working_crc); + SERIAL_ERRORLNPGM(" (calculated)!"); + #endif reset(); } @@ -1029,24 +1037,32 @@ void MarlinSettings::postprocess() { if (!ubl.sanity_check()) { SERIAL_EOL(); - ubl.echo_name(); - SERIAL_ECHOLNPGM(" initialized.\n"); + #if ENABLED(EEPROM_CHITCHAT) + ubl.echo_name(); + SERIAL_ECHOLNPGM(" initialized.\n"); + #endif } else { - SERIAL_PROTOCOLPGM("?Can't enable "); - ubl.echo_name(); - SERIAL_PROTOCOLLNPGM("."); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_PROTOCOLPGM("?Can't enable "); + ubl.echo_name(); + SERIAL_PROTOCOLLNPGM("."); + #endif ubl.reset(); } if (ubl.state.storage_slot >= 0) { load_mesh(ubl.state.storage_slot); - SERIAL_ECHOPAIR("Mesh ", ubl.state.storage_slot); - SERIAL_ECHOLNPGM(" loaded from storage."); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ECHOPAIR("Mesh ", ubl.state.storage_slot); + SERIAL_ECHOLNPGM(" loaded from storage."); + #endif } else { ubl.reset(); - SERIAL_ECHOLNPGM("UBL System reset()"); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ECHOLNPGM("UBL System reset()"); + #endif } #endif } @@ -1060,11 +1076,13 @@ void MarlinSettings::postprocess() { #if ENABLED(AUTO_BED_LEVELING_UBL) - void ubl_invalid_slot(const int s) { - SERIAL_PROTOCOLLNPGM("?Invalid slot."); - SERIAL_PROTOCOL(s); - SERIAL_PROTOCOLLNPGM(" mesh slots available."); - } + #if ENABLED(EEPROM_CHITCHAT) + void ubl_invalid_slot(const int s) { + SERIAL_PROTOCOLLNPGM("?Invalid slot."); + SERIAL_PROTOCOL(s); + SERIAL_PROTOCOLLNPGM(" mesh slots available."); + } + #endif int MarlinSettings::calc_num_meshes() { //obviously this will get more sophisticated once we've added an actual MAT @@ -1079,11 +1097,13 @@ void MarlinSettings::postprocess() { #if ENABLED(AUTO_BED_LEVELING_UBL) const int a = calc_num_meshes(); if (!WITHIN(slot, 0, a - 1)) { - ubl_invalid_slot(a); - SERIAL_PROTOCOLPAIR("E2END=", E2END); - SERIAL_PROTOCOLPAIR(" meshes_end=", meshes_end); - SERIAL_PROTOCOLLNPAIR(" slot=", slot); - SERIAL_EOL(); + #if ENABLED(EEPROM_CHITCHAT) + ubl_invalid_slot(a); + SERIAL_PROTOCOLPAIR("E2END=", E2END); + SERIAL_PROTOCOLPAIR(" meshes_end=", meshes_end); + SERIAL_PROTOCOLLNPAIR(" slot=", slot); + SERIAL_EOL(); + #endif return; } @@ -1094,7 +1114,9 @@ void MarlinSettings::postprocess() { // Write crc to MAT along with other data, or just tack on to the beginning or end - SERIAL_PROTOCOLLNPAIR("Mesh saved in slot ", slot); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_PROTOCOLLNPAIR("Mesh saved in slot ", slot); + #endif #else @@ -1110,7 +1132,9 @@ void MarlinSettings::postprocess() { const int16_t a = settings.calc_num_meshes(); if (!WITHIN(slot, 0, a - 1)) { - ubl_invalid_slot(a); + #if ENABLED(EEPROM_CHITCHAT) + ubl_invalid_slot(a); + #endif return; } @@ -1121,7 +1145,9 @@ void MarlinSettings::postprocess() { // Compare crc with crc from MAT, or read from end - SERIAL_PROTOCOLLNPAIR("Mesh loaded from slot ", slot); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_PROTOCOLLNPAIR("Mesh loaded from slot ", slot); + #endif #else @@ -1345,8 +1371,10 @@ void MarlinSettings::reset() { postprocess(); - SERIAL_ECHO_START(); - SERIAL_ECHOLNPGM("Hardcoded Default Settings Loaded"); + #if ENABLED(EEPROM_CHITCHAT) + SERIAL_ECHO_START(); + SERIAL_ECHOLNPGM("Hardcoded Default Settings Loaded"); + #endif } #if DISABLED(DISABLE_M503)