Skip to content

Commit 7e8c922

Browse files
committed
Merge 'bugfix-2.1.x' into pr/25232
2 parents 484a12d + 212167b commit 7e8c922

11 files changed

Lines changed: 34 additions & 35 deletions

File tree

Marlin/Configuration.h

Lines changed: 3 additions & 4 deletions
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 =============================
@@ -2019,7 +2019,7 @@
20192019
//#define EXTRAPOLATE_BEYOND_GRID
20202020

20212021
//
2022-
// Experimental Subdivision of the grid by Catmull-Rom method.
2022+
// Subdivision of the grid by Catmull-Rom method.
20232023
// Synthesizes intermediate points to produce a more detailed mesh.
20242024
//
20252025
//#define ABL_BILINEAR_SUBDIVISION
@@ -2304,7 +2304,7 @@
23042304
#endif
23052305

23062306
/**
2307-
* Clean Nozzle Feature -- EXPERIMENTAL
2307+
* Clean Nozzle Feature
23082308
*
23092309
* Adds the G12 command to perform a nozzle cleaning process.
23102310
*
@@ -2338,7 +2338,6 @@
23382338
* Before starting, the nozzle moves to NOZZLE_CLEAN_START_POINT.
23392339
*
23402340
* Caveats: The ending Z should be the same as starting Z.
2341-
* Attention: EXPERIMENTAL. G-code arguments may change.
23422341
*/
23432342
//#define NOZZLE_CLEAN_FEATURE
23442343

Marlin/Configuration_adv.h

Lines changed: 3 additions & 4 deletions
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

@@ -375,7 +375,7 @@
375375
#endif
376376

377377
#if ENABLED(PIDTEMP)
378-
// Add an experimental additional term to the heater power, proportional to the extrusion speed.
378+
// Add an additional term to the heater power, proportional to the extrusion speed.
379379
// A well-chosen Kc value should add just enough power to melt the increased material volume.
380380
//#define PID_EXTRUSION_SCALING
381381
#if ENABLED(PID_EXTRUSION_SCALING)
@@ -384,7 +384,7 @@
384384
#endif
385385

386386
/**
387-
* Add an experimental additional term to the heater power, proportional to the fan speed.
387+
* Add an additional term to the heater power, proportional to the fan speed.
388388
* A well-chosen Kf value should add just enough power to compensate for power-loss from the cooling fan.
389389
* You can either just add a constant compensation with the DEFAULT_Kf value
390390
* or follow the instruction below to get speed-dependent compensation.
@@ -2121,7 +2121,6 @@
21212121
#endif
21222122
//#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L.
21232123
//#define LA_DEBUG // Print debug information to serial during operation. Disable for production use.
2124-
//#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA.
21252124
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
21262125
//#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
21272126
#endif

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-15"
4545

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

Marlin/src/inc/SanityCheck.h

Lines changed: 6 additions & 12 deletions
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
@@ -666,6 +666,8 @@
666666
#error "SCARA_FEEDRATE_SCALING is now FEEDRATE_SCALING."
667667
#elif defined(MILLISECONDS_PREHEAT_TIME)
668668
#error "MILLISECONDS_PREHEAT_TIME is now PREHEAT_TIME_HOTEND_MS."
669+
#elif defined(EXPERIMENTAL_SCURVE)
670+
#error "EXPERIMENTAL_SCURVE is no longer needed and should be removed."
669671
#endif
670672

671673
// L64xx stepper drivers have been removed
@@ -1370,22 +1372,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
13701372
#else
13711373
static_assert(WITHIN(ADVANCE_K, 0, 10), "ADVANCE_K must be from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9).");
13721374
#endif
1373-
#if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
1374-
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
1375-
#elif ENABLED(DIRECT_STEPPING)
1376-
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
1375+
1376+
#if ENABLED(DIRECT_STEPPING)
1377+
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. (Extrusion is controlled externally by the Step Daemon.)"
13771378
#elif NONE(HAS_JUNCTION_DEVIATION, ALLOW_LOW_EJERK) && defined(DEFAULT_EJERK)
13781379
static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE. Enable ALLOW_LOW_EJERK to bypass this alert (e.g., for direct drive).");
13791380
#endif
13801381
#endif
13811382

1382-
/**
1383-
* POLAR warnings
1384-
*/
1385-
#if BOTH(POLAR, S_CURVE_ACCELERATION)
1386-
#warning "POLAR Kinematics may not work well with S_CURVE_ACCELERATION."
1387-
#endif
1388-
13891383
/**
13901384
* Special tool-changing options
13911385
*/

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-15"
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/inc/Warnings.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,3 +783,10 @@
783783
#if ENABLED(BD_SENSOR) && DISABLED(BABYSTEPPING)
784784
#warning "BABYSTEPPING is recommended with BD_SENSOR."
785785
#endif
786+
787+
/**
788+
* POLAR warnings
789+
*/
790+
#if BOTH(POLAR, S_CURVE_ACCELERATION)
791+
#warning "POLAR kinematics may not work well with S_CURVE_ACCELERATION."
792+
#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);

buildroot/tests/SAMD21_minitronics20

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \
2626
SCROLL_LONG_FILENAMES BABYSTEPPING DOUBLECLICK_FOR_Z_BABYSTEPPING \
2727
MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
2828
LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS SENSORLESS_HOMING \
29-
SQUARE_WAVE_STEPPING EXPERIMENTAL_SCURVE
29+
SQUARE_WAVE_STEPPING
3030
exec_test $1 $2 "Minitronics 2.0 with assorted features" "$3"
3131

3232
# clean up

0 commit comments

Comments
 (0)