Merge pull request #9978 from thinkyhead/bf1_suppress_autoreport

[1.1.x] Capability to suppress auto-reporting
This commit is contained in:
Scott Lahteine
2018-03-07 03:33:26 -06:00
committed by GitHub
44 changed files with 229 additions and 203 deletions

View File

@@ -686,6 +686,7 @@
#define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2) #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_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_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_TEMP_BED)
// Heaters // Heaters
#define HAS_HEATER_0 (PIN_EXISTS(HEATER_0)) #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
@@ -748,6 +749,12 @@
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS)) #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)) #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 * 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.

View File

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

View File

@@ -232,6 +232,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
extern float current_position[XYZE], destination[XYZE]; extern float current_position[XYZE], destination[XYZE];
/** /**

View File

@@ -510,6 +510,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
const char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' }; const char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };
// Number of characters read in the current line of serial input // Number of characters read in the current line of serial input
@@ -7706,7 +7710,7 @@ inline void gcode_M104() {
inline void gcode_M105() { inline void gcode_M105() {
if (get_target_extruder_from_command(105)) return; if (get_target_extruder_from_command(105)) return;
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_SENSOR
SERIAL_PROTOCOLPGM(MSG_OK); SERIAL_PROTOCOLPGM(MSG_OK);
thermalManager.print_heaterstates(); thermalManager.print_heaterstates();
#else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED #else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED
@@ -7717,7 +7721,7 @@ inline void gcode_M105() {
SERIAL_EOL(); 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<seconds> * M155: Set temperature auto-report interval. M155 S<seconds>
@@ -11682,7 +11686,7 @@ void process_parsed_command() {
case 105: gcode_M105(); KEEPALIVE_STATE(NOT_BUSY); return; // M105: Report Temperatures (and say "ok") 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 case 155: gcode_M155(); break; // M155: Set Temperature Auto-report Interval
#endif #endif
@@ -13454,10 +13458,6 @@ void idle(
host_keepalive(); host_keepalive();
#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
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
@@ -13482,8 +13482,15 @@ void idle(
} }
#endif #endif
#if ENABLED(AUTO_REPORT_SD_STATUS) #if HAS_AUTO_REPORTING
card.auto_report_sd_status(); 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 #endif
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -416,7 +416,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
// Report heater states every 2 seconds // Report heater states every 2 seconds
if (ELAPSED(ms, next_temp_ms)) { if (ELAPSED(ms, next_temp_ms)) {
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_SENSOR
print_heaterstates(); print_heaterstates();
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
@@ -2235,7 +2235,7 @@ void Temperature::isr() {
SBI(TIMSK0, OCIE0B); //re-enable 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, void print_heater_state(const float &c, const float &t,
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
@@ -2326,4 +2326,4 @@ void Temperature::isr() {
#endif // AUTO_REPORT_TEMPERATURES #endif // AUTO_REPORT_TEMPERATURES
#endif // HAS_TEMP_HOTEND || HAS_TEMP_BED #endif // HAS_TEMP_SENSOR

View File

@@ -571,7 +571,7 @@ class Temperature {
#endif // HEATER_IDLE_HANDLER #endif // HEATER_IDLE_HANDLER
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_SENSOR
static void print_heaterstates(); static void print_heaterstates();
#if ENABLED(AUTO_REPORT_TEMPERATURES) #if ENABLED(AUTO_REPORT_TEMPERATURES)
static uint8_t auto_report_temp_interval; static uint8_t auto_report_temp_interval;

View File

@@ -175,6 +175,10 @@
// 2 : disply of the map data on a RepRap Graphical LCD Panel // 2 : disply of the map data on a RepRap Graphical LCD Panel
void unified_bed_leveling::display_map(const int map_type) { 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); constexpr uint8_t spaces = 8 * (GRID_MAX_POINTS_X - 2);
SERIAL_PROTOCOLPGM("\nBed Topography Report"); SERIAL_PROTOCOLPGM("\nBed Topography Report");
@@ -242,6 +246,10 @@
serial_echo_xy(GRID_MAX_POINTS_X - 1, 0); serial_echo_xy(GRID_MAX_POINTS_X - 1, 0);
SERIAL_EOL(); SERIAL_EOL();
} }
#if HAS_AUTO_REPORTING
suspend_auto_report = false;
#endif
} }
bool unified_bed_leveling::sanity_check() { bool unified_bed_leveling::sanity_check() {