Skip to content

Commit 212167b

Browse files
authored
📝 No longer experimental (MarlinFirmware#25238)
1 parent d753781 commit 212167b

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

Marlin/Configuration.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -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

+2-3
Original file line numberDiff line numberDiff line change
@@ -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/src/inc/SanityCheck.h

+5-11
Original file line numberDiff line numberDiff line change
@@ -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/Warnings.cpp

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

buildroot/tests/SAMD21_minitronics20

+1-1
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

buildroot/tests/SAMD51_grandcentral_m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R
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 TMC_DEBUG EXPERIMENTAL_SCURVE
29+
SQUARE_WAVE_STEPPING TMC_DEBUG
3030
exec_test $1 $2 "Grand Central M4 with assorted features" "$3"
3131

3232
# clean up

0 commit comments

Comments
 (0)