Skip to content

Commit 2a2cc71

Browse files
committed
Merge 'bugfix-2.1.x' into pr/25232
2 parents 484a12d + da87c20 commit 2a2cc71

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* Advanced settings can be found in Configuration_adv.h
3737
*/
38-
#define CONFIGURATION_H_VERSION 02010200
38+
#define CONFIGURATION_H_VERSION 02010300
3939

4040
//===========================================================================
4141
//============================= Getting Started =============================

Marlin/Configuration_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* Basic settings can be found in Configuration.h
3232
*/
33-
#define CONFIGURATION_ADV_H_VERSION 02010200
33+
#define CONFIGURATION_ADV_H_VERSION 02010300
3434

3535
// @section develop
3636

Marlin/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2023-01-12"
44+
//#define STRING_DISTRIBUTION_DATE "2023-01-14"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/inc/SanityCheck.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
* Warnings for old configurations
8989
*/
9090
#ifndef MOTHERBOARD
91-
#error "MOTHERBOARD is required."
91+
#error "MOTHERBOARD is required. You must '#define MOTHERBOARD BOARD_MYNAME' (not just '#define BOARD_MYNAME')."
9292
#elif !defined(X_BED_SIZE) || !defined(Y_BED_SIZE)
9393
#error "X_BED_SIZE and Y_BED_SIZE are now required!"
9494
#elif WATCH_TEMP_PERIOD > 500

Marlin/src/inc/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45-
#define STRING_DISTRIBUTION_DATE "2023-01-12"
45+
#define STRING_DISTRIBUTION_DATE "2023-01-14"
4646
#endif
4747

4848
/**
@@ -52,7 +52,7 @@
5252
* to alert users to major changes.
5353
*/
5454

55-
#define MARLIN_HEX_VERSION 02010200
55+
#define MARLIN_HEX_VERSION 02010300
5656
#ifndef REQUIRED_CONFIGURATION_H_VERSION
5757
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
5858
#endif

Marlin/src/lcd/e3v2/proui/dwin.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ void update_variable() {
840840
bool DWIN_lcd_sd_status = false;
841841

842842
void SetMediaAutoMount() {
843-
Toogle_Chkb_Line(HMI_data.MediaAutoMount);
843+
Toggle_Chkb_Line(HMI_data.MediaAutoMount);
844844
}
845845

846846
inline uint16_t nr_sd_menu_items() {
@@ -2067,7 +2067,7 @@ void SetLanguage() {
20672067
}
20682068

20692069
bool EnableLiveMove = false;
2070-
void SetLiveMove() { Toogle_Chkb_Line(EnableLiveMove); }
2070+
void SetLiveMove() { Toggle_Chkb_Line(EnableLiveMove); }
20712071
void LiveMove() {
20722072
planner.synchronize();
20732073
if (!EnableLiveMove) return;
@@ -2113,7 +2113,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
21132113

21142114
#if ENABLED(POWER_LOSS_RECOVERY)
21152115
void SetPwrLossr() {
2116-
Toogle_Chkb_Line(recovery.enabled);
2116+
Toggle_Chkb_Line(recovery.enabled);
21172117
recovery.changed();
21182118
}
21192119
#endif
@@ -2139,7 +2139,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
21392139

21402140
#if ENABLED(CASE_LIGHT_MENU)
21412141
void SetCaseLight() {
2142-
Toogle_Chkb_Line(caselight.on);
2142+
Toggle_Chkb_Line(caselight.on);
21432143
caselight.update_enabled();
21442144
}
21452145
#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
@@ -2175,7 +2175,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
21752175

21762176
#if ENABLED(SOUND_MENU_ITEM)
21772177
void SetEnableSound() {
2178-
Toogle_Chkb_Line(ui.sound_on);
2178+
Toggle_Chkb_Line(ui.sound_on);
21792179
}
21802180
#endif
21812181

@@ -2199,7 +2199,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
21992199

22002200
#if ENABLED(BLTOUCH_HS_MODE)
22012201
void SetHSMode() {
2202-
Toogle_Chkb_Line(bltouch.high_speed_mode);
2202+
Toggle_Chkb_Line(bltouch.high_speed_mode);
22032203
}
22042204
#endif
22052205

@@ -2208,7 +2208,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
22082208
#if HAS_FILAMENT_SENSOR
22092209
void SetRunoutEnable() {
22102210
runout.reset();
2211-
Toogle_Chkb_Line(runout.enabled);
2211+
Toggle_Chkb_Line(runout.enabled);
22122212
}
22132213
#if HAS_FILAMENT_RUNOUT_DISTANCE
22142214
void ApplyRunoutDistance() { runout.set_runout_distance(MenuData.Value / MINUNITMULT); }
@@ -2470,7 +2470,7 @@ void TramC () { Tram(4); }
24702470
}
24712471

24722472
void SetManualTramming() {
2473-
Toogle_Chkb_Line(HMI_data.FullManualTramming);
2473+
Toggle_Chkb_Line(HMI_data.FullManualTramming);
24742474
}
24752475

24762476
#endif // HAS_BED_PROBE && HAS_MESH

Marlin/src/lcd/e3v2/proui/menus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void Show_Chkb_Line(const bool checked) {
115115
DWIN_UpdateLCD();
116116
}
117117

118-
void Toogle_Chkb_Line(bool &checked) {
118+
void Toggle_Chkb_Line(bool &checked) {
119119
checked = !checked;
120120
Show_Chkb_Line(checked);
121121
}

Marlin/src/lcd/e3v2/proui/menus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
145145
void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false, bool selected=false);
146146
void Draw_Chkb_Line(const uint8_t line, const bool checked);
147147
void Show_Chkb_Line(const bool checked);
148-
void Toogle_Chkb_Line(bool &checked);
148+
void Toggle_Chkb_Line(bool &checked);
149149
void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value=0);
150150
void onDrawMenuItem(MenuItemClass* menuitem, int8_t line);
151151
void onDrawSubMenu(MenuItemClass* menuitem, int8_t line);

0 commit comments

Comments
 (0)