From 62487c67b6b0142a5a610d46b65c4a07de0f3e62 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 Jan 2023 07:44:57 -0600 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20ProUI=20followup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 16 ++++++++-------- Marlin/src/lcd/e3v2/proui/menus.cpp | 2 +- Marlin/src/lcd/e3v2/proui/menus.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 098db27b1b87..ffb216f05fc3 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -874,7 +874,7 @@ void update_variable() { bool DWIN_lcd_sd_status = false; void SetMediaAutoMount() { - Toogle_Chkb_Line(HMI_data.MediaAutoMount); + Toggle_Chkb_Line(HMI_data.MediaAutoMount); } inline uint16_t nr_sd_menu_items() { @@ -2036,7 +2036,7 @@ void SetLanguage() { } bool EnableLiveMove = false; -void SetLiveMove() { Toogle_Chkb_Line(EnableLiveMove); } +void SetLiveMove() { Toggle_Chkb_Line(EnableLiveMove); } void LiveMove() { planner.synchronize(); if (!EnableLiveMove) return; @@ -2082,7 +2082,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS #if ENABLED(POWER_LOSS_RECOVERY) void SetPwrLossr() { - Toogle_Chkb_Line(recovery.enabled); + Toggle_Chkb_Line(recovery.enabled); recovery.changed(); } #endif @@ -2108,7 +2108,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS #if ENABLED(CASE_LIGHT_MENU) void SetCaseLight() { - Toogle_Chkb_Line(caselight.on); + Toggle_Chkb_Line(caselight.on); caselight.update_enabled(); } #if ENABLED(CASELIGHT_USES_BRIGHTNESS) @@ -2144,7 +2144,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS #if ENABLED(SOUND_MENU_ITEM) void SetEnableSound() { - Toogle_Chkb_Line(ui.sound_on); + Toggle_Chkb_Line(ui.sound_on); } #endif @@ -2168,7 +2168,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS #if ENABLED(BLTOUCH_HS_MODE) void SetHSMode() { - Toogle_Chkb_Line(bltouch.high_speed_mode); + Toggle_Chkb_Line(bltouch.high_speed_mode); } #endif @@ -2177,7 +2177,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS #if HAS_FILAMENT_SENSOR void SetRunoutEnable() { runout.reset(); - Toogle_Chkb_Line(runout.enabled); + Toggle_Chkb_Line(runout.enabled); } #if HAS_FILAMENT_RUNOUT_DISTANCE void ApplyRunoutDistance() { runout.set_runout_distance(MenuData.Value / MINUNITMULT); } @@ -2439,7 +2439,7 @@ void TramC () { Tram(4); } } void SetManualTramming() { - Toogle_Chkb_Line(HMI_data.FullManualTramming); + Toggle_Chkb_Line(HMI_data.FullManualTramming); } #endif // HAS_BED_PROBE && HAS_MESH diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp index 3267eec60d33..540f9e1f417b 100644 --- a/Marlin/src/lcd/e3v2/proui/menus.cpp +++ b/Marlin/src/lcd/e3v2/proui/menus.cpp @@ -115,7 +115,7 @@ void Show_Chkb_Line(const bool checked) { DWIN_UpdateLCD(); } -void Toogle_Chkb_Line(bool &checked) { +void Toggle_Chkb_Line(bool &checked) { checked = !checked; Show_Chkb_Line(checked); } diff --git a/Marlin/src/lcd/e3v2/proui/menus.h b/Marlin/src/lcd/e3v2/proui/menus.h index 9bc9d702bd30..33712f8959ef 100644 --- a/Marlin/src/lcd/e3v2/proui/menus.h +++ b/Marlin/src/lcd/e3v2/proui/menus.h @@ -145,7 +145,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false, bool selected=false); void Draw_Chkb_Line(const uint8_t line, const bool checked); void Show_Chkb_Line(const bool checked); -void Toogle_Chkb_Line(bool &checked); +void Toggle_Chkb_Line(bool &checked); void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value=0); void onDrawMenuItem(MenuItemClass* menuitem, int8_t line); void onDrawSubMenu(MenuItemClass* menuitem, int8_t line);