Skip to content

Commit 23ab793

Browse files
committed
apply latest marlin swx2 default config changes
1 parent a2c2c1f commit 23ab793

File tree

2 files changed

+59
-43
lines changed

2 files changed

+59
-43
lines changed

Marlin/Configuration.h

+39-21
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#define CONFIG_EXAMPLES_DIR "config/examples/Artillery/Sidewinder X2"
24+
#define CONFIG_EXAMPLES_DIR "config/examples/Artillery/Sidewinder X2"
2525

2626
/**
2727
* Configuration.h
@@ -115,6 +115,7 @@
115115
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
116116
*/
117117
#define BAUDRATE 250000
118+
118119
#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate
119120

120121
/**
@@ -658,14 +659,20 @@
658659
//============================= PID Settings ================================
659660
//===========================================================================
660661

661-
// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
662-
// temperature control. Disable both for bang-bang heating.
663-
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
664-
//#define MPCTEMP // ** EXPERIMENTAL **
662+
// @section hotend temp
663+
664+
/**
665+
* Temperature Control
666+
*
667+
* (NONE) : Bang-bang heating
668+
* PIDTEMP : PID temperature control (~4.1K)
669+
* MPCTEMP : Predictive Model temperature control. (~1.8K without auto-tune)
670+
*/
671+
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
672+
//#define MPCTEMP // ** EXPERIMENTAL ** See https://marlinfw.org/docs/features/model_predictive_control.html
665673

666-
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
667-
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
668-
#define PID_K1 0.95 // Smoothing factor within any PID loop
674+
#define PID_MAX 255 // Limit hotend current while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
675+
#define PID_K1 0.95 // Smoothing factor within any PID loop
669676

670677
#if ENABLED(PIDTEMP)
671678
//#define PID_DEBUG // Print PID debug data to the serial port. Use 'M303 D' to toggle activation.
@@ -762,16 +769,6 @@
762769
*/
763770
#define PIDTEMPBED
764771

765-
//#define BED_LIMIT_SWITCHING
766-
767-
/**
768-
* Max Bed Power
769-
* Applies to all forms of bed control (PID, bang-bang, and bang-bang with hysteresis).
770-
* When set to any value below 255, enables a form of PWM to the bed that acts like a divider
771-
* so don't use it unless you are OK with PWM on your bed. (See the comment on enabling PIDTEMPBED)
772-
*/
773-
#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
774-
775772
#if ENABLED(PIDTEMPBED)
776773
//#define MIN_BED_POWER 0
777774
//#define PID_BED_DEBUG // Print Bed PID debug data to the serial port.
@@ -1408,7 +1405,28 @@
14081405
#define Z_PROBE_RETRACT_X X_MAX_POS
14091406
#endif
14101407

1411-
// Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
1408+
/**
1409+
* Magnetically Mounted Probe
1410+
* For probes such as Euclid, Klicky, Klackender, etc.
1411+
*/
1412+
//#define MAG_MOUNTED_PROBE
1413+
#if ENABLED(MAG_MOUNTED_PROBE)
1414+
#define PROBE_DEPLOY_FEEDRATE (133*60) // (mm/min) Probe deploy speed
1415+
#define PROBE_STOW_FEEDRATE (133*60) // (mm/min) Probe stow speed
1416+
1417+
#define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 245, 114, 30 } } // Move to side Dock & Attach probe
1418+
#define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } } // Move probe off dock
1419+
#define MAG_MOUNTED_DEPLOY_3 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed
1420+
#define MAG_MOUNTED_DEPLOY_4 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed
1421+
#define MAG_MOUNTED_DEPLOY_5 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed
1422+
#define MAG_MOUNTED_STOW_1 { PROBE_STOW_FEEDRATE, { 245, 114, 20 } } // Move to dock
1423+
#define MAG_MOUNTED_STOW_2 { PROBE_STOW_FEEDRATE, { 245, 114, 0 } } // Place probe beside remover
1424+
#define MAG_MOUNTED_STOW_3 { PROBE_STOW_FEEDRATE, { 230, 114, 0 } } // Side move to remove probe
1425+
#define MAG_MOUNTED_STOW_4 { PROBE_STOW_FEEDRATE, { 210, 114, 20 } } // Side move to remove probe
1426+
#define MAG_MOUNTED_STOW_5 { PROBE_STOW_FEEDRATE, { 0, 0, 0 } } // Extra move if needed
1427+
#endif
1428+
1429+
// Duet Smart Effector (for delta printers) - https://docs.duet3d.com/en/Duet3D_hardware/Accessories/Smart_Effector
14121430
// When the pin is defined you can use M672 to set/reset the probe sensitivity.
14131431
//#define DUET_SMART_EFFECTOR
14141432
#if ENABLED(DUET_SMART_EFFECTOR)
@@ -1495,7 +1513,7 @@
14951513
* | [-] |
14961514
* O-- FRONT --+
14971515
*/
1498-
#define NOZZLE_TO_PROBE_OFFSET { 27.25, -12.8, -1 }
1516+
#define NOZZLE_TO_PROBE_OFFSET { 27.25, -12.8, -2 }
14991517

15001518
// Most probes should stay away from the edges of the bed, but
15011519
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
@@ -1787,7 +1805,7 @@
17871805
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
17881806
#define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
17891807
#define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
1790-
#define FIL_RUNOUT_PIN PA0 // Sets the Filament Runout sensor to the Z Endstop so that u can monitor it with Octoprint
1808+
#define FIL_RUNOUT_PIN PA0
17911809
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
17921810
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
17931811
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.

Marlin/Configuration_adv.h

+20-22
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#define CONFIG_EXAMPLES_DIR "config/examples/Artillery/Sidewinder X2"
24+
#define CONFIG_EXAMPLES_DIR "config/examples/Artillery/Sidewinder X2"
2525

2626
/**
2727
* Configuration_adv.h
@@ -970,7 +970,7 @@
970970
* Z Steppers Auto-Alignment
971971
* Add the G34 command to align multiple Z steppers using a bed probe.
972972
*/
973-
//#define Z_STEPPER_AUTO_ALIGN
973+
#define Z_STEPPER_AUTO_ALIGN
974974
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
975975
/**
976976
* Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
@@ -1088,11 +1088,11 @@
10881088
#define INPUT_SHAPING_Y
10891089
#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
10901090
#if ENABLED(INPUT_SHAPING_X)
1091-
#define SHAPING_FREQ_X 49.8 // (Hz) The default dominant resonant frequency on the X axis.
1091+
#define SHAPING_FREQ_X 52 // (Hz) The default dominant resonant frequency on the X axis.
10921092
#define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
10931093
#endif
10941094
#if ENABLED(INPUT_SHAPING_Y)
1095-
#define SHAPING_FREQ_Y 48.2 // (Hz) The default dominant resonant frequency on the Y axis.
1095+
#define SHAPING_FREQ_Y 30 // (Hz) The default dominant resonant frequency on the Y axis.
10961096
#define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
10971097
#endif
10981098
//#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage.
@@ -1483,17 +1483,19 @@
14831483
#endif
14841484
#endif
14851485

1486-
#endif
1487-
1488-
// LCD Print Progress options
1489-
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
1490-
#if CAN_SHOW_REMAINING_TIME
1491-
#define SHOW_REMAINING_TIME // Display estimated time to completion
1492-
#if ENABLED(SHOW_REMAINING_TIME)
1493-
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
1494-
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
1495-
#endif
1486+
#endif // HAS_DISPLAY || DWIN_LCD_PROUI
1487+
1488+
// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
1489+
#define SET_PROGRESS_MANUALLY
1490+
#if ENABLED(SET_PROGRESS_MANUALLY)
1491+
#define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done
1492+
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
1493+
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
1494+
#define M73_REPORT // Report M73 values to host
1495+
#if BOTH(M73_REPORT, SDSUPPORT)
1496+
#define M73_REPORT_SD_ONLY // Report only when printing from SD
14961497
#endif
1498+
#endif
14971499

14981500
// LCD Print Progress options. Multiple times may be displayed in turn.
14991501
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
@@ -2294,7 +2296,7 @@
22942296
#define MIN_CIRCLE_SEGMENTS 72 // Minimum number of segments in a complete circle
22952297
//#define ARC_SEGMENTS_PER_SEC 50 // Use the feedrate to choose the segment length
22962298
#define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
2297-
#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
2299+
#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
22982300
//#define SF_ARC_FIX // Enable only if using SkeinForge with "Arc Point" fillet procedure
22992301
#endif
23002302

@@ -2687,15 +2689,13 @@
26872689
//#define FILAMENT_CHANGE_RESUME_ON_INSERT // Automatically continue / load filament when runout sensor is triggered again.
26882690
//#define PAUSE_REHEAT_FAST_RESUME // Reduce number of waits by not prompting again post-timeout before continuing.
26892691

2690-
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
2692+
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
26912693
//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
26922694

2693-
#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
2695+
#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
26942696
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
26952697
#endif
26962698

2697-
// @section tmc
2698-
26992699
// @section tmc_smart
27002700

27012701
/**
@@ -3722,8 +3722,6 @@
37223722
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
37233723
#endif
37243724

3725-
// @section gcode
3726-
37273725
/**
37283726
* Startup commands
37293727
*
@@ -3866,7 +3864,7 @@
38663864
#define HOST_PAUSE_M76 // Tell the host to pause in response to M76
38673865
#define HOST_PROMPT_SUPPORT // Initiate host prompts to get user feedback
38683866
#if ENABLED(HOST_PROMPT_SUPPORT)
3869-
#define HOST_STATUS_NOTIFICATIONS // Send some status messages to the host as notifications
3867+
#define HOST_STATUS_NOTIFICATIONS // Send some status messages to the host as notifications
38703868
#endif
38713869
//#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
38723870
//#define HOST_SHUTDOWN_MENU_ITEM // Add a menu item that tells the host to shut down

0 commit comments

Comments
 (0)