shen/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-25 16:47:29 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge 78be1ae520 into 220cd5a640

Browse Source
This commit is contained in:
Vovodroid 2024-11-24 18:55:42 -06:00 committed by GitHub
commit 92de5866c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/calibrate/M48.cpp
View File

@ -261,7 +261,13 @@ void GcodeSuite::M48() {
#if HAS_STATUS_MESSAGE
// Display M48 results in the status bar
ui.set_status_and_level(MString<30>(GET_TEXT_F(MSG_M48_DEVIATION), F(": "), w_float_t(sigma, 2, 6)));
#ifndef LCD_WIDTH
#define LCD_WIDTH MAX_MESSAGE_LENGTH
#endif
if (STATUS_MESSAGE_WIDTH_LCD > 24)
ui.set_status_and_level(MString<40>(GET_TEXT_F(MSG_M48_DEVIATION), F(": "), w_float_t(sigma, 2, 6), F(", "), GET_TEXT(MSG_M48_MAX_DELTA), F(": "), w_float_t(_MAX(mean - min, max - mean), 2, 3)));
else
ui.set_status_and_level(MString<30>(GET_TEXT_F(MSG_M48_DEVIATION), F(": "), w_float_t(sigma, 2, 6)));
#endif
}

7
Marlin/src/inc/Conditionals-4-adv.h
View File

@ -951,8 +951,11 @@
#endif
#endif
#if STATUS_MESSAGE_TIMEOUT_SEC > 0
#define HAS_STATUS_MESSAGE_TIMEOUT 1
#if HAS_STATUS_MESSAGE
#define STATUS_MESSAGE_WIDTH_LCD TERN(STATUS_MESSAGE_SCROLLING, MAX_MESSAGE_LENGTH, LCD_WIDTH)
#if STATUS_MESSAGE_TIMEOUT_SEC > 0
#define HAS_STATUS_MESSAGE_TIMEOUT 1
#endif
#endif
#if HAS_MEDIA && SD_PROCEDURE_DEPTH

1
Marlin/src/lcd/language/language_en.h
View File

@ -221,6 +221,7 @@ namespace LanguageNarrow_en {
LSTR MSG_M48_POINT = _UxGT("M48 Point");
LSTR MSG_M48_OUT_OF_BOUNDS = _UxGT("Probe out of bounds");
LSTR MSG_M48_DEVIATION = _UxGT("Deviation");
LSTR MSG_M48_MAX_DELTA = _UxGT("Max delta");
LSTR MSG_IDEX_MENU = _UxGT("IDEX Mode");
LSTR MSG_OFFSETS_MENU = _UxGT("Tool Offsets");
LSTR MSG_IDEX_MODE_AUTOPARK = _UxGT("Auto-Park");