|
@@ -8,7 +8,7 @@
|
8
|
8
|
//===========================================================================
|
9
|
9
|
/*
|
10
|
10
|
Here are some standard links for getting your machine calibrated:
|
11
|
|
- * http://reprap.org/wiki/Calibration
|
|
11
|
+ * http://reprap.org/wiki/Calibration
|
12
|
12
|
* http://youtu.be/wAL9d7FgInk
|
13
|
13
|
* http://calculator.josefprusa.cz
|
14
|
14
|
* http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
|
|
@@ -59,7 +59,7 @@ Here are some standard links for getting your machine calibrated:
|
59
|
59
|
// The following define selects which electronics board you have.
|
60
|
60
|
// Please choose the name from boards.h that matches your setup
|
61
|
61
|
#ifndef MOTHERBOARD
|
62
|
|
- #define MOTHERBOARD BOARD_ULTIMAKER
|
|
62
|
+ #define MOTHERBOARD BOARD_FELIX2
|
63
|
63
|
#endif
|
64
|
64
|
|
65
|
65
|
// Define this to set a custom name for your generic Mendel,
|
|
@@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated:
|
79
|
79
|
#define POWER_SUPPLY 1
|
80
|
80
|
|
81
|
81
|
// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
|
82
|
|
-// #define PS_DEFAULT_OFF
|
|
82
|
+#define PS_DEFAULT_OFF
|
83
|
83
|
|
84
|
84
|
//===========================================================================
|
85
|
85
|
//============================= Thermal Settings ============================
|
|
@@ -104,7 +104,7 @@ Here are some standard links for getting your machine calibrated:
|
104
|
104
|
// 10 is 100k RS thermistor 198-961 (4.7k pullup)
|
105
|
105
|
// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
|
106
|
106
|
// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
|
107
|
|
-// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
|
|
107
|
+// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
|
108
|
108
|
// 20 is the PT100 circuit found in the Ultimainboard V2.x
|
109
|
109
|
// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
|
110
|
110
|
//
|
|
@@ -118,16 +118,16 @@ Here are some standard links for getting your machine calibrated:
|
118
|
118
|
// 1010 is Pt1000 with 1k pullup (non standard)
|
119
|
119
|
// 147 is Pt100 with 4k7 pullup
|
120
|
120
|
// 110 is Pt100 with 1k pullup (non standard)
|
121
|
|
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
|
|
121
|
+// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
|
122
|
122
|
// Use it for Testing or Development purposes. NEVER for production machine.
|
123
|
123
|
// #define DUMMY_THERMISTOR_998_VALUE 25
|
124
|
124
|
// #define DUMMY_THERMISTOR_999_VALUE 100
|
125
|
125
|
|
126
|
|
-#define TEMP_SENSOR_0 -1
|
127
|
|
-#define TEMP_SENSOR_1 -1
|
|
126
|
+#define TEMP_SENSOR_0 1
|
|
127
|
+#define TEMP_SENSOR_1 1
|
128
|
128
|
#define TEMP_SENSOR_2 0
|
129
|
129
|
#define TEMP_SENSOR_3 0
|
130
|
|
-#define TEMP_SENSOR_BED 0
|
|
130
|
+#define TEMP_SENSOR_BED 1
|
131
|
131
|
|
132
|
132
|
// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
|
133
|
133
|
//#define TEMP_SENSOR_1_AS_REDUNDANT
|
|
@@ -187,10 +187,10 @@ Here are some standard links for getting your machine calibrated:
|
187
|
187
|
#define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
|
188
|
188
|
|
189
|
189
|
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
|
190
|
|
-// Ultimaker
|
191
|
|
- #define DEFAULT_Kp 22.2
|
192
|
|
- #define DEFAULT_Ki 1.08
|
193
|
|
- #define DEFAULT_Kd 114
|
|
190
|
+// Felix 2.0+ electronics with v4 Hotend
|
|
191
|
+#define DEFAULT_Kp 12
|
|
192
|
+#define DEFAULT_Ki 0.84
|
|
193
|
+#define DEFAULT_Kd 85
|
194
|
194
|
|
195
|
195
|
// MakerGear
|
196
|
196
|
// #define DEFAULT_Kp 7.0
|
|
@@ -263,15 +263,15 @@ The issue: If a thermistor come off, it will read a lower temperature than actua
|
263
|
263
|
The system will turn the heater on forever, burning up the filament and anything
|
264
|
264
|
else around.
|
265
|
265
|
|
266
|
|
-After the temperature reaches the target for the first time, this feature will
|
267
|
|
-start measuring for how long the current temperature stays below the target
|
|
266
|
+After the temperature reaches the target for the first time, this feature will
|
|
267
|
+start measuring for how long the current temperature stays below the target
|
268
|
268
|
minus _HYSTERESIS (set_temperature - THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).
|
269
|
269
|
|
270
|
270
|
If it stays longer than _PERIOD, it means the thermistor temperature
|
271
|
271
|
cannot catch up with the target, so something *may be* wrong. Then, to be on the
|
272
|
272
|
safe side, the system will he halt.
|
273
|
273
|
|
274
|
|
-Bear in mind the count down will just start AFTER the first time the
|
|
274
|
+Bear in mind the count down will just start AFTER the first time the
|
275
|
275
|
thermistor temperature is over the target, so you will have no problem if
|
276
|
276
|
your extruder heater takes 2 minutes to hit the target on heating.
|
277
|
277
|
|
|
@@ -321,13 +321,13 @@ your extruder heater takes 2 minutes to hit the target on heating.
|
321
|
321
|
#endif
|
322
|
322
|
|
323
|
323
|
// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
|
324
|
|
-const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
325
|
|
-const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
326
|
|
-const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
|
324
|
+const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
|
|
325
|
+const bool Y_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
|
|
326
|
+const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
|
327
|
327
|
const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
328
|
328
|
const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
329
|
329
|
const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
330
|
|
-//#define DISABLE_MAX_ENDSTOPS
|
|
330
|
+#define DISABLE_MAX_ENDSTOPS
|
331
|
331
|
//#define DISABLE_MIN_ENDSTOPS
|
332
|
332
|
|
333
|
333
|
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
|
|
@@ -344,7 +344,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
344
|
344
|
#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
|
345
|
345
|
|
346
|
346
|
#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true
|
347
|
|
-#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false
|
|
347
|
+#define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false
|
348
|
348
|
#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true
|
349
|
349
|
#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
|
350
|
350
|
#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
|
|
@@ -361,11 +361,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
361
|
361
|
#define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below.
|
362
|
362
|
|
363
|
363
|
// Travel limits after homing (units are in mm)
|
364
|
|
-#define X_MAX_POS 205
|
|
364
|
+#define X_MAX_POS 245
|
365
|
365
|
#define X_MIN_POS 0
|
366
|
366
|
#define Y_MAX_POS 205
|
367
|
367
|
#define Y_MIN_POS 0
|
368
|
|
-#define Z_MAX_POS 200
|
|
368
|
+#define Z_MAX_POS 235
|
369
|
369
|
#define Z_MIN_POS 0
|
370
|
370
|
|
371
|
371
|
#define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
|
|
@@ -378,7 +378,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
378
|
378
|
//===========================================================================
|
379
|
379
|
|
380
|
380
|
//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line)
|
381
|
|
-#define Z_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
|
|
381
|
+//#define Z_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
|
382
|
382
|
|
383
|
383
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
384
|
384
|
|
|
@@ -487,9 +487,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
487
|
487
|
#endif
|
488
|
488
|
#endif
|
489
|
489
|
|
490
|
|
-
|
|
490
|
+
|
491
|
491
|
#endif
|
492
|
|
-
|
|
492
|
+
|
493
|
493
|
#endif // ENABLE_AUTO_BED_LEVELING
|
494
|
494
|
|
495
|
495
|
|
|
@@ -510,12 +510,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
510
|
510
|
|
511
|
511
|
// default settings
|
512
|
512
|
|
513
|
|
-#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200.0*8/3,760*1.1} // default steps per unit for Ultimaker
|
|
513
|
+// default steps per unit for Felix 2.0/3.0: 0.00249mm x/y rounding error with 3mm pitch HTD belt and 14 tooth pulleys. 0 z error.
|
|
514
|
+#define DEFAULT_AXIS_STEPS_PER_UNIT {76.190476, 76.190476, 1600, 164}
|
514
|
515
|
#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec)
|
515
|
|
-#define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
|
|
516
|
+#define DEFAULT_MAX_ACCELERATION {5000,5000,100,80000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
|
516
|
517
|
|
517
|
|
-#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
|
518
|
|
-#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts
|
|
518
|
+#define DEFAULT_ACCELERATION 1750 //1500 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
|
|
519
|
+#define DEFAULT_RETRACT_ACCELERATION 5000 // X, Y, Z and E max acceleration in mm/s^2 for r retracts
|
519
|
520
|
|
520
|
521
|
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
|
521
|
522
|
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
|
|
@@ -524,8 +525,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
524
|
525
|
// #define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis
|
525
|
526
|
|
526
|
527
|
// The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
|
527
|
|
-#define DEFAULT_XYJERK 20.0 // (mm/sec)
|
528
|
|
-#define DEFAULT_ZJERK 0.4 // (mm/sec)
|
|
528
|
+#define DEFAULT_XYJERK 10 // (mm/sec)
|
|
529
|
+#define DEFAULT_ZJERK 0.3 //0.4 // (mm/sec)
|
529
|
530
|
#define DEFAULT_EJERK 5.0 // (mm/sec)
|
530
|
531
|
|
531
|
532
|
|
|
@@ -570,7 +571,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
570
|
571
|
//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
|
571
|
572
|
|
572
|
573
|
// Character based displays can have different extended charsets.
|
573
|
|
-#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
|
574
|
+//#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
574
|
575
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
575
|
576
|
|
576
|
577
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
|
@@ -636,13 +637,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
636
|
637
|
#define ULTRA_LCD //general LCD support, also 16x2
|
637
|
638
|
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
638
|
639
|
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
|
639
|
|
-
|
|
640
|
+
|
640
|
641
|
#ifdef miniVIKI
|
641
|
642
|
#define DEFAULT_LCD_CONTRAST 95
|
642
|
643
|
#else
|
643
|
644
|
#define DEFAULT_LCD_CONTRAST 40
|
644
|
645
|
#endif
|
645
|
|
-
|
|
646
|
+
|
646
|
647
|
#define ENCODER_PULSES_PER_STEP 4
|
647
|
648
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
648
|
649
|
#endif
|
|
@@ -733,7 +734,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
733
|
734
|
// Shift register panels
|
734
|
735
|
// ---------------------
|
735
|
736
|
// 2 wire Non-latching LCD SR from:
|
736
|
|
-// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
|
|
737
|
+// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
|
737
|
738
|
|
738
|
739
|
//#define SAV_3DLCD
|
739
|
740
|
#ifdef SAV_3DLCD
|
|
@@ -774,7 +775,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
774
|
775
|
#endif
|
775
|
776
|
|
776
|
777
|
// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
|
777
|
|
-//#define FAST_PWM_FAN
|
|
778
|
+#define FAST_PWM_FAN
|
778
|
779
|
|
779
|
780
|
// Temperature status LEDs that display the hotend and bet temperature.
|
780
|
781
|
// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
|
|
@@ -831,9 +832,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
831
|
832
|
* Support for a filament diameter sensor
|
832
|
833
|
* Also allows adjustment of diameter at print time (vs at slicing)
|
833
|
834
|
* Single extruder only at this point (extruder 0)
|
834
|
|
- *
|
|
835
|
+ *
|
835
|
836
|
* Motherboards
|
836
|
|
- * 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
|
837
|
+ * 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
837
|
838
|
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
838
|
839
|
* 301 - Rambo - uses Analog input 3
|
839
|
840
|
* Note may require analog pins to be defined for different motherboards
|
|
@@ -850,7 +851,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
850
|
851
|
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
851
|
852
|
|
852
|
853
|
//defines used in the code
|
853
|
|
-#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
|
854
|
+#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
854
|
855
|
|
855
|
856
|
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
856
|
857
|
//#define FILAMENT_LCD_DISPLAY
|
|
@@ -864,3 +865,4 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
864
|
865
|
#include "thermistortables.h"
|
865
|
866
|
|
866
|
867
|
#endif //__CONFIGURATION_H
|
|
868
|
+
|