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

8
Marlin/Configuration_adv.h
View File

@@ -1257,7 +1257,7 @@
// @section lcd
#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
#if HAS_MANUAL_MOVE_MENU
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
#define FINE_MANUAL_MOVE 0.025 // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
#if IS_ULTIPANEL
@@ -1280,7 +1280,7 @@
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
#endif
#if HAS_BED_PROBE && EITHER(HAS_LCD_MENU, HAS_TFT_LVGL_UI)
#if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
#if ENABLED(PROBE_OFFSET_WIZARD)
/**
@@ -1295,7 +1295,7 @@
#endif
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
// Add Probe Z Offset calibration to the Z Probe Offsets menu
#if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_BILINEAR)
@@ -1351,7 +1351,7 @@
// Insert a menu for preheating at the top level to allow for quick access
//#define PREHEAT_SHORTCUT_MENU_ITEM
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
//#define SOUND_MENU_ITEM // Add a mute option to the LCD menu

4
Marlin/src/MarlinCore.cpp
View File

@@ -506,7 +506,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N; \
CODE; \
queue.inject(F(BUTTON##N##_GCODE)); \
TERN_(HAS_LCD_MENU, ui.quick_feedback()); \
TERN_(HAS_MARLINUI_MENU, ui.quick_feedback()); \
} \
} \
}while(0)
@@ -1611,7 +1611,7 @@ void setup() {
SETUP_RUN(password.lock_machine()); // Will not proceed until correct password provided
#endif
#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
#if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
SETUP_RUN(ui.check_touch_calibration());
#endif

2
Marlin/src/feature/bedlevel/ubl/ubl.h
View File

@@ -120,7 +120,7 @@ public:
static const float _mesh_index_to_xpos[GRID_MAX_POINTS_X],
_mesh_index_to_ypos[GRID_MAX_POINTS_Y];
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static bool lcd_map_control;
static void steppers_were_disabled();
#else

24
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@@ -57,7 +57,7 @@
#define UBL_G29_P31
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
bool unified_bed_leveling::lcd_map_control = false;
@@ -443,7 +443,7 @@ void unified_bed_leveling::G29() {
#endif // HAS_BED_PROBE
case 2: {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
//
// Manually Probe Mesh in areas that can't be reached by the probe
//
@@ -555,7 +555,7 @@ void unified_bed_leveling::G29() {
}
case 4: // Fine Tune (i.e., Edit) the Mesh
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
fine_tune_mesh(param.XY_pos, parser.seen_test('T'));
#else
SERIAL_ECHOLNPGM("?P4 is only available when an LCD is present.");
@@ -646,7 +646,7 @@ void unified_bed_leveling::G29() {
LEAVE:
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ui.reset_alert_level();
ui.quick_feedback();
ui.reset_status();
@@ -725,7 +725,7 @@ void unified_bed_leveling::shift_mesh_height() {
void unified_bed_leveling::probe_entire_mesh(const xy_pos_t &nearby, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
save_ubl_active_state_and_disable(); // No bed level correction so only raw data is obtained
uint8_t count = GRID_MAX_POINTS;
@@ -739,7 +739,7 @@ void unified_bed_leveling::shift_mesh_height() {
SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (ui.button_pressed()) {
ui.quick_feedback(false); // Preserve button state for click-and-hold
SERIAL_ECHOLNPGM("\nMesh only partially populated.\n");
@@ -774,9 +774,9 @@ void unified_bed_leveling::shift_mesh_height() {
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_FINISH));
// Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
TERN_(HAS_LCD_MENU, ui.release());
TERN_(HAS_MARLINUI_MENU, ui.release());
probe.stow();
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
probe.move_z_after_probing();
@@ -791,7 +791,7 @@ void unified_bed_leveling::shift_mesh_height() {
#endif // HAS_BED_PROBE
void set_message_with_feedback(FSTR_P const fstr) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ui.set_status(fstr);
ui.quick_feedback();
#else
@@ -799,7 +799,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
#endif
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
typedef void (*clickFunc_t)();
@@ -1070,7 +1070,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
ui.return_to_status();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
/**
* Parse and validate most G29 parameters, store for use by G29 functions.
@@ -1210,7 +1210,7 @@ void unified_bed_leveling::save_ubl_active_state_and_disable() {
}
void unified_bed_leveling::restore_ubl_active_state_and_leave() {
TERN_(HAS_LCD_MENU, ui.release());
TERN_(HAS_MARLINUI_MENU, ui.release());
#if ENABLED(UBL_DEVEL_DEBUGGING)
if (--ubl_state_recursion_chk) {
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");

4
Marlin/src/feature/password/password.cpp
View File

@@ -40,7 +40,7 @@ uint32_t Password::value, Password::value_entry;
//
void Password::lock_machine() {
is_locked = true;
TERN_(HAS_LCD_MENU, authenticate_user(ui.status_screen, screen_password_entry));
TERN_(HAS_MARLINUI_MENU, authenticate_user(ui.status_screen, screen_password_entry));
}
//
@@ -55,7 +55,7 @@ void Password::authentication_check() {
is_locked = true;
SERIAL_ECHOLNPGM(STR_WRONG_PASSWORD);
}
TERN_(HAS_LCD_MENU, authentication_done());
TERN_(HAS_MARLINUI_MENU, authentication_done());
}
#endif // PASSWORD_FEATURE

2
Marlin/src/feature/password/password.h
View File

@@ -33,7 +33,7 @@ public:
static void lock_machine();
static void authentication_check();
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static void access_menu_password();
static void authentication_done();
static void media_gatekeeper();

6
Marlin/src/feature/pause.cpp
View File

@@ -97,7 +97,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
#if HAS_BUZZER
static void impatient_beep(const int8_t max_beep_count, const bool restart=false) {
if (TERN0(HAS_LCD_MENU, pause_mode == PAUSE_MODE_PAUSE_PRINT)) return;
if (TERN0(HAS_MARLINUI_MENU, pause_mode == PAUSE_MODE_PAUSE_PRINT)) return;
static millis_t next_buzz = 0;
static int8_t runout_beep = 0;
@@ -277,7 +277,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
// Show "Purge More" / "Resume" menu and wait for reply
KEEPALIVE_STATE(PAUSED_FOR_USER);
wait_for_user = false;
#if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
#if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
#else
pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -691,7 +691,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
TERN_(HAS_FILAMENT_SENSOR, runout.reset());
TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
TERN_(HAS_LCD_MENU, ui.return_to_status());
TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
}

2
Marlin/src/feature/power_monitor.cpp
View File

@@ -26,7 +26,7 @@
#include "power_monitor.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../lcd/marlinui.h"
#include "../lcd/lcdprint.h"
#endif

4
Marlin/src/feature/spindle_laser.h
View File

@@ -242,7 +242,7 @@ public:
}
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static void enable_with_dir(const bool reverse) {
isReady = true;
const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
@@ -279,7 +279,7 @@ public:
}
#endif
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#if ENABLED(LASER_POWER_INLINE)
/**

2
Marlin/src/feature/tmc_util.cpp
View File

@@ -40,7 +40,7 @@
#endif
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../module/stepper.h"
#endif

20
Marlin/src/feature/tmc_util.h
View File

@@ -128,7 +128,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
}
void set_pwm_thrs(const uint32_t thrs) {
TMC::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
}
#endif
@@ -137,14 +137,14 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
void homing_threshold(int16_t sgt_val) {
sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
TMC::sgt(sgt_val);
TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
}
#if ENABLED(SPI_ENDSTOPS)
bool test_stall_status();
#endif
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void refresh_stepper_current() { rms_current(this->val_mA); }
#if ENABLED(HYBRID_THRESHOLD)
@@ -203,11 +203,11 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
}
void set_pwm_thrs(const uint32_t thrs) {
TMC2208Stepper::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
}
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void refresh_stepper_current() { rms_current(this->val_mA); }
#if ENABLED(HYBRID_THRESHOLD)
@@ -257,7 +257,7 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
}
void set_pwm_thrs(const uint32_t thrs) {
TMC2209Stepper::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
}
#endif
#if USE_SENSORLESS
@@ -265,11 +265,11 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
void homing_threshold(int16_t sgt_val) {
sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
TMC2209Stepper::SGTHRS(sgt_val);
TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
}
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void refresh_stepper_current() { rms_current(this->val_mA); }
#if ENABLED(HYBRID_THRESHOLD)
@@ -311,11 +311,11 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
void homing_threshold(int16_t sgt_val) {
sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
TMC2660Stepper::sgt(sgt_val);
TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
}
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void refresh_stepper_current() { rms_current(this->val_mA); }
#if USE_SENSORLESS

22
Marlin/src/gcode/bedlevel/G26.cpp
View File

@@ -156,7 +156,7 @@ constexpr float g26_e_axis_feedrate = 0.025;
static MeshFlags circle_flags;
float g26_random_deviation = 0.0;
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
/**
* If the LCD is clicked, cancel, wait for release, return true
@@ -164,7 +164,7 @@ float g26_random_deviation = 0.0;
bool user_canceled() {
if (!ui.button_pressed()) return false; // Return if the button isn't pressed
ui.set_status(GET_TEXT_F(MSG_G26_CANCELED), 99);
TERN_(HAS_LCD_MENU, ui.quick_feedback());
TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
ui.wait_for_release();
return true;
}
@@ -325,7 +325,7 @@ typedef struct {
#if HAS_WIRED_LCD
ui.set_status(GET_TEXT_F(MSG_G26_HEATING_BED), 99);
ui.quick_feedback();
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
#endif
thermalManager.setTargetBed(bed_temp);
@@ -365,7 +365,7 @@ typedef struct {
bool prime_nozzle() {
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f;
#if HAS_LCD_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
#if HAS_MARLINUI_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
float Total_Prime = 0.0;
#endif
@@ -579,7 +579,7 @@ void GcodeSuite::G26() {
if (parser.seen('P')) {
if (!parser.has_value()) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
g26.prime_flag = -1;
#else
SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");
@@ -638,7 +638,7 @@ void GcodeSuite::G26() {
// Get repeat from 'R', otherwise do one full circuit
int16_t g26_repeats;
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
#else
if (parser.seen('R'))
@@ -699,7 +699,7 @@ void GcodeSuite::G26() {
move_to(destination, 0.0);
move_to(destination, g26.ooze_amount);
TERN_(HAS_LCD_MENU, ui.capture());
TERN_(HAS_MARLINUI_MENU, ui.capture());
#if DISABLED(ARC_SUPPORT)
@@ -795,7 +795,7 @@ void GcodeSuite::G26() {
destination = current_position;
}
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
#else // !ARC_SUPPORT
@@ -819,7 +819,7 @@ void GcodeSuite::G26() {
for (int8_t ind = start_ind; ind <= end_ind; ind++) {
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
xyz_float_t p = { circle.x + _COS(ind ), circle.y + _SIN(ind ), g26.layer_height },
q = { circle.x + _COS(ind + 1), circle.y + _SIN(ind + 1), g26.layer_height };
@@ -846,7 +846,7 @@ void GcodeSuite::G26() {
g26.connect_neighbor_with_line(location.pos, 0, 1);
planner.synchronize();
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location.pos, ExtUI::G26_POINT_FINISH));
if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE;
if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE;
}
SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
@@ -866,7 +866,7 @@ void GcodeSuite::G26() {
planner.calculate_volumetric_multipliers();
#endif
TERN_(HAS_LCD_MENU, ui.release()); // Give back control of the LCD
TERN_(HAS_MARLINUI_MENU, ui.release()); // Give back control of the LCD
if (!g26.keep_heaters_on) {
TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(0));

2
Marlin/src/gcode/control/M80_M81.cpp
View File

@@ -63,7 +63,7 @@
OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
#endif
TERN_(HAS_LCD_MENU, ui.reset_status());
TERN_(HAS_MARLINUI_MENU, ui.reset_status());
}
#endif // PSU_CONTROL

2
Marlin/src/gcode/feature/pause/M125.cpp
View File

@@ -85,7 +85,7 @@ void GcodeSuite::M125() {
ui.pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT);
// If possible, show an LCD prompt with the 'P' flag
const bool show_lcd = TERN0(HAS_LCD_MENU, parser.boolval('P'));
const bool show_lcd = TERN0(HAS_MARLINUI_MENU, parser.boolval('P'));
if (pause_print(retract, park_point, show_lcd, 0)) {
if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {

6
Marlin/src/gcode/feature/powerloss/M1000.cpp
View File

@@ -54,7 +54,7 @@ inline void plr_error(FSTR_P const prefix) {
#endif
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void lcd_power_loss_recovery_cancel();
#endif
@@ -67,7 +67,7 @@ void GcodeSuite::M1000() {
if (recovery.valid()) {
if (parser.seen_test('S')) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ui.goto_screen(menu_job_recovery);
#elif HAS_DWIN_E3V2_BASIC
recovery.dwin_flag = true;
@@ -80,7 +80,7 @@ void GcodeSuite::M1000() {
#endif
}
else if (parser.seen_test('C')) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
lcd_power_loss_recovery_cancel();
#else
recovery.cancel();

6
Marlin/src/gcode/lcd/M0_M1.cpp
View File

@@ -31,7 +31,7 @@
#include "../../module/planner.h" // for synchronize()
#include "../../MarlinCore.h" // for wait_for_user_response()
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../../lcd/marlinui.h"
#elif ENABLED(EXTENSIBLE_UI)
#include "../../lcd/extui/ui_api.h"
@@ -55,7 +55,7 @@ void GcodeSuite::M0_M1() {
planner.synchronize();
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (parser.string_arg)
ui.set_status(parser.string_arg, true);
@@ -89,7 +89,7 @@ void GcodeSuite::M0_M1() {
TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
TERN_(HAS_LCD_MENU, ui.reset_status());
TERN_(HAS_MARLINUI_MENU, ui.reset_status());
}
#endif // HAS_RESUME_CONTINUE

4
Marlin/src/gcode/parser.h
View File

@@ -355,7 +355,7 @@ public:
return input_temp_units == TEMPUNIT_K ? F("Kelvin") : input_temp_units == TEMPUNIT_F ? F("Fahrenheit") : F("Celsius");
}
#if HAS_LCD_MENU && DISABLED(DISABLE_M503)
#if HAS_MARLINUI_MENU && DISABLED(DISABLE_M503)
static float to_temp_units(celsius_t c) {
switch (input_temp_units) {
@@ -366,7 +366,7 @@ public:
}
}
#endif // HAS_LCD_MENU && !DISABLE_M503
#endif // HAS_MARLINUI_MENU && !DISABLE_M503
static celsius_t value_celsius() {
float f = value_float();

2
Marlin/src/gcode/queue.cpp
View File

@@ -522,7 +522,7 @@ void GCodeQueue::get_serial_commands() {
#if DISABLED(EMERGENCY_PARSER)
// Process critical commands early
if (command[0] == 'M') switch (command[3]) {
case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_LCD_MENU, wait_for_user = false); } break;
case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_MARLINUI_MENU, wait_for_user = false); } break;
case '2': if (command[2] == '1' && command[1] == '1') kill(FPSTR(M112_KILL_STR), nullptr, true); break;
case '0': if (command[1] == '4' && command[2] == '1') quickstop_stepper(); break;
}

2
Marlin/src/gcode/sd/M1001.cpp
View File

@@ -98,7 +98,7 @@ void GcodeSuite::M1001() {
printerEventLEDs.onPrintCompleted();
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PRINT_DONE)));
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_MARLINUI_MENU, PE_LEDS_COMPLETED_TIME, 30))));
printerEventLEDs.onResumeAfterWait();
}
#endif

6
Marlin/src/inc/Conditionals_LCD.h
View File

@@ -542,7 +542,11 @@
#endif
#if IS_ULTIPANEL && DISABLED(NO_LCD_MENUS)
#define HAS_LCD_MENU 1
#define HAS_MARLINUI_MENU 1
#endif
#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
#define HAS_MANUAL_MOVE_MENU 1
#endif
#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)

8
Marlin/src/inc/Conditionals_post.h
View File

@@ -437,7 +437,7 @@
// Set SD_DETECT_STATE based on hardware if not overridden
#if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
#if BOTH(HAS_LCD_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#if BOTH(HAS_MARLINUI_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#define SD_DETECT_STATE HIGH
#else
#define SD_DETECT_STATE LOW
@@ -3052,7 +3052,7 @@
#define HAS_TEMPERATURE 1
#endif
#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
#if HAS_TEMPERATURE && EITHER(HAS_MARLINUI_MENU, HAS_DWIN_E3V2)
#ifdef PREHEAT_6_LABEL
#define PREHEAT_COUNT 6
#elif defined(PREHEAT_5_LABEL)
@@ -3177,7 +3177,7 @@
* Advanced Pause - Filament Change
*/
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
#define M600_PURGE_MORE_RESUMABLE 1
#endif
#ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
@@ -3407,7 +3407,7 @@
#endif
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
// LCD timeout to status screen default is 15s
#ifndef LCD_TIMEOUT_TO_STATUS
#define LCD_TIMEOUT_TO_STATUS 15000

16
Marlin/src/inc/SanityCheck.h
View File

@@ -851,7 +851,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "USE_M73_REMAINING_TIME requires LCD_SET_PROGRESS_MANUALLY"
#endif
#if !HAS_LCD_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
#if !HAS_MARLINUI_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
#error "SD_REPRINT_LAST_SELECTED_FILE currently requires a Marlin-native LCD menu."
#endif
@@ -874,7 +874,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* SD Card Settings
*/
#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_LCD_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
#endif
@@ -1081,9 +1081,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "PRUSA_MMU2S requires FILAMENT_RUNOUT_SENSOR. Enable it to continue."
#elif ENABLED(MMU_EXTRUDER_SENSOR) && DISABLED(FILAMENT_RUNOUT_SENSOR)
#error "MMU_EXTRUDER_SENSOR requires FILAMENT_RUNOUT_SENSOR. Enable it to continue."
#elif ENABLED(MMU_EXTRUDER_SENSOR) && !HAS_LCD_MENU
#elif ENABLED(MMU_EXTRUDER_SENSOR) && !HAS_MARLINUI_MENU
#error "MMU_EXTRUDER_SENSOR requires an LCD supporting MarlinUI."
#elif ENABLED(MMU2_MENUS) && !HAS_LCD_MENU
#elif ENABLED(MMU2_MENUS) && !HAS_MARLINUI_MENU
#error "MMU2_MENUS requires an LCD supporting MarlinUI."
#elif DISABLED(ADVANCED_PAUSE_FEATURE)
static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with PRUSA_MMU2(S) / HAS_EXTENDABLE_MMU(S).");
@@ -1479,9 +1479,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "You probably want to use Max Endstops for DELTA!"
#elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_SEGMENTED
#error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
#elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_LCD_MENU)
#elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_MARLINUI_MENU)
#error "DELTA_AUTO_CALIBRATION requires a probe or LCD Controller."
#elif ENABLED(DELTA_CALIBRATION_MENU) && !HAS_LCD_MENU
#elif ENABLED(DELTA_CALIBRATION_MENU) && !HAS_MARLINUI_MENU
#error "DELTA_CALIBRATION_MENU requires an LCD Controller."
#elif ABL_USES_GRID
#if ((GRID_MAX_POINTS_X) & 1) == 0 || ((GRID_MAX_POINTS_Y) & 1) == 0
@@ -1820,7 +1820,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* LCD_BED_LEVELING requirements
*/
#if ENABLED(LCD_BED_LEVELING)
#if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
#if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
#error "LCD_BED_LEVELING is not supported by the selected LCD controller."
#elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
#error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
@@ -3743,7 +3743,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
* Sanity Check for Password Feature
*/
#if ENABLED(PASSWORD_FEATURE)
#if NONE(HAS_LCD_MENU, PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE)
#if NONE(HAS_MARLINUI_MENU, PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE)
#error "Without PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE, or a supported LCD there's no way to unlock the printer or set a password."
#elif DISABLED(EEPROM_SETTINGS)
#warning "PASSWORD_FEATURE settings will be lost on power-off without EEPROM_SETTINGS."

8
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View File

@@ -284,7 +284,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
#endif // LCD_PROGRESS_BAR
#if BOTH(SDSUPPORT, HAS_LCD_MENU)
#if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
// CHARSET_MENU
const static PROGMEM byte refresh[8] = {
@@ -334,7 +334,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
#endif
{
createChar_P(LCD_STR_UPLEVEL[0], uplevel);
#if BOTH(SDSUPPORT, HAS_LCD_MENU)
#if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
// SD Card sub-menu special characters
createChar_P(LCD_STR_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder);
@@ -1051,7 +1051,7 @@ void MarlinUI::draw_status_screen() {
draw_status_message(blink);
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../menu/menu.h"
@@ -1584,6 +1584,6 @@ void MarlinUI::draw_status_screen() {
#endif // AUTO_BED_LEVELING_UBL
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#endif // HAS_MARLINUI_HD44780

4
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View File

@@ -922,7 +922,7 @@ void MarlinUI::draw_status_screen() {
lcd.print_screen();
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../menu/menu.h"
@@ -1084,6 +1084,6 @@ void MarlinUI::draw_status_screen() {
#endif // AUTO_BED_LEVELING_UBL
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#endif // IS_TFTGLCD_PANEL

4
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View File

@@ -353,7 +353,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../menu/menu.h"
@@ -744,6 +744,6 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#endif // HAS_MARLINUI_U8GLIB

4
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
View File

@@ -253,7 +253,7 @@ void MarlinUI::draw_status_message(const bool blink) {
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../../menu/menu.h"
@@ -581,6 +581,6 @@ void MarlinUI::draw_status_message(const bool blink) {
#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#endif // IS_DWIN_MARLINUI

2
Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
View File

@@ -2028,7 +2028,7 @@ void get_wifi_commands() {
// Process critical commands early
if (strcmp_P(command, PSTR("M108")) == 0) {
wait_for_heatup = false;
TERN_(HAS_LCD_MENU, wait_for_user = false);
TERN_(HAS_MARLINUI_MENU, wait_for_user = false);
}
if (strcmp_P(command, PSTR("M112")) == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
if (strcmp_P(command, PSTR("M410")) == 0) quickstop_stepper();

2
Marlin/src/lcd/extui/ui_api.h
View File

@@ -196,7 +196,7 @@ namespace ExtUI {
#endif
inline void simulateUserClick() {
#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
ui.lcd_clicked = true;
#endif
}

64
Marlin/src/lcd/marlinui.cpp
View File

@@ -155,7 +155,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
}
#endif
#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
bool MarlinUI::lcd_clicked;
#endif
@@ -257,7 +257,7 @@ void MarlinUI::init() {
#include "../module/planner.h"
#include "../module/motion.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "../module/settings.h"
#endif
@@ -348,7 +348,7 @@ void MarlinUI::init() {
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu/menu.h"
screenFunc_t MarlinUI::currentScreen; // Initialized in CTOR
@@ -450,7 +450,7 @@ void MarlinUI::init() {
#endif // !HAS_GRAPHICAL_TFT
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
////////////////////////////////////////////
///////////// Keypad Handling //////////////
@@ -460,7 +460,7 @@ void MarlinUI::init() {
volatile uint8_t MarlinUI::keypad_buttons;
#if HAS_LCD_MENU && !HAS_ADC_BUTTONS
#if HAS_MARLINUI_MENU && !HAS_ADC_BUTTONS
void lcd_move_x();
void lcd_move_y();
@@ -487,7 +487,7 @@ void MarlinUI::init() {
if (keypad_buttons) {
#if HAS_ENCODER_ACTION
refresh(LCDVIEW_REDRAW_NOW);
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
if (RRK(EN_KEYPAD_UP)) encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
else if (RRK(EN_KEYPAD_DOWN)) encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
@@ -497,7 +497,7 @@ void MarlinUI::init() {
else
#endif
{
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (RRK(EN_KEYPAD_UP)) encoderPosition -= epps;
else if (RRK(EN_KEYPAD_DOWN)) encoderPosition += epps;
else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); }
@@ -528,7 +528,7 @@ void MarlinUI::init() {
const bool homed = all_axes_homed();
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (RRK(EN_KEYPAD_MIDDLE)) goto_screen(menu_move);
@@ -547,7 +547,7 @@ void MarlinUI::init() {
if (RRK(EN_KEYPAD_UP)) _reprapworld_keypad_move(Y_AXIS, -1);
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
if (!homed && RRK(EN_KEYPAD_F1)) queue.inject_P(G28_STR);
return true;
@@ -575,7 +575,7 @@ void MarlinUI::init() {
void MarlinUI::status_screen() {
TERN_(HAS_LCD_MENU, ENCODER_RATE_MULTIPLY(false));
TERN_(HAS_MARLINUI_MENU, ENCODER_RATE_MULTIPLY(false));
#if BASIC_PROGRESS_BAR
@@ -619,7 +619,7 @@ void MarlinUI::init() {
#endif // BASIC_PROGRESS_BAR
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (use_click()) {
#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
next_filament_display = millis() + 5000UL; // Show status message for 5s
@@ -673,7 +673,7 @@ void MarlinUI::init() {
void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
init();
status_printf(1, F(S_FMT ": " S_FMT), FTOP(lcd_error), FTOP(lcd_component));
TERN_(HAS_LCD_MENU, return_to_status());
TERN_(HAS_MARLINUI_MENU, return_to_status());
// RED ALERT. RED ALERT.
#ifdef LED_BACKLIGHT_TIMEOUT
@@ -701,7 +701,7 @@ void MarlinUI::init() {
void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up the TFT with most buttons
TERN_(HAS_LCD_MENU, refresh());
TERN_(HAS_MARLINUI_MENU, refresh());
#if HAS_ENCODER_ACTION
if (clear_buttons) buttons = 0;
@@ -712,9 +712,9 @@ void MarlinUI::init() {
#if HAS_CHIRP
chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
#if BOTH(HAS_LCD_MENU, USE_BEEPER)
#if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#elif HAS_LCD_MENU
#elif HAS_MARLINUI_MENU
delay(10);
#endif
#endif
@@ -724,7 +724,7 @@ void MarlinUI::init() {
/////////////// Manual Move ////////////////
////////////////////////////////////////////
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
ManualMove MarlinUI::manual_move{};
@@ -836,7 +836,7 @@ void MarlinUI::init() {
#endif
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
/**
* Update the LCD, read encoder buttons, etc.
@@ -887,7 +887,7 @@ void MarlinUI::init() {
leds.update_timeout(powerManager.psu_on);
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
// Handle any queued Move Axis motion
manual_move.task();
@@ -942,7 +942,7 @@ void MarlinUI::init() {
goto_previous_screen();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_MARLINUI_U8GLIB, drawing_screen)) {
@@ -989,7 +989,7 @@ void MarlinUI::init() {
if (encoderPastThreshold || lcd_clicked) {
if (encoderPastThreshold && TERN1(IS_TFTGLCD_PANEL, !external_control)) {
#if BOTH(HAS_LCD_MENU, ENCODER_RATE_MULTIPLIER)
#if BOTH(HAS_MARLINUI_MENU, ENCODER_RATE_MULTIPLIER)
int32_t encoderMultiplier = 1;
@@ -1049,7 +1049,7 @@ void MarlinUI::init() {
refresh(LCDVIEW_REDRAW_NOW);
}
#if BOTH(HAS_LCD_MENU, SCROLL_LONG_FILENAMES)
#if BOTH(HAS_MARLINUI_MENU, SCROLL_LONG_FILENAMES)
// If scrolling of long file names is enabled and we are in the sd card menu,
// cause a refresh to occur until all the text has scrolled into view.
if (currentScreen == menu_media && !lcd_status_update_delay--) {
@@ -1120,7 +1120,7 @@ void MarlinUI::init() {
#endif
TERN_(HAS_LCD_MENU, lcd_clicked = false);
TERN_(HAS_MARLINUI_MENU, lcd_clicked = false);
// Keeping track of the longest time for an individual LCD update.
// Used to do screen throttling when the planner starts to fill up.
@@ -1334,7 +1334,7 @@ void MarlinUI::init() {
case ENCODER_PHASE_2: ENCODER_SPIN(ENCODER_PHASE_1, ENCODER_PHASE_3); break;
case ENCODER_PHASE_3: ENCODER_SPIN(ENCODER_PHASE_2, ENCODER_PHASE_0); break;
}
#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
#if BOTH(HAS_MARLINUI_MENU, AUTO_BED_LEVELING_UBL)
external_encoder();
#endif
lastEncoderBits = enc;
@@ -1460,7 +1460,7 @@ void MarlinUI::init() {
void MarlinUI::set_alert_status(FSTR_P const fstr) {
set_status(fstr, 1);
TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
TERN_(HAS_LCD_MENU, return_to_status());
TERN_(HAS_MARLINUI_MENU, return_to_status());
}
#include <stdarg.h>
@@ -1545,10 +1545,10 @@ void MarlinUI::init() {
IF_DISABLED(SDSUPPORT, print_job_timer.stop());
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
LCD_MESSAGE(MSG_PRINT_ABORTED);
TERN_(HAS_LCD_MENU, return_to_status());
TERN_(HAS_MARLINUI_MENU, return_to_status());
}
#if BOTH(HAS_LCD_MENU, PSU_CONTROL)
#if BOTH(HAS_MARLINUI_MENU, PSU_CONTROL)
void MarlinUI::poweroff() {
queue.inject(F("M81" TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, "S")));
@@ -1560,11 +1560,11 @@ void MarlinUI::init() {
void MarlinUI::flow_fault() {
LCD_ALERTMESSAGE(MSG_FLOWMETER_FAULT);
TERN_(HAS_BUZZER, buzz(1000, 440));
TERN_(HAS_LCD_MENU, return_to_status());
TERN_(HAS_MARLINUI_MENU, return_to_status());
}
void MarlinUI::pause_print() {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
synchronize(GET_TEXT(MSG_PAUSING));
defer_status_screen();
#endif
@@ -1686,7 +1686,7 @@ void MarlinUI::init() {
ExtUI::onMediaRemoved();
#elif PIN_EXISTS(SD_DETECT)
LCD_MESSAGE(MSG_MEDIA_REMOVED);
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
if (!defer_return_to_status) return_to_status();
#endif
#endif
@@ -1712,7 +1712,7 @@ void MarlinUI::init() {
#endif // SDSUPPORT
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void MarlinUI::reset_settings() {
settings.reset();
completion_feedback();
@@ -1768,7 +1768,7 @@ void MarlinUI::init() {
#if ENABLED(EEPROM_SETTINGS)
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
void MarlinUI::init_eeprom() {
const bool good = settings.init_eeprom();
completion_feedback(good);
@@ -1796,7 +1796,7 @@ void MarlinUI::init() {
}
void MarlinUI::eeprom_alert(const uint8_t msgid) {
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
editable.uint8 = msgid;
goto_screen([]{
PGM_P const restore_msg = GET_TEXT(MSG_INIT_EEPROM);

30
Marlin/src/lcd/marlinui.h
View File

@@ -35,7 +35,7 @@
#include "tft_io/touch_calibration.h"
#endif
#if ANY(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
#if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
#define HAS_ENCODER_ACTION 1
#endif
@@ -51,7 +51,7 @@
#include "../module/printcounter.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#include "../feature/pause.h"
#endif
@@ -77,7 +77,7 @@
uint8_t get_ADC_keyValue();
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "lcdprint.h"
@@ -90,7 +90,7 @@
typedef void (*screenFunc_t)();
typedef void (*menuAction_t)();
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU
#endif // HAS_WIRED_LCD
@@ -126,7 +126,7 @@
} preheat_t;
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
// Manual Movement class
class ManualMove {
@@ -198,7 +198,7 @@ class MarlinUI {
public:
MarlinUI() {
TERN_(HAS_LCD_MENU, currentScreen = status_screen);
TERN_(HAS_MARLINUI_MENU, currentScreen = status_screen);
}
static void init();
@@ -245,7 +245,7 @@ public:
// LCD implementations
static void clear_lcd();
#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
#if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION)
static void check_touch_calibration() {
if (touch_calibration.need_calibration()) currentScreen = touch_calibration_screen;
}
@@ -375,7 +375,7 @@ public:
static void resume_print();
static void flow_fault();
#if BOTH(HAS_LCD_MENU, PSU_CONTROL)
#if BOTH(HAS_MARLINUI_MENU, PSU_CONTROL)
static void poweroff();
#endif
@@ -488,7 +488,7 @@ public:
#endif
#if ENABLED(SDSUPPORT)
#if BOTH(SCROLL_LONG_FILENAMES, HAS_LCD_MENU)
#if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
#define MARLINUI_SCROLL_NAME 1
#endif
#if MARLINUI_SCROLL_NAME
@@ -513,7 +513,7 @@ public:
TERN(SCREENS_CAN_TIME_OUT, return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS, UNUSED(ms));
}
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#if HAS_TOUCH_BUTTONS
static uint8_t touch_buttons;
@@ -597,7 +597,7 @@ public:
#endif
#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
static bool lcd_clicked;
static bool use_click() {
const bool click = lcd_clicked;
@@ -609,7 +609,7 @@ public:
static bool use_click() { return false; }
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
#else
static void _pause_show_message() {}
@@ -619,12 +619,12 @@ public:
//
// EEPROM: Reset / Init / Load / Store
//
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static void reset_settings();
#endif
#if ENABLED(EEPROM_SETTINGS)
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
static void init_eeprom();
static void load_settings();
static void store_settings();
@@ -650,7 +650,7 @@ public:
//
// Block interaction while under external control
//
#if HAS_LCD_MENU && EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
#if HAS_MARLINUI_MENU && EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
static bool external_control;
FORCE_INLINE static void capture() { external_control = true; }
FORCE_INLINE static void release() { external_control = false; }

6
Marlin/src/lcd/menu/menu.cpp
View File

@@ -22,7 +22,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu.h"
#include "../../module/planner.h"
@@ -220,7 +220,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
screen_changed = true;
TERN_(HAS_MARLINUI_U8GLIB, drawing_screen = false);
TERN_(HAS_LCD_MENU, encoder_direction_normal());
TERN_(HAS_MARLINUI_MENU, encoder_direction_normal());
set_selection(false);
}
@@ -378,4 +378,4 @@ void MenuItem_confirm::select_screen(
}
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu_item.h"
#include "../../module/planner.h"
@@ -653,4 +653,4 @@ void menu_advanced_settings() {
END_MENU();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_backlash.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, BACKLASH_GCODE)
#if BOTH(HAS_MARLINUI_MENU, BACKLASH_GCODE)
#include "menu_item.h"
@@ -68,4 +68,4 @@ void menu_backlash() {
END_MENU();
}
#endif // HAS_LCD_MENU && BACKLASH_GCODE
#endif // HAS_MARLINUI_MENU && BACKLASH_GCODE

4
Marlin/src/lcd/menu/menu_bed_corners.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, LEVEL_BED_CORNERS)
#if BOTH(HAS_MARLINUI_MENU, LEVEL_BED_CORNERS)
#include "menu_item.h"
#include "../../module/motion.h"
@@ -362,4 +362,4 @@ void _lcd_level_bed_corners() {
ui.goto_screen(_lcd_level_bed_corners_homing);
}
#endif // HAS_LCD_MENU && LEVEL_BED_CORNERS
#endif // HAS_MARLINUI_MENU && LEVEL_BED_CORNERS

4
Marlin/src/lcd/menu/menu_cancelobject.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, CANCEL_OBJECTS)
#if BOTH(HAS_MARLINUI_MENU, CANCEL_OBJECTS)
#include "menu_item.h"
#include "menu_addon.h"
@@ -71,4 +71,4 @@ void menu_cancelobject() {
END_MENU();
}
#endif // HAS_LCD_MENU && CANCEL_OBJECTS
#endif // HAS_MARLINUI_MENU && CANCEL_OBJECTS

4
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu_item.h"
@@ -577,4 +577,4 @@ void menu_configuration() {
END_MENU();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_delta_calibrate.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
#if HAS_MARLINUI_MENU && EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
#include "menu_item.h"
#include "../../module/delta.h"
@@ -151,4 +151,4 @@ void menu_delta_calibrate() {
END_MENU();
}
#endif // HAS_LCD_MENU && (DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION)
#endif // HAS_MARLINUI_MENU && (DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION)

4
Marlin/src/lcd/menu/menu_filament.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
#if BOTH(HAS_MARLINUI_MENU, ADVANCED_PAUSE_FEATURE)
#include "menu_item.h"
#include "../../module/temperature.h"
@@ -342,4 +342,4 @@ void MarlinUI::pause_show_message(
ui.return_to_status();
}
#endif // HAS_LCD_MENU && ADVANCED_PAUSE_FEATURE
#endif // HAS_MARLINUI_MENU && ADVANCED_PAUSE_FEATURE

4
Marlin/src/lcd/menu/menu_info.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, LCD_INFO_MENU)
#if BOTH(HAS_MARLINUI_MENU, LCD_INFO_MENU)
#include "menu_item.h"
@@ -317,4 +317,4 @@ void menu_info() {
END_MENU();
}
#endif // HAS_LCD_MENU && LCD_INFO_MENU
#endif // HAS_MARLINUI_MENU && LCD_INFO_MENU

4
Marlin/src/lcd/menu/menu_job_recovery.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, POWER_LOSS_RECOVERY)
#if BOTH(HAS_MARLINUI_MENU, POWER_LOSS_RECOVERY)
#include "menu_item.h"
#include "../../gcode/queue.h"
@@ -54,4 +54,4 @@ void menu_job_recovery() {
END_MENU();
}
#endif // HAS_LCD_MENU && POWER_LOSS_RECOVERY
#endif // HAS_MARLINUI_MENU && POWER_LOSS_RECOVERY

4
Marlin/src/lcd/menu/menu_led.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
#if HAS_MARLINUI_MENU && EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
#include "menu_item.h"
@@ -169,4 +169,4 @@ void menu_led() {
END_MENU();
}
#endif // HAS_LCD_MENU && LED_CONTROL_MENU
#endif // HAS_MARLINUI_MENU && LED_CONTROL_MENU

4
Marlin/src/lcd/menu/menu_main.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu_item.h"
#include "../../module/temperature.h"
@@ -461,4 +461,4 @@ void menu_main() {
END_MENU();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_media.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, SDSUPPORT)
#if BOTH(HAS_MARLINUI_MENU, SDSUPPORT)
#include "menu_item.h"
#include "../../sd/cardreader.h"
@@ -161,4 +161,4 @@ void menu_media() {
TERN(MULTI_VOLUME, menu_media_select, menu_media_filelist)();
}
#endif // HAS_LCD_MENU && SDSUPPORT
#endif // HAS_MARLINUI_MENU && SDSUPPORT

4
Marlin/src/lcd/menu/menu_mixer.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, MIXING_EXTRUDER)
#if BOTH(HAS_MARLINUI_MENU, MIXING_EXTRUDER)
#include "menu_item.h"
#include "menu_addon.h"
@@ -275,4 +275,4 @@ void menu_mixer() {
END_MENU();
}
#endif // HAS_LCD_MENU && MIXING_EXTRUDER
#endif // HAS_MARLINUI_MENU && MIXING_EXTRUDER

4
Marlin/src/lcd/menu/menu_mmu2.cpp
View File

@@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
#if BOTH(HAS_LCD_MENU, MMU2_MENUS)
#if BOTH(HAS_MARLINUI_MENU, MMU2_MENUS)
#include "../../MarlinCore.h"
#include "../../feature/mmu/mmu2.h"
@@ -167,4 +167,4 @@ uint8_t mmu2_choose_filament() {
return feeder_index;
}
#endif // HAS_LCD_MENU && MMU2_MENUS
#endif // HAS_MARLINUI_MENU && MMU2_MENUS

4
Marlin/src/lcd/menu/menu_motion.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000 || (Z_MAX_POS) >= 1000)
@@ -477,4 +477,4 @@ void menu_motion() {
END_MENU();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_password.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, PASSWORD_FEATURE)
#if BOTH(HAS_MARLINUI_MENU, PASSWORD_FEATURE)
#include "../../feature/password/password.h"
@@ -184,4 +184,4 @@ void Password::menu_password() {
END_MENU();
}
#endif // HAS_LCD_MENU && PASSWORD_FEATURE
#endif // HAS_MARLINUI_MENU && PASSWORD_FEATURE

4
Marlin/src/lcd/menu/menu_power_monitor.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && HAS_POWER_MONITOR
#if HAS_MARLINUI_MENU && HAS_POWER_MONITOR
#include "menu_item.h"
#include "../../feature/power_monitor.h"
@@ -59,4 +59,4 @@ void menu_power_monitor() {
END_MENU();
}
#endif // HAS_LCD_MENU && HAS_POWER_MONITOR
#endif // HAS_MARLINUI_MENU && HAS_POWER_MONITOR

4
Marlin/src/lcd/menu/menu_spindle_laser.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_LCD_MENU && HAS_CUTTER
#if HAS_MARLINUI_MENU && HAS_CUTTER
#include "menu_item.h"
@@ -81,4 +81,4 @@
END_MENU();
}
#endif // HAS_LCD_MENU && HAS_CUTTER
#endif // HAS_MARLINUI_MENU && HAS_CUTTER

4
Marlin/src/lcd/menu/menu_temperature.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_LCD_MENU && HAS_TEMPERATURE
#if HAS_MARLINUI_MENU && HAS_TEMPERATURE
#include "menu_item.h"
#include "../../module/temperature.h"
@@ -307,4 +307,4 @@ void menu_temperature() {
#endif
#endif // HAS_LCD_MENU && HAS_TEMPERATURE
#endif // HAS_MARLINUI_MENU && HAS_TEMPERATURE

2
Marlin/src/lcd/menu/menu_tmc.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && HAS_TRINAMIC_CONFIG
#if HAS_MARLINUI_MENU && HAS_TRINAMIC_CONFIG
#include "menu_item.h"
#include "../../module/stepper/indirection.h"

2
Marlin/src/lcd/menu/menu_touch_screen.cpp
View File

@@ -22,7 +22,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
#if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION)
#include "menu_item.h"
#include "../marlinui.h"

4
Marlin/src/lcd/menu/menu_tramming.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, ASSISTED_TRAMMING_WIZARD)
#if BOTH(HAS_MARLINUI_MENU, ASSISTED_TRAMMING_WIZARD)
#include "menu_item.h"
@@ -109,4 +109,4 @@ void goto_tramming_wizard() {
});
}
#endif // HAS_LCD_MENU && ASSISTED_TRAMMING_WIZARD
#endif // HAS_MARLINUI_MENU && ASSISTED_TRAMMING_WIZARD

4
Marlin/src/lcd/menu/menu_tune.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#include "menu_item.h"
#include "../../module/motion.h"
@@ -236,4 +236,4 @@ void menu_tune() {
END_MENU();
}
#endif // HAS_LCD_MENU
#endif // HAS_MARLINUI_MENU

4
Marlin/src/lcd/menu/menu_ubl.cpp
View File

@@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
#if BOTH(HAS_MARLINUI_MENU, AUTO_BED_LEVELING_UBL)
#include "menu_item.h"
#include "../../gcode/gcode.h"
@@ -684,4 +684,4 @@ void _lcd_ubl_level_bed() {
END_MENU();
}
#endif // HAS_LCD_MENU && AUTO_BED_LEVELING_UBL
#endif // HAS_MARLINUI_MENU && AUTO_BED_LEVELING_UBL

4
Marlin/src/lcd/tft/ui_1024x600.cpp
View File

@@ -596,9 +596,9 @@ MotionAxisState motionAxisState;
static void quick_feedback() {
#if HAS_CHIRP
ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
#if BOTH(HAS_LCD_MENU, USE_BEEPER)
#if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#elif HAS_LCD_MENU
#elif HAS_MARLINUI_MENU
delay(10);
#endif
#endif

4
Marlin/src/lcd/tft/ui_320x240.cpp
View File

@@ -578,9 +578,9 @@ MotionAxisState motionAxisState;
static void quick_feedback() {
#if HAS_CHIRP
ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
#if BOTH(HAS_LCD_MENU, USE_BEEPER)
#if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#elif HAS_LCD_MENU
#elif HAS_MARLINUI_MENU
delay(10);
#endif
#endif

4
Marlin/src/lcd/tft/ui_480x320.cpp
View File

@@ -583,9 +583,9 @@ MotionAxisState motionAxisState;
static void quick_feedback() {
#if HAS_CHIRP
ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
#if BOTH(HAS_LCD_MENU, USE_BEEPER)
#if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#elif HAS_LCD_MENU
#elif HAS_MARLINUI_MENU
delay(10);
#endif
#endif

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;

2
buildroot/share/PlatformIO/scripts/common-dependencies.h
View File

@@ -53,7 +53,7 @@
#define HAS_SMART_EFF_MOD
#endif
#if HAS_LCD_MENU
#if HAS_MARLINUI_MENU
#if ENABLED(BACKLASH_GCODE)
#define HAS_MENU_BACKLASH
#endif

2
ini/features.ini
View File

@@ -52,7 +52,7 @@ IS_DWIN_MARLINUI = src_filter=+<src/lcd/e3v2/marlinui>
HAS_GRAPHICAL_TFT = src_filter=+<src/lcd/tft>
IS_TFTGLCD_PANEL = src_filter=+<src/lcd/TFTGLCD>
HAS_TOUCH_BUTTONS = src_filter=+<src/lcd/touch/touch_buttons.cpp>
HAS_LCD_MENU = src_filter=+<src/lcd/menu>
HAS_MARLINUI_MENU = src_filter=+<src/lcd/menu>
HAS_GAMES = src_filter=+<src/lcd/menu/game/game.cpp>
MARLIN_BRICKOUT = src_filter=+<src/lcd/menu/game/brickout.cpp>
MARLIN_INVADERS = src_filter=+<src/lcd/menu/game/invaders.cpp>