|
@@ -399,7 +399,7 @@
|
399
|
399
|
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
|
400
|
400
|
#define PID_K1 0.95 // Smoothing factor within any PID loop
|
401
|
401
|
#if ENABLED(PIDTEMP)
|
402
|
|
- //#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
|
|
402
|
+ #define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
|
403
|
403
|
//#define PID_DEBUG // Sends debug data to the serial port.
|
404
|
404
|
//#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
|
405
|
405
|
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
|
|
@@ -411,9 +411,9 @@
|
411
|
411
|
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
|
412
|
412
|
|
413
|
413
|
// Ender-4
|
414
|
|
- #define DEFAULT_Kp 22.57
|
415
|
|
- #define DEFAULT_Ki 1.72
|
416
|
|
- #define DEFAULT_Kd 73.96
|
|
414
|
+ #define DEFAULT_Kp 16.67
|
|
415
|
+ #define DEFAULT_Ki 1.12
|
|
416
|
+ #define DEFAULT_Kd 62.14
|
417
|
417
|
|
418
|
418
|
// Ultimaker
|
419
|
419
|
// #define DEFAULT_Kp 22.2
|
|
@@ -449,7 +449,7 @@
|
449
|
449
|
* heater. If your configuration is significantly different than this and you don't understand
|
450
|
450
|
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
|
451
|
451
|
*/
|
452
|
|
-//#define PIDTEMPBED
|
|
452
|
+#define PIDTEMPBED
|
453
|
453
|
|
454
|
454
|
//#define BED_LIMIT_SWITCHING
|
455
|
455
|
|
|
@@ -502,7 +502,7 @@
|
502
|
502
|
* Note: For Bowden Extruders make this large enough to allow load/unload.
|
503
|
503
|
*/
|
504
|
504
|
#define PREVENT_LENGTHY_EXTRUDE
|
505
|
|
-#define EXTRUDE_MAXLENGTH 500
|
|
505
|
+#define EXTRUDE_MAXLENGTH 750
|
506
|
506
|
|
507
|
507
|
//===========================================================================
|
508
|
508
|
//======================== Thermal Runaway Protection =======================
|
|
@@ -582,7 +582,7 @@
|
582
|
582
|
#endif
|
583
|
583
|
|
584
|
584
|
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
585
|
|
-#define X_MIN_ENDSTOP_INVERTING true//false // set to true to invert the logic of the endstop.
|
|
585
|
+#define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
|
586
|
586
|
#define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
587
|
587
|
#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
588
|
588
|
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
|
@@ -661,14 +661,14 @@
|
661
|
661
|
* Override with M92
|
662
|
662
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
663
|
663
|
*/
|
664
|
|
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 110 }
|
|
664
|
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 100 }
|
665
|
665
|
|
666
|
666
|
/**
|
667
|
667
|
* Default Max Feed Rate (mm/s)
|
668
|
668
|
* Override with M203
|
669
|
669
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
670
|
670
|
*/
|
671
|
|
-#define DEFAULT_MAX_FEEDRATE { 300, 300, 10, 25 }
|
|
671
|
+#define DEFAULT_MAX_FEEDRATE { 500, 500, 15, 25 }
|
672
|
672
|
|
673
|
673
|
/**
|
674
|
674
|
* Default Max Acceleration (change/s) change = mm/s
|
|
@@ -676,7 +676,7 @@
|
676
|
676
|
* Override with M201
|
677
|
677
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
678
|
678
|
*/
|
679
|
|
-#define DEFAULT_MAX_ACCELERATION { 500, 500, 100, 5000 }
|
|
679
|
+#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
|
680
|
680
|
|
681
|
681
|
/**
|
682
|
682
|
* Default Acceleration (change/s) change = mm/s
|
|
@@ -711,7 +711,7 @@
|
711
|
711
|
*
|
712
|
712
|
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
|
713
|
713
|
*/
|
714
|
|
-//#define S_CURVE_ACCELERATION
|
|
714
|
+#define S_CURVE_ACCELERATION
|
715
|
715
|
|
716
|
716
|
//===========================================================================
|
717
|
717
|
//============================= Z Probe Options =============================
|
|
@@ -978,7 +978,7 @@
|
978
|
978
|
#endif
|
979
|
979
|
|
980
|
980
|
#if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS)
|
981
|
|
- //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
|
|
981
|
+ #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
|
982
|
982
|
#endif
|
983
|
983
|
|
984
|
984
|
/**
|
|
@@ -1050,15 +1050,15 @@
|
1050
|
1050
|
*/
|
1051
|
1051
|
//#define AUTO_BED_LEVELING_3POINT
|
1052
|
1052
|
//#define AUTO_BED_LEVELING_LINEAR
|
1053
|
|
-#define AUTO_BED_LEVELING_BILINEAR
|
|
1053
|
+//#define AUTO_BED_LEVELING_BILINEAR
|
1054
|
1054
|
//#define AUTO_BED_LEVELING_UBL
|
1055
|
|
-//#define MESH_BED_LEVELING
|
|
1055
|
+#define MESH_BED_LEVELING
|
1056
|
1056
|
|
1057
|
1057
|
/**
|
1058
|
1058
|
* Normally G28 leaves leveling disabled on completion. Enable
|
1059
|
1059
|
* this option to have G28 restore the prior leveling state.
|
1060
|
1060
|
*/
|
1061
|
|
-//#define RESTORE_LEVELING_AFTER_G28
|
|
1061
|
+#define RESTORE_LEVELING_AFTER_G28
|
1062
|
1062
|
|
1063
|
1063
|
/**
|
1064
|
1064
|
* Enable detailed logging of G28, G29, M48, etc.
|
|
@@ -1153,7 +1153,7 @@
|
1153
|
1153
|
#define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited.
|
1154
|
1154
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
1155
|
1155
|
|
1156
|
|
- //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
|
|
1156
|
+ #define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
|
1157
|
1157
|
|
1158
|
1158
|
#endif // BED_LEVELING
|
1159
|
1159
|
|
|
@@ -1225,7 +1225,7 @@
|
1225
|
1225
|
|
1226
|
1226
|
// Homing speeds (mm/m)
|
1227
|
1227
|
#define HOMING_FEEDRATE_XY (50*60)
|
1228
|
|
-#define HOMING_FEEDRATE_Z (4*60)
|
|
1228
|
+#define HOMING_FEEDRATE_Z (7*60)
|
1229
|
1229
|
|
1230
|
1230
|
// Validate that endstops are triggered on homing moves
|
1231
|
1231
|
#define VALIDATE_HOMING_ENDSTOPS
|
|
@@ -1352,7 +1352,7 @@
|
1352
|
1352
|
* P1 Raise the nozzle always to Z-park height.
|
1353
|
1353
|
* P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
|
1354
|
1354
|
*/
|
1355
|
|
-//#define NOZZLE_PARK_FEATURE
|
|
1355
|
+#define NOZZLE_PARK_FEATURE
|
1356
|
1356
|
|
1357
|
1357
|
#if ENABLED(NOZZLE_PARK_FEATURE)
|
1358
|
1358
|
// Specify a park position as { X, Y, Z }
|
|
@@ -1399,7 +1399,7 @@
|
1399
|
1399
|
* Attention: EXPERIMENTAL. G-code arguments may change.
|
1400
|
1400
|
*
|
1401
|
1401
|
*/
|
1402
|
|
-#define NOZZLE_CLEAN_FEATURE
|
|
1402
|
+//#define NOZZLE_CLEAN_FEATURE
|
1403
|
1403
|
|
1404
|
1404
|
#if ENABLED(NOZZLE_CLEAN_FEATURE)
|
1405
|
1405
|
// Default number of pattern repetitions
|