From 2d0d5eccd896e56ae4be3b9fc43445e54356dba8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Mar 2018 00:41:45 -0600 Subject: [PATCH 1/4] Move AUTO_REPORT_SD_STATUS to SDSUPPORT block --- Marlin/Configuration_adv.h | 10 +++++----- .../AlephObjects/TAZ4/Configuration_adv.h | 10 +++++----- .../example_configurations/Anet/A6/Configuration_adv.h | 10 +++++----- .../example_configurations/Anet/A8/Configuration_adv.h | 10 +++++----- .../BIBO/TouchX/Configuration_adv.h | 10 +++++----- .../BQ/Hephestos/Configuration_adv.h | 10 +++++----- .../BQ/Hephestos_2/Configuration_adv.h | 10 +++++----- .../BQ/WITBOX/Configuration_adv.h | 10 +++++----- .../Cartesio/Configuration_adv.h | 10 +++++----- .../Creality/CR-10/Configuration_adv.h | 10 +++++----- .../Creality/CR-10S/Configuration_adv.h | 10 +++++----- .../Creality/CR-10mini/Configuration_adv.h | 10 +++++----- .../Creality/Ender-2/Configuration_adv.h | 10 +++++----- .../Creality/Ender-4/Configuration_adv.h | 10 +++++----- .../example_configurations/Felix/Configuration_adv.h | 10 +++++----- .../FolgerTech/i3-2020/Configuration_adv.h | 10 +++++----- .../Infitary/i3-M508/Configuration_adv.h | 10 +++++----- .../JGAurora/A5/Configuration_adv.h | 10 +++++----- .../Malyan/M150/Configuration_adv.h | 10 +++++----- .../Micromake/C1/enhanced/Configuration_adv.h | 10 +++++----- .../RigidBot/Configuration_adv.h | 10 +++++----- .../example_configurations/SCARA/Configuration_adv.h | 10 +++++----- .../Sanguinololu/Configuration_adv.h | 10 +++++----- .../TinyBoy2/Configuration_adv.h | 10 +++++----- .../Velleman/K8200/Configuration_adv.h | 10 +++++----- .../Velleman/K8400/Configuration_adv.h | 10 +++++----- .../Wanhao/Duplicator 6/Configuration_adv.h | 10 +++++----- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 10 +++++----- .../delta/FLSUN/kossel/Configuration_adv.h | 10 +++++----- .../delta/FLSUN/kossel_mini/Configuration_adv.h | 10 +++++----- .../delta/generic/Configuration_adv.h | 10 +++++----- .../delta/kossel_mini/Configuration_adv.h | 10 +++++----- .../delta/kossel_pro/Configuration_adv.h | 10 +++++----- .../delta/kossel_xl/Configuration_adv.h | 10 +++++----- .../gCreate/gMax1.5+/Configuration_adv.h | 10 +++++----- .../example_configurations/makibox/Configuration_adv.h | 10 +++++----- .../tvrrug/Round2/Configuration_adv.h | 10 +++++----- .../example_configurations/wt150/Configuration_adv.h | 10 +++++----- 38 files changed, 190 insertions(+), 190 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 506009c214..0c908824dd 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1410,11 +1415,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h index eb9a4150ba..a7ac88936c 100644 --- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h index 92d535f45d..971f0dbae6 100644 --- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h +++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h index ad41730c75..860402232e 100644 --- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h +++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h b/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h index eb54a4b0b3..bf2e132198 100644 --- a/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h +++ b/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h index 3f742f31e9..2dbd1f4912 100644 --- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h index 2c6551b15f..eef3a9642e 100644 --- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h index 3f742f31e9..2dbd1f4912 100644 --- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index b6e774c885..e4aea96a03 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h index 9c02f37e5e..7db3eccd0f 100755 --- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h +++ b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1412,11 +1417,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h index 9c778e246a..08d9bdfef9 100644 --- a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h index 06a13bb85e..0b19519368 100644 --- a/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h index 2bb32eb2f1..3e81e4377a 100644 --- a/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h index 7045a326ae..53d8105c91 100644 --- a/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 644e27f40a..ae877810c1 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h index c7844ae129..b941a7c130 100644 --- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h @@ -611,6 +611,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1408,11 +1413,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h index 0e3597dca9..336eddac32 100644 --- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ //#define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h index 09d163ddfd..44f819f22d 100644 --- a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h +++ b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h index 5552427c9c..5fc1f5b9eb 100644 --- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h +++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h index e5faba97d0..b18b84344a 100644 --- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 127b0dac85..52040bf1a4 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 0e4eda4997..7a28dc7b21 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h index 71db52910c..3708ee4824 100644 --- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h +++ b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index d03e6c12de..29453468ed 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h index 5ed3073e11..e9470bb003 100644 --- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h @@ -625,6 +625,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1422,11 +1427,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h index 7117387807..989028a432 100644 --- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h index 196ab753a0..bf20d7a69b 100644 --- a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index d0371b2350..1ac2393fb6 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h index abecf6b9ea..3d22a3a73d 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index faa680ae01..4a840c8f1a 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index faa680ae01..4a840c8f1a 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index faa680ae01..4a840c8f1a 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 76ee48d064..737d8ef8a9 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -619,6 +619,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1416,11 +1421,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 849aa6c2a9..5317ff2ba9 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -614,6 +614,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1411,11 +1416,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h index cac5377903..230090a566 100644 --- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h @@ -612,6 +612,11 @@ */ #define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 3f67c32b39..d566cc9e7d 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index bababbfef2..7081e51db6 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -612,6 +612,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1409,11 +1414,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index 97aabd06b4..7c73a4de27 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -613,6 +613,11 @@ */ //#define SD_REPRINT_LAST_SELECTED_FILE + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + #endif // SDSUPPORT /** @@ -1410,11 +1415,6 @@ */ #define AUTO_REPORT_TEMPERATURES -/** - * Auto-report SdCard status with M27 S - */ -//#define AUTO_REPORT_SD_STATUS - /** * Include capabilities in M115 output */ From 2bf1bbf399af4fac15b9d7f46d899ffc42673e66 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Mar 2018 00:50:02 -0600 Subject: [PATCH 2/4] Add HAS_TEMP_SENSOR conditional --- Marlin/Conditionals_post.h | 5 +++++ Marlin/Marlin_main.cpp | 6 +++--- Marlin/temperature.cpp | 6 +++--- Marlin/temperature.h | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 589ac0a278..4e1d8691e7 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -686,6 +686,7 @@ #define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2) #define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675)) #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2) + #define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_TEMP_BED) // Heaters #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0)) @@ -748,6 +749,10 @@ #define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS)) #define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E)) + #if !HAS_TEMP_SENSOR + #undef AUTO_REPORT_TEMPERATURES + #endif + /** * This setting is also used by M109 when trying to calculate * a ballpark safe margin to prevent wait-forever situation. diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ebb0d2b524..c332b41c70 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7706,7 +7706,7 @@ inline void gcode_M104() { inline void gcode_M105() { if (get_target_extruder_from_command(105)) return; - #if HAS_TEMP_HOTEND || HAS_TEMP_BED + #if HAS_TEMP_SENSOR SERIAL_PROTOCOLPGM(MSG_OK); thermalManager.print_heaterstates(); #else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED @@ -7717,7 +7717,7 @@ inline void gcode_M105() { SERIAL_EOL(); } -#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED) +#if ENABLED(AUTO_REPORT_TEMPERATURES) /** * M155: Set temperature auto-report interval. M155 S @@ -11682,7 +11682,7 @@ void process_parsed_command() { case 105: gcode_M105(); KEEPALIVE_STATE(NOT_BUSY); return; // M105: Report Temperatures (and say "ok") - #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED) + #if ENABLED(AUTO_REPORT_TEMPERATURES) case 155: gcode_M155(); break; // M155: Set Temperature Auto-report Interval #endif diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index e4dadceead..212f445f27 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -416,7 +416,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS], // Report heater states every 2 seconds if (ELAPSED(ms, next_temp_ms)) { - #if HAS_TEMP_HOTEND || HAS_TEMP_BED + #if HAS_TEMP_SENSOR print_heaterstates(); SERIAL_EOL(); #endif @@ -2235,7 +2235,7 @@ void Temperature::isr() { SBI(TIMSK0, OCIE0B); //re-enable Temperature ISR } -#if HAS_TEMP_HOTEND || HAS_TEMP_BED +#if HAS_TEMP_SENSOR void print_heater_state(const float &c, const float &t, #if ENABLED(SHOW_TEMP_ADC_VALUES) @@ -2326,4 +2326,4 @@ void Temperature::isr() { #endif // AUTO_REPORT_TEMPERATURES -#endif // HAS_TEMP_HOTEND || HAS_TEMP_BED +#endif // HAS_TEMP_SENSOR diff --git a/Marlin/temperature.h b/Marlin/temperature.h index 710c9c23fd..deeedafaf7 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -571,7 +571,7 @@ class Temperature { #endif // HEATER_IDLE_HANDLER - #if HAS_TEMP_HOTEND || HAS_TEMP_BED + #if HAS_TEMP_SENSOR static void print_heaterstates(); #if ENABLED(AUTO_REPORT_TEMPERATURES) static uint8_t auto_report_temp_interval; From e7d519c89834fe787f333646810e06a6e969a603 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Mar 2018 00:53:26 -0600 Subject: [PATCH 3/4] Add suspend_auto_report flag to suppress auto-report --- Marlin/Conditionals_post.h | 2 ++ Marlin/Marlin.h | 4 ++++ Marlin/Marlin_main.cpp | 19 +++++++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 4e1d8691e7..84be141d7d 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -753,6 +753,8 @@ #undef AUTO_REPORT_TEMPERATURES #endif + #define HAS_AUTO_REPORTING (ENABLED(AUTO_REPORT_TEMPERATURES) || ENABLED(AUTO_REPORT_SD_STATUS)) + /** * This setting is also used by M109 when trying to calculate * a ballpark safe margin to prevent wait-forever situation. diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 70ed6342aa..0cce1ab8a9 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -232,6 +232,10 @@ extern volatile bool wait_for_heatup; extern volatile bool wait_for_user; #endif +#if HAS_AUTO_REPORTING + extern bool suspend_auto_report; +#endif + extern float current_position[XYZE], destination[XYZE]; /** diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c332b41c70..32289275b7 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -510,6 +510,10 @@ volatile bool wait_for_heatup = true; volatile bool wait_for_user = false; #endif +#if HAS_AUTO_REPORTING + bool suspend_auto_report; // = false +#endif + const char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' }; // Number of characters read in the current line of serial input @@ -13454,10 +13458,6 @@ void idle( host_keepalive(); - #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED) - thermalManager.auto_report_temperatures(); - #endif - manage_inactivity( #if ENABLED(ADVANCED_PAUSE_FEATURE) no_stepper_sleep @@ -13482,8 +13482,15 @@ void idle( } #endif - #if ENABLED(AUTO_REPORT_SD_STATUS) - card.auto_report_sd_status(); + #if HAS_AUTO_REPORTING + if (!suspend_auto_report) { + #if ENABLED(AUTO_REPORT_TEMPERATURES) + thermalManager.auto_report_temperatures(); + #endif + #if ENABLED(AUTO_REPORT_SD_STATUS) + card.auto_report_sd_status(); + #endif + } #endif } From dc40b3ec00cc355183c468ab2ab7f77854198a59 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Mar 2018 00:53:30 -0600 Subject: [PATCH 4/4] Suspend auto-report during UBL map output --- Marlin/ubl.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Marlin/ubl.cpp b/Marlin/ubl.cpp index c1b76e0090..df3919a0d5 100644 --- a/Marlin/ubl.cpp +++ b/Marlin/ubl.cpp @@ -175,6 +175,10 @@ // 2 : disply of the map data on a RepRap Graphical LCD Panel void unified_bed_leveling::display_map(const int map_type) { + #if HAS_AUTO_REPORTING + suspend_auto_report = true; + #endif + constexpr uint8_t spaces = 8 * (GRID_MAX_POINTS_X - 2); SERIAL_PROTOCOLPGM("\nBed Topography Report"); @@ -242,6 +246,10 @@ serial_echo_xy(GRID_MAX_POINTS_X - 1, 0); SERIAL_EOL(); } + + #if HAS_AUTO_REPORTING + suspend_auto_report = false; + #endif } bool unified_bed_leveling::sanity_check() {