Skip to content

Commit

Permalink
✏️ ProUI followup
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Apr 7, 2023
1 parent 6cf085d commit 62487c6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Marlin/src/lcd/e3v2/proui/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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); }
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/menus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/menus.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 62487c6

Please sign in to comment.