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/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