CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9979 from thinkyhead/bf2_suppress_autoreport

Browse Source 
[2.0.x] Capability to suppress auto-reporting
This commit is contained in:
Scott Lahteine 2018-03-07 03:33:40 -06:00 committed by GitHub
commit 9e97c13c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 268 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1410,11 +1415,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

23
Marlin/src/Marlin.cpp
View File

@ -187,6 +187,10 @@ volatile bool wait_for_heatup = true;
volatile bool wait_for_user = false;
#endif
#if HAS_AUTO_REPORTING
bool suspend_auto_report; // = false
#endif
// Inactivity shutdown
millis_t max_inactive_time = 0,
stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
@ -519,10 +523,6 @@ void idle(
gcode.host_keepalive();
#endif
#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
@ -547,13 +547,20 @@ void idle(
}
#endif
#if ENABLED(AUTO_REPORT_SD_STATUS)
card.auto_report_sd_status();
#endif
#ifdef HAL_IDLETASK
HAL_idletask();
#endif
#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
}
/**

4
Marlin/src/Marlin.h
View File

@ -188,6 +188,10 @@ extern volatile bool wait_for_heatup;
extern volatile bool wait_for_user;
#endif
#if HAS_AUTO_REPORTING
extern bool suspend_auto_report;
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL)
typedef struct { double A, B, D; } linear_fit;
linear_fit* lsf_linear_fit(double x[], double y[], double z[], const int);

10
Marlin/src/config/default/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1414,11 +1419,6 @@
*/
#define EXTENDED_CAPABILITIES_REPORT
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Disable all Volumetric extrusion options
*/

10
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Cartesio/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1412,11 +1417,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

5
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**

10
Marlin/src/config/examples/Felix/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

5
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**

10
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/MakerParts/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1410,11 +1415,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
View File

@ -613,6 +613,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1417,11 +1422,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/RigidBot/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/SCARA/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/TheBorg/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
View File

@ -625,6 +625,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1422,11 +1427,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/generic/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
View File

@ -619,6 +619,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1416,11 +1421,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
View File

@ -614,6 +614,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1411,11 +1416,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/makibox/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
View File

@ -612,6 +612,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1409,11 +1414,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

10
Marlin/src/config/examples/wt150/Configuration_adv.h
View File

@ -613,6 +613,11 @@
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#endif // SDSUPPORT
/**
@ -1410,11 +1415,6 @@
*/
#define AUTO_REPORT_TEMPERATURES
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
/**
* Include capabilities in M115 output
*/

8
Marlin/src/feature/bedlevel/ubl/ubl.cpp
View File

@ -195,6 +195,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");
@ -259,6 +263,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() {

2
Marlin/src/gcode/gcode.cpp
View File

@ -391,7 +391,7 @@ void GcodeSuite::process_parsed_command() {
KEEPALIVE_STATE(NOT_BUSY);
return; // "ok" already printed
#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
case 155: M155(); break; // M155: Set temperature auto-report interval
#endif

2
Marlin/src/gcode/gcode.h
View File

@ -547,7 +547,7 @@ private:
static void M150();
#endif
#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
static void M155();
#endif

2
Marlin/src/gcode/temperature/M105.cpp
View File

@ -37,7 +37,7 @@ void GcodeSuite::M105() {
const int16_t port = command_queue_port[cmd_queue_index_r];
#endif
#if HAS_TEMP_HOTEND || HAS_TEMP_BED
#if HAS_TEMP_SENSOR
SERIAL_PROTOCOLPGM_P(port, MSG_OK);
thermalManager.print_heaterstates(
#if NUM_SERIAL > 1

4
Marlin/src/gcode/temperature/M155.cpp
View File

@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
#include "../gcode.h"
#include "../../module/temperature.h"
@ -37,4 +37,4 @@ void GcodeSuite::M155() {
}
#endif // AUTO_REPORT_TEMPERATURES && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
#endif // AUTO_REPORT_TEMPERATURES && HAS_TEMP_SENSOR

7
Marlin/src/inc/Conditionals_post.h
View File

@ -754,6 +754,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))
@ -816,6 +817,12 @@
#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
#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.

6
Marlin/src/module/temperature.cpp
View File

@ -417,7 +417,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
@ -2144,7 +2144,7 @@ void Temperature::isr() {
ENABLE_TEMPERATURE_INTERRUPT(); //re-enable Temperature ISR
}
#if HAS_TEMP_HOTEND || HAS_TEMP_BED
#if HAS_TEMP_SENSOR
#include "../gcode/gcode.h"
@ -2251,4 +2251,4 @@ void Temperature::isr() {
#endif // AUTO_REPORT_TEMPERATURES
#endif // HAS_TEMP_HOTEND || HAS_TEMP_BED
#endif // HAS_TEMP_SENSOR

2
Marlin/src/module/temperature.h
View File

@ -564,7 +564,7 @@ class Temperature {
#endif // HEATER_IDLE_HANDLER
#if HAS_TEMP_HOTEND || HAS_TEMP_BED
#if HAS_TEMP_SENSOR
static void print_heaterstates(
#if NUM_SERIAL > 1
const int8_t port = -1