|
@@ -122,7 +122,7 @@
|
122
|
122
|
*
|
123
|
123
|
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000]
|
124
|
124
|
*/
|
125
|
|
-#define BAUDRATE 250000
|
|
125
|
+#define BAUDRATE 115200
|
126
|
126
|
|
127
|
127
|
// Enable the Bluetooth serial interface on AT90USB devices
|
128
|
128
|
//#define BLUETOOTH
|
|
@@ -190,7 +190,7 @@
|
190
|
190
|
*
|
191
|
191
|
* :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' }
|
192
|
192
|
*/
|
193
|
|
-#define POWER_SUPPLY 1
|
|
193
|
+#define POWER_SUPPLY 0
|
194
|
194
|
|
195
|
195
|
#if POWER_SUPPLY > 0
|
196
|
196
|
// Enable this option to leave the PSU off at startup.
|
|
@@ -206,7 +206,7 @@
|
206
|
206
|
|
207
|
207
|
/**
|
208
|
208
|
* --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
|
209
|
|
- *
|
|
209
|
+ *
|
210
|
210
|
* Temperature sensors available:
|
211
|
211
|
*
|
212
|
212
|
* -3 : thermocouple with MAX31855 (only for sensor 0)
|
|
@@ -231,13 +231,13 @@
|
231
|
231
|
* 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
|
232
|
232
|
* 66 : 4.7M High Temperature thermistor from Dyze Design
|
233
|
233
|
* 70 : the 100K thermistor found in the bq Hephestos 2
|
234
|
|
- *
|
|
234
|
+ *
|
235
|
235
|
* 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
|
236
|
236
|
* (but gives greater accuracy and more stable PID)
|
237
|
237
|
* 51 : 100k thermistor - EPCOS (1k pullup)
|
238
|
238
|
* 52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
|
239
|
239
|
* 55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
|
240
|
|
- *
|
|
240
|
+ *
|
241
|
241
|
* 1047 : Pt1000 with 4k7 pullup
|
242
|
242
|
* 1010 : Pt1000 with 1k pullup (non standard)
|
243
|
243
|
* 147 : Pt100 with 4k7 pullup
|
|
@@ -249,10 +249,10 @@
|
249
|
249
|
*
|
250
|
250
|
* :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" }
|
251
|
251
|
*/
|
252
|
|
-#define TEMP_SENSOR_0 70
|
253
|
|
-#define TEMP_SENSOR_1 0
|
254
|
|
-#define TEMP_SENSOR_2 0
|
255
|
|
-#define TEMP_SENSOR_3 0
|
|
252
|
+#define TEMP_SENSOR_0 70
|
|
253
|
+#define TEMP_SENSOR_1 0
|
|
254
|
+#define TEMP_SENSOR_2 0
|
|
255
|
+#define TEMP_SENSOR_3 0
|
256
|
256
|
#define TEMP_SENSOR_BED 0
|
257
|
257
|
|
258
|
258
|
// Dummy thermistor constant temperature readings, for use with 998 and 999
|
|
@@ -308,7 +308,7 @@
|
308
|
308
|
//#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
|
309
|
309
|
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
|
310
|
310
|
// Set/get with gcode: M301 E[extruder number, 0-2]
|
311
|
|
- #define PID_FUNCTIONAL_RANGE 250 // If the temperature difference between the target temperature and the actual temperature
|
|
311
|
+ #define PID_FUNCTIONAL_RANGE 50 // If the temperature difference between the target temperature and the actual temperature
|
312
|
312
|
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
|
313
|
313
|
#define K1 0.95 //smoothing factor within the PID
|
314
|
314
|
|
|
@@ -457,7 +457,7 @@
|
457
|
457
|
|
458
|
458
|
// Enable this feature if all enabled endstop pins are interrupt-capable.
|
459
|
459
|
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
|
460
|
|
-//#define ENDSTOP_INTERRUPTS_FEATURE
|
|
460
|
+#define ENDSTOP_INTERRUPTS_FEATURE
|
461
|
461
|
|
462
|
462
|
//=============================================================================
|
463
|
463
|
//============================== Movement Settings ============================
|
|
@@ -480,7 +480,7 @@
|
480
|
480
|
* Override with M92
|
481
|
481
|
* X, Y, Z, E0 [, E1[, E2[, E3]]]
|
482
|
482
|
*/
|
483
|
|
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 8000, 210.02 }
|
|
483
|
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 8000, 204 }
|
484
|
484
|
|
485
|
485
|
/**
|
486
|
486
|
* Default Max Feed Rate (mm/s)
|
|
@@ -495,7 +495,7 @@
|
495
|
495
|
* Override with M201
|
496
|
496
|
* X, Y, Z, E0 [, E1[, E2[, E3]]]
|
497
|
497
|
*/
|
498
|
|
-#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 20, 1000 }
|
|
498
|
+#define DEFAULT_MAX_ACCELERATION { 800, 800, 20, 1000 }
|
499
|
499
|
|
500
|
500
|
/**
|
501
|
501
|
* Default Acceleration (change/s) change = mm/s
|
|
@@ -505,8 +505,8 @@
|
505
|
505
|
* M204 R Retract Acceleration
|
506
|
506
|
* M204 T Travel Acceleration
|
507
|
507
|
*/
|
508
|
|
-#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves
|
509
|
|
-#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
|
|
508
|
+#define DEFAULT_ACCELERATION 800 // X, Y, Z and E acceleration for printing moves
|
|
509
|
+#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
|
510
|
510
|
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
|
511
|
511
|
|
512
|
512
|
/**
|
|
@@ -517,10 +517,10 @@
|
517
|
517
|
* When changing speed and direction, if the difference is less than the
|
518
|
518
|
* value set here, it may happen instantaneously.
|
519
|
519
|
*/
|
520
|
|
-#define DEFAULT_XJERK 20.0
|
521
|
|
-#define DEFAULT_YJERK 20.0
|
|
520
|
+#define DEFAULT_XJERK 10.0
|
|
521
|
+#define DEFAULT_YJERK 10.0
|
522
|
522
|
#define DEFAULT_ZJERK 0.4
|
523
|
|
-#define DEFAULT_EJERK 2.0
|
|
523
|
+#define DEFAULT_EJERK 1.0
|
524
|
524
|
|
525
|
525
|
|
526
|
526
|
//===========================================================================
|
|
@@ -625,11 +625,11 @@
|
625
|
625
|
// Enable Z_MIN_PROBE_ENDSTOP to use _both_ a Z Probe and a Z-min-endstop on the same machine.
|
626
|
626
|
// With this option the Z_MIN_PROBE_PIN will only be used for probing, never for homing.
|
627
|
627
|
//
|
628
|
|
-#define Z_MIN_PROBE_ENDSTOP
|
|
628
|
+//#define Z_MIN_PROBE_ENDSTOP
|
629
|
629
|
|
630
|
630
|
// Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE.
|
631
|
631
|
// The Z_MIN_PIN will then be used for both Z-homing and probing.
|
632
|
|
-//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
|
632
|
+#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
633
|
633
|
|
634
|
634
|
// To use a probe you must enable one of the two options above!
|
635
|
635
|
|
|
@@ -650,7 +650,7 @@
|
650
|
650
|
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
|
651
|
651
|
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
|
652
|
652
|
*/
|
653
|
|
-#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow
|
|
653
|
+#define Z_CLEARANCE_DEPLOY_PROBE 0 // Z Clearance for Deploy/Stow
|
654
|
654
|
#define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
|
655
|
655
|
|
656
|
656
|
//
|
|
@@ -821,10 +821,10 @@
|
821
|
821
|
// The height can be set with M420 Z<height>
|
822
|
822
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
823
|
823
|
|
824
|
|
- //
|
|
824
|
+ //
|
825
|
825
|
// Experimental Subdivision of the grid by Catmull-Rom method.
|
826
|
826
|
// Synthesizes intermediate points to produce a more detailed mesh.
|
827
|
|
- //
|
|
827
|
+ //
|
828
|
828
|
//#define ABL_BILINEAR_SUBDIVISION
|
829
|
829
|
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
|
830
|
830
|
// Number of subdivisions between probe points
|
|
@@ -880,8 +880,8 @@
|
880
|
880
|
#endif
|
881
|
881
|
|
882
|
882
|
// Homing speeds (mm/m)
|
883
|
|
-#define HOMING_FEEDRATE_XY (150*60)
|
884
|
|
-#define HOMING_FEEDRATE_Z 200
|
|
883
|
+#define HOMING_FEEDRATE_XY (60*60)
|
|
884
|
+#define HOMING_FEEDRATE_Z 120
|
885
|
885
|
|
886
|
886
|
//=============================================================================
|
887
|
887
|
//============================= Additional Features ===========================
|
|
@@ -911,7 +911,7 @@
|
911
|
911
|
// every couple of seconds when it can't accept commands.
|
912
|
912
|
//
|
913
|
913
|
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
|
914
|
|
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
914
|
+#define DEFAULT_KEEPALIVE_INTERVAL 10 // Number of seconds between "busy" messages. Set with M113.
|
915
|
915
|
|
916
|
916
|
//
|
917
|
917
|
// M100 Free Memory Watcher
|
|
@@ -956,11 +956,11 @@
|
956
|
956
|
// P2: The nozzle height will be raised by Z-park amount but never going over
|
957
|
957
|
// the machine's limit of Z_MAX_POS.
|
958
|
958
|
//
|
959
|
|
-//#define NOZZLE_PARK_FEATURE
|
|
959
|
+#define NOZZLE_PARK_FEATURE
|
960
|
960
|
|
961
|
961
|
#if ENABLED(NOZZLE_PARK_FEATURE)
|
962
|
962
|
// Specify a park position as { X, Y, Z }
|
963
|
|
- #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
|
|
963
|
+ #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 10 }
|
964
|
964
|
#endif
|
965
|
965
|
|
966
|
966
|
//
|
|
@@ -997,18 +997,18 @@
|
997
|
997
|
// Attention: This is an EXPERIMENTAL feature, in the future the G-code arguments
|
998
|
998
|
// may change to add new functionality like different wipe patterns.
|
999
|
999
|
//
|
1000
|
|
-//#define NOZZLE_CLEAN_FEATURE
|
|
1000
|
+#define NOZZLE_CLEAN_FEATURE
|
1001
|
1001
|
|
1002
|
1002
|
#if ENABLED(NOZZLE_CLEAN_FEATURE)
|
1003
|
1003
|
// Number of pattern repetitions
|
1004
|
1004
|
#define NOZZLE_CLEAN_STROKES 12
|
1005
|
1005
|
|
1006
|
1006
|
// Specify positions as { X, Y, Z }
|
1007
|
|
- #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
|
1008
|
|
- #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
|
|
1007
|
+ #define NOZZLE_CLEAN_START_POINT { X_MIN_POS + 10, Y_MAX_POS - 9, (Z_MIN_POS + 0.5)}
|
|
1008
|
+ #define NOZZLE_CLEAN_END_POINT { X_MIN_POS + 90, Y_MAX_POS - 0, (Z_MIN_POS + 0.5)}
|
1009
|
1009
|
|
1010
|
1010
|
// Moves the nozzle to the initial position
|
1011
|
|
- #define NOZZLE_CLEAN_GOBACK
|
|
1011
|
+ //#define NOZZLE_CLEAN_GOBACK
|
1012
|
1012
|
#endif
|
1013
|
1013
|
|
1014
|
1014
|
//
|