Skip to content

Commit cb39247

Browse files
committed
revert some unintentional config changes from 2.1.2.2 merge
Walked through the diff and noticed some config flags that have been disabled unintentionally. Restore them. Fixes: 752476d
1 parent 80e121b commit cb39247

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Marlin/Configuration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@
16051605
*
16061606
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
16071607
*/
1608-
//#define S_CURVE_ACCELERATION
1608+
#define S_CURVE_ACCELERATION
16091609

16101610
//===========================================================================
16111611
//============================= Z Probe Options =============================

Marlin/Configuration_adv.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1523,12 +1523,12 @@
15231523
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
15241524

15251525
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
1526-
//#define SET_PROGRESS_MANUALLY
1526+
#define SET_PROGRESS_MANUALLY
15271527
#if ENABLED(SET_PROGRESS_MANUALLY)
15281528
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
15291529
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
1530-
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
1531-
//#define M73_REPORT // Report M73 values to host
1530+
#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
1531+
#define M73_REPORT // Report M73 values to host
15321532
#if BOTH(M73_REPORT, SDSUPPORT)
15331533
#define M73_REPORT_SD_ONLY // Report only when printing from SD
15341534
#endif
@@ -1575,7 +1575,7 @@
15751575
//#define SD_IGNORE_AT_STARTUP // Don't mount the SD card when starting up
15761576
//#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
15771577

1578-
//#define GCODE_REPEAT_MARKERS // Enable G-code M808 to set repeat markers and do looping
1578+
#define GCODE_REPEAT_MARKERS // Enable G-code M808 to set repeat markers and do looping
15791579

15801580
#define SD_PROCEDURE_DEPTH 1 // Increase if you need more nested M32 calls
15811581

@@ -1655,7 +1655,7 @@
16551655
* - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
16561656
* - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
16571657
*/
1658-
//#define SDCARD_SORT_ALPHA
1658+
#define SDCARD_SORT_ALPHA
16591659

16601660
// SD Card Sorting options
16611661
#if ENABLED(SDCARD_SORT_ALPHA)
@@ -2778,7 +2778,7 @@
27782778
// Filament can be extruded repeatedly from the Filament Change menu
27792779
// until extrusion is consistent, and to purge old filament.
27802780
//#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
2781-
//#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
2781+
#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
27822782

27832783
// Filament Unload does a Retract, Delay, and Purge first:
27842784
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.

0 commit comments

Comments
 (0)