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

Add suspend_auto_report flag to suppress auto-report

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-07 01:57:09 -06:00
parent ffbf63e6af
commit eb212ae073
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/src/Marlin.cpp
View File

@ -187,6 +187,10 @@ volatile bool wait_for_heatup = true;
volatile bool wait_for_user = false; volatile bool wait_for_user = false;
#endif #endif
#if HAS_AUTO_REPORTING
bool suspend_auto_report; // = false
#endif
// Inactivity shutdown // Inactivity shutdown
millis_t max_inactive_time = 0, millis_t max_inactive_time = 0,
stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL; stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
@ -519,10 +523,6 @@ void idle(
gcode.host_keepalive(); gcode.host_keepalive();
#endif #endif
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
thermalManager.auto_report_temperatures();
#endif
manage_inactivity( manage_inactivity(
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
no_stepper_sleep no_stepper_sleep
@ -547,13 +547,20 @@ void idle(
} }
#endif #endif
#if ENABLED(AUTO_REPORT_SD_STATUS)
card.auto_report_sd_status();
#endif
#ifdef HAL_IDLETASK #ifdef HAL_IDLETASK
HAL_idletask(); HAL_idletask();
#endif #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; extern volatile bool wait_for_user;
#endif #endif
#if HAS_AUTO_REPORTING
extern bool suspend_auto_report;
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
typedef struct { double A, B, D; } linear_fit; typedef struct { double A, B, D; } linear_fit;
linear_fit* lsf_linear_fit(double x[], double y[], double z[], const int); linear_fit* lsf_linear_fit(double x[], double y[], double z[], const int);

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

@ -821,6 +821,8 @@
#undef AUTO_REPORT_TEMPERATURES #undef AUTO_REPORT_TEMPERATURES
#endif #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 * This setting is also used by M109 when trying to calculate
* a ballpark safe margin to prevent wait-forever situation. * a ballpark safe margin to prevent wait-forever situation.