bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Format, use status macros

Browse Source
This commit is contained in:
Scott Lahteine
2022-03-25 17:09:55 -05:00
committed by Scott Lahteine
parent 5632ad65f5
commit 9324132a40
11 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/module/motion.cpp
View File

@ -29,9 +29,8 @@
#include "stepper.h"
#include "planner.h"
#include "temperature.h"
#include "../gcode/gcode.h"
#include "../lcd/marlinui.h"
#include "../inc/MarlinConfig.h"
#if IS_SCARA
@ -51,10 +50,6 @@
#include "../feature/bltouch.h"
#endif
#if HAS_STATUS_MESSAGE
#include "../lcd/marlinui.h"
#endif
#if HAS_FILAMENT_SENSOR
#include "../feature/runout.h"
#endif
@ -1325,7 +1320,7 @@ void prepare_line_to_destination() {
);
SERIAL_ECHO_START();
SERIAL_ECHOLN(msg);
TERN_(HAS_STATUS_MESSAGE, ui.set_status(msg));
ui.set_status(msg);
return true;
}
return false;

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

@ -313,9 +313,9 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
ui.set_status(ds_str, 99);
SERIAL_ECHOLNF(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW));
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, ds_str, FPSTR(CONTINUE_STR)));
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(ds_str));
TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, ds_str, FPSTR(CONTINUE_STR)));
TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
ui.reset_status();

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

@ -651,7 +651,7 @@ volatile bool Temperature::raw_temps_ready = false;
// PID Tuning loop
wait_for_heatup = true; // Can be interrupted with M108
TERN_(HAS_STATUS_MESSAGE, ui.set_status(F("Wait for heat up...")));
LCD_MESSAGE(MSG_HEATING);
while (wait_for_heatup) {
const millis_t ms = millis();