Skip to content

Commit bd74b04

Browse files
committed
check for wide status
1 parent 3f7d1fe commit bd74b04

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Marlin/src/gcode/calibrate/M48.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,13 @@ void GcodeSuite::M48() {
258258
if (probing_good) {
259259
SERIAL_ECHOLNPGM("Finished!");
260260
dev_report(verbose_level > 0, mean, sigma, min, max, true);
261-
ui.set_status(GET_TEXT_F(MSG_M48_DEVIATION), ':', w_float_t(sigma, 2, 3), F(", "), GET_TEXT_F(MSG_M48_MAX_DELTA), ':', w_float_t(MAX(mean - min, max - mean), 2, 3));
261+
#if HAS_STATUS_MESSAGE
262+
ui.set_status(TS(GET_TEXT_F(MSG_M48_DEVIATION), ':', w_float_t(sigma, 2, 6)
263+
#if STATUS_MESSAGE_WIDTH_LCD > 24
264+
, F(", "), GET_TEXT_F(MSG_M48_MAX_DELTA), ':', w_float_t(MAX(mean - min, max - mean), 2, 3)
265+
#endif
266+
));
267+
#endif
262268
}
263269

264270
restore_feedrate_and_scaling();

Marlin/src/inc/Conditionals_adv.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,11 @@
826826
#define HAS_ENCODER_ACTION 1
827827
#endif
828828

829-
#if STATUS_MESSAGE_TIMEOUT_SEC > 0
830-
#define HAS_STATUS_MESSAGE_TIMEOUT 1
829+
#if HAS_STATUS_MESSAGE
830+
#define STATUS_MESSAGE_WIDTH_LCD TERN(STATUS_MESSAGE_SCROLLING, MAX_MESSAGE_LENGTH, LCD_WIDTH)
831+
#if STATUS_MESSAGE_TIMEOUT_SEC > 0
832+
#define HAS_STATUS_MESSAGE_TIMEOUT 1
833+
#endif
831834
#endif
832835

833836
#if HAS_MEDIA && SD_PROCEDURE_DEPTH

0 commit comments

Comments
 (0)