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

🧑‍💻 HAS_MARLINUI_MENU, HAS_MANUAL_MOVE_MENU

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-25 15:33:03 -06:00
parent 33c89547f0
commit 2dcc3ddeed
63 changed files with 201 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3786,7 +3786,7 @@ void Temperature::isr() {
#if G26_CLICK_CAN_CANCEL
if (click_to_cancel && ui.use_click()) {
wait_for_heatup = false;
TERN_(HAS_LCD_MENU, ui.quick_feedback());
TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
}
#endif
@ -3920,7 +3920,7 @@ void Temperature::isr() {
#if G26_CLICK_CAN_CANCEL
if (click_to_cancel && ui.use_click()) {
wait_for_heatup = false;
TERN_(HAS_LCD_MENU, ui.quick_feedback());
TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
}
#endif

4
Marlin/src/module/temperature.h
View File

@ -186,7 +186,7 @@ enum ADCSensorState : char {
#define unscalePID_d(d) ( float(d) * PID_dT )
#endif
#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
#define G26_CLICK_CAN_CANCEL 1
#endif
@ -965,7 +965,7 @@ class Temperature {
static void set_heating_message(const uint8_t) {}
#endif
#if HAS_LCD_MENU && HAS_TEMPERATURE
#if HAS_MARLINUI_MENU && HAS_TEMPERATURE
static void lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb);
#endif

4
Marlin/src/module/tool_change.cpp
View File

@ -89,7 +89,7 @@
#include "../feature/mmu/mmu2.h"
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../lcd/marlinui.h"
#endif
@ -1027,7 +1027,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
DEBUG_ECHOLNPGM("No move (not homed)");
}
TERN_(HAS_LCD_MENU, if (!no_move) ui.update());
TERN_(HAS_MARLINUI_MENU, if (!no_move) ui.update());
#if ENABLED(DUAL_X_CARRIAGE)
const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;