Przeglądaj źródła

Merge pull request #5252 from thinkyhead/rc_endstop_interrupt_followup

Endstop interrupts followup
Scott Lahteine 8 lat temu
rodzic
commit
de3eea920d
25 zmienionych plików z 1427 dodań i 1229 usunięć
  1. 54
    45
      Marlin/Configuration.h
  2. 70
    67
      Marlin/Marlin_main.cpp
  3. 158
    163
      Marlin/endstop_interrupts.h
  4. 54
    45
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 54
    45
      Marlin/example_configurations/Felix/Configuration.h
  6. 54
    45
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 54
    45
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 54
    45
      Marlin/example_configurations/Hephestos_2/Configuration.h
  9. 54
    45
      Marlin/example_configurations/K8200/Configuration.h
  10. 54
    45
      Marlin/example_configurations/K8400/Configuration.h
  11. 54
    45
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  12. 54
    45
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 54
    45
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 54
    45
      Marlin/example_configurations/SCARA/Configuration.h
  15. 54
    45
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 54
    45
      Marlin/example_configurations/WITBOX/Configuration.h
  17. 54
    45
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  18. 54
    45
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  19. 54
    45
      Marlin/example_configurations/delta/generic/Configuration.h
  20. 54
    45
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  21. 54
    45
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  22. 54
    45
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  23. 54
    45
      Marlin/example_configurations/makibox/Configuration.h
  24. 54
    45
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  25. 11
    9
      Marlin/stepper.cpp

+ 54
- 45
Marlin/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 70
- 67
Marlin/Marlin_main.cpp Wyświetl plik

@@ -31,79 +31,20 @@
31 31
  *  - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
32 32
  */
33 33
 
34
-#include "Marlin.h"
35
-
36
-#include "ultralcd.h"
37
-#include "planner.h"
38
-#include "stepper.h"
39
-#include "endstops.h"
40
-#include "temperature.h"
41
-#include "cardreader.h"
42
-#include "configuration_store.h"
43
-#include "language.h"
44
-#include "pins_arduino.h"
45
-#include "math.h"
46
-#include "nozzle.h"
47
-#include "duration_t.h"
48
-#include "types.h"
49
-
50
-#if HAS_ABL
51
-  #include "vector_3.h"
52
-  #if ENABLED(AUTO_BED_LEVELING_LINEAR)
53
-    #include "qr_solve.h"
54
-  #endif
55
-#elif ENABLED(MESH_BED_LEVELING)
56
-  #include "mesh_bed_leveling.h"
57
-#endif
58
-
59
-#if ENABLED(BEZIER_CURVE_SUPPORT)
60
-  #include "planner_bezier.h"
61
-#endif
62
-
63
-#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
64
-  #include "buzzer.h"
65
-#endif
66
-
67
-#if ENABLED(USE_WATCHDOG)
68
-  #include "watchdog.h"
69
-#endif
70
-
71
-#if ENABLED(BLINKM)
72
-  #include "blinkm.h"
73
-  #include "Wire.h"
74
-#endif
75
-
76
-#if HAS_SERVOS
77
-  #include "servo.h"
78
-#endif
79
-
80
-#if HAS_DIGIPOTSS
81
-  #include <SPI.h>
82
-#endif
83
-
84
-#if ENABLED(DAC_STEPPER_CURRENT)
85
-  #include "stepper_dac.h"
86
-#endif
87
-
88
-#if ENABLED(EXPERIMENTAL_I2CBUS)
89
-  #include "twibus.h"
90
-#endif
91
-
92
-#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
93
-  #include "endstop_interrupts.h"
94
-#endif
95 34
 /**
96
- * Look here for descriptions of G-codes:
35
+ * -----------------
36
+ * G-Codes in Marlin
37
+ * -----------------
38
+ *
39
+ * Helpful G-code references:
97 40
  *  - http://linuxcnc.org/handbook/gcode/g-code.html
98 41
  *  - http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
99 42
  *
100
- * Help us document these G-codes online:
101
- *  - https://github.com/MarlinFirmware/Marlin/wiki/G-Code-in-Marlin
43
+ * Help to document Marlin's G-codes online:
102 44
  *  - http://reprap.org/wiki/G-code
45
+ *  - https://github.com/MarlinFirmware/MarlinDocumentation
103 46
  *
104 47
  * -----------------
105
- * Implemented Codes
106
- * -----------------
107 48
  *
108 49
  * "G" Codes
109 50
  *
@@ -276,6 +217,68 @@
276 217
  *
277 218
  */
278 219
 
220
+#include "Marlin.h"
221
+
222
+#include "ultralcd.h"
223
+#include "planner.h"
224
+#include "stepper.h"
225
+#include "endstops.h"
226
+#include "temperature.h"
227
+#include "cardreader.h"
228
+#include "configuration_store.h"
229
+#include "language.h"
230
+#include "pins_arduino.h"
231
+#include "math.h"
232
+#include "nozzle.h"
233
+#include "duration_t.h"
234
+#include "types.h"
235
+
236
+#if HAS_ABL
237
+  #include "vector_3.h"
238
+  #if ENABLED(AUTO_BED_LEVELING_LINEAR)
239
+    #include "qr_solve.h"
240
+  #endif
241
+#elif ENABLED(MESH_BED_LEVELING)
242
+  #include "mesh_bed_leveling.h"
243
+#endif
244
+
245
+#if ENABLED(BEZIER_CURVE_SUPPORT)
246
+  #include "planner_bezier.h"
247
+#endif
248
+
249
+#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
250
+  #include "buzzer.h"
251
+#endif
252
+
253
+#if ENABLED(USE_WATCHDOG)
254
+  #include "watchdog.h"
255
+#endif
256
+
257
+#if ENABLED(BLINKM)
258
+  #include "blinkm.h"
259
+  #include "Wire.h"
260
+#endif
261
+
262
+#if HAS_SERVOS
263
+  #include "servo.h"
264
+#endif
265
+
266
+#if HAS_DIGIPOTSS
267
+  #include <SPI.h>
268
+#endif
269
+
270
+#if ENABLED(DAC_STEPPER_CURRENT)
271
+  #include "stepper_dac.h"
272
+#endif
273
+
274
+#if ENABLED(EXPERIMENTAL_I2CBUS)
275
+  #include "twibus.h"
276
+#endif
277
+
278
+#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
279
+  #include "endstop_interrupts.h"
280
+#endif
281
+
279 282
 #if ENABLED(M100_FREE_MEMORY_WATCHER)
280 283
   void gcode_M100();
281 284
 #endif
@@ -10020,7 +10023,7 @@ void setup() {
10020 10023
   #endif
10021 10024
 
10022 10025
   #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
10023
-    setup_enstop_interrupts();
10026
+    setup_endstop_interrupts();
10024 10027
   #endif
10025 10028
 }
10026 10029
 

+ 158
- 163
Marlin/endstop_interrupts.h Wyświetl plik

@@ -21,191 +21,186 @@
21 21
  */
22 22
 
23 23
 /**
24
- *  Endstop interrupts
25
- *  Without endstop interrups the stepper-ISR must always test all endstops when interested in their states (endstops.update()).
26
- *  Most time the test will result in finding out nothing has changed.
27
- *  With endstop interrupts endstops.update() is called only when we know that at least one endstop has changed its state.
24
+ * Endstop Interrupts
28 25
  *
29
- *  This can work only if all __used__ endstop pins can provide ether an 'external interrupt' or a 'pin change interrupt'.
30
- *  You can find out about pins issuing interrupts by running 'pin_interrupt_test.ino' (Marlin\buildroot\share\pin_interrupt_test\pin_interrupt_test.ino)
26
+ * Without endstop interrupts the endstop pins must be polled continually in
27
+ * the stepper-ISR via endstops.update(), most of the time finding no change.
28
+ * With this feature endstops.update() is called only when we know that at
29
+ * least one endstop has changed state, saving valuable CPU cycles.
30
+ *
31
+ * This feature only works when all used endstop pins can generate either an
32
+ * 'external interrupt' or a 'pin change interrupt'.
33
+ *
34
+ * Test whether pins issue interrupts on your board by flashing 'pin_interrupt_test.ino'.
35
+ * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
31 36
  */
32 37
 
33 38
  #ifndef _ENDSTOP_INTERRUPTS_H_
34
-   #define _ENDSTOP_INTERRUPTS_H_
35
-
36
-  /**
37
-   * Patch for pins_arduino.h (...\Arduino\hardware\arduino\avr\variants\mega\pins_arduino.h)  
38
-   *
39
-   * These macros for the Arduino MEGA do not include the two connected pins on Port J (D13, D14).
40
-   * So we extend them here because this are the normal pins for Y_MIN and Y_MAX on RAMPS.
41
-   * There are more PCI enabled processor pins on Port J, but they are not connected to Arduino MEGA.
42
-   */
43
-  #if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA)
44
-    #undef  digitalPinToPCICR
45
-    #define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 15)) || \
46
-                                    (((p) >= 50) && ((p) <= 53)) || \
47
-                                    (((p) >= 62) && ((p) <= 69)) ? (&PCICR) : ((uint8_t *)0) )
48
-    #undef  digitalPinToPCICRbit
49
-    #define digitalPinToPCICRbit(p) ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? 0 : \
50
-                                    ( (((p) >= 14) && ((p) <= 15)) ? 1 : \
51
-                                    ( (((p) >= 62) && ((p) <= 69)) ? 2 : \
52
-                                    0 ) ) )
53
-    #undef  digitalPinToPCMSK
54
-    #define digitalPinToPCMSK(p)    ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? (&PCMSK0) : \
55
-                                    ( (((p) >= 14) && ((p) <= 15)) ? (&PCMSK1) : \
56
-                                    ( (((p) >= 62) && ((p) <= 69)) ? (&PCMSK2) : \
57
-                                    ((uint8_t *)0) ) ) )
58
-    #undef  digitalPinToPCMSKbit
59
-    #define digitalPinToPCMSKbit(p) ( (((p) >= 10) && ((p) <= 13)) ? ((p) - 6) : \
60
-                                    ( ((p) == 14) ? 2 : \
61
-                                    ( ((p) == 15) ? 1 : \
62
-                                    ( ((p) == 50) ? 3 : \
63
-                                    ( ((p) == 51) ? 2 : \
64
-                                    ( ((p) == 52) ? 1 : \
65
-                                    ( ((p) == 53) ? 0 : \
66
-                                    ( (((p) >= 62) && ((p) <= 69)) ? ((p) - 62) : \
67
-                                    0 ) ) ) ) ) ) ) )
68
-  #endif
69
-
70
-  volatile uint8_t e_hit = 0; // Different from 0 when the endstops shall be tested in detail. 
71
-                              // Must be reset to 0 by the test function when the tests are finished.
72
-
73
-  // Install Pin change interrupt for a pin, can be called multiple times
74
-  void pciSetup(byte pin) {
75
-    *digitalPinToPCMSK(pin) |= bit (digitalPinToPCMSKbit(pin));  // enable pin
76
-    PCIFR  |= bit (digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
77
-    PCICR  |= bit (digitalPinToPCICRbit(pin)); // enable interrupt for the group
78
-  }
79
-
80
-  // This is what is really done inside the interrupts.
81
-  FORCE_INLINE void endstop_ISR_worker( void ) {
82
-    e_hit = 2; // Because the detection of a e-stop hit has a 1 step debouncer it has to be called at least twice.
83
-  }
84
-
85
-  // Use one Routine to handle each group
86
-  // One ISR for all EXT-Interrupts
87
-  void endstop_ISR(void) {
88
-    endstop_ISR_worker();
89
-  }
90
-
91
-  #ifdef PCINT0_vect
92
-    ISR(PCINT0_vect) { // handle pin change interrupt
93
-      endstop_ISR_worker();
94
-    }
95
-  #endif
96
-
97
-  #ifdef PCINT1_vect
98
-    ISR(PCINT1_vect) { // handle pin change interrupt
99
-      endstop_ISR_worker();
100
-    }
101
-  #endif
39
+ #define _ENDSTOP_INTERRUPTS_H_
102 40
 
103
-  #ifdef PCINT2_vect
104
-    ISR(PCINT2_vect) { // handle pin change interrupt
105
-      endstop_ISR_worker();
106
-    }
107
-  #endif
108
-
109
-  #ifdef PCINT3_vect
110
-    ISR(PCINT3_vect) { // handle pin change interrupt
111
-      endstop_ISR_worker();
112
-    }
113
-  #endif
114
-
115
-  void setup_enstop_interrupts( void ) {
116
-
117
-    #if HAS_X_MAX
118
-      #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT) // if pin has an external interrupt
119
-        attachInterrupt(digitalPinToInterrupt(X_MAX_PIN), endstop_ISR, CHANGE); // assign it
120
-      #else
121
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
122
-        static_assert(digitalPinToPCICR(X_MAX_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR"); // if pin has no pin change interrupt - error
123
-        pciSetup(X_MAX_PIN);                                                            // assign it
124
-      #endif
41
+/**
42
+ * Patch for pins_arduino.h (...\Arduino\hardware\arduino\avr\variants\mega\pins_arduino.h)
43
+ *
44
+ * These macros for the Arduino MEGA do not include the two connected pins on Port J (D13, D14).
45
+ * So we extend them here because these are the normal pins for Y_MIN and Y_MAX on RAMPS.
46
+ * There are more PCI-enabled processor pins on Port J, but they are not connected to Arduino MEGA.
47
+ */
48
+#if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA)
49
+  #undef  digitalPinToPCICR
50
+  #define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 15)) || \
51
+                                  (((p) >= 50) && ((p) <= 53)) || \
52
+                                  (((p) >= 62) && ((p) <= 69)) ? (&PCICR) : ((uint8_t *)0) )
53
+  #undef  digitalPinToPCICRbit
54
+  #define digitalPinToPCICRbit(p) ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? 0 : \
55
+                                  ( (((p) >= 14) && ((p) <= 15)) ? 1 : \
56
+                                  ( (((p) >= 62) && ((p) <= 69)) ? 2 : \
57
+                                  0 ) ) )
58
+  #undef  digitalPinToPCMSK
59
+  #define digitalPinToPCMSK(p)    ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? (&PCMSK0) : \
60
+                                  ( (((p) >= 14) && ((p) <= 15)) ? (&PCMSK1) : \
61
+                                  ( (((p) >= 62) && ((p) <= 69)) ? (&PCMSK2) : \
62
+                                  ((uint8_t *)0) ) ) )
63
+  #undef  digitalPinToPCMSKbit
64
+  #define digitalPinToPCMSKbit(p) ( (((p) >= 10) && ((p) <= 13)) ? ((p) - 6) : \
65
+                                  ( ((p) == 14) ? 2 : \
66
+                                  ( ((p) == 15) ? 1 : \
67
+                                  ( ((p) == 50) ? 3 : \
68
+                                  ( ((p) == 51) ? 2 : \
69
+                                  ( ((p) == 52) ? 1 : \
70
+                                  ( ((p) == 53) ? 0 : \
71
+                                  ( (((p) >= 62) && ((p) <= 69)) ? ((p) - 62) : \
72
+                                  0 ) ) ) ) ) ) ) )
73
+#endif
74
+
75
+volatile uint8_t e_hit = 0; // Different from 0 when the endstops shall be tested in detail.
76
+                            // Must be reset to 0 by the test function when the tests are finished.
77
+
78
+// Install Pin change interrupt for a pin. Can be called multiple times.
79
+void pciSetup(byte pin) {
80
+  *digitalPinToPCMSK(pin) |= bit (digitalPinToPCMSKbit(pin));  // enable pin
81
+  PCIFR  |= bit (digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
82
+  PCICR  |= bit (digitalPinToPCICRbit(pin)); // enable interrupt for the group
83
+}
84
+
85
+// This is what is really done inside the interrupts.
86
+FORCE_INLINE void endstop_ISR_worker( void ) {
87
+  e_hit = 2; // Because the detection of a e-stop hit has a 1 step debouncer it has to be called at least twice.
88
+}
89
+
90
+// Use one Routine to handle each group
91
+// One ISR for all EXT-Interrupts
92
+void endstop_ISR(void) { endstop_ISR_worker(); }
93
+
94
+// Handlers for pin change interrupts
95
+#ifdef PCINT0_vect
96
+  ISR(PCINT0_vect) { endstop_ISR_worker(); }
97
+#endif
98
+
99
+#ifdef PCINT1_vect
100
+  ISR(PCINT1_vect) { endstop_ISR_worker(); }
101
+#endif
102
+
103
+#ifdef PCINT2_vect
104
+  ISR(PCINT2_vect) { endstop_ISR_worker(); }
105
+#endif
106
+
107
+#ifdef PCINT3_vect
108
+  ISR(PCINT3_vect) { endstop_ISR_worker(); }
109
+#endif
110
+
111
+void setup_endstop_interrupts( void ) {
112
+
113
+  #if HAS_X_MAX
114
+    #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT) // if pin has an external interrupt
115
+      attachInterrupt(digitalPinToInterrupt(X_MAX_PIN), endstop_ISR, CHANGE); // assign it
116
+    #else
117
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
118
+      static_assert(digitalPinToPCICR(X_MAX_PIN) != NULL, "X_MAX_PIN is not interrupt-capable"); // if pin has no pin change interrupt - error
119
+      pciSetup(X_MAX_PIN);                                                            // assign it
125 120
     #endif
121
+  #endif
126 122
 
127
-    #if HAS_X_MIN
128
-      #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
129
-        attachInterrupt(digitalPinToInterrupt(X_MIN_PIN), endstop_ISR, CHANGE);
130
-      #else
131
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
132
-        static_assert(digitalPinToPCICR(X_MIN_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
133
-        pciSetup(X_MIN_PIN);
134
-      #endif
123
+  #if HAS_X_MIN
124
+    #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
125
+      attachInterrupt(digitalPinToInterrupt(X_MIN_PIN), endstop_ISR, CHANGE);
126
+    #else
127
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
128
+      static_assert(digitalPinToPCICR(X_MIN_PIN) != NULL, "X_MIN_PIN is not interrupt-capable");
129
+      pciSetup(X_MIN_PIN);
135 130
     #endif
131
+  #endif
136 132
 
137
-    #if HAS_Y_MAX
138
-      #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
139
-        attachInterrupt(digitalPinToInterrupt(Y_MAX_PIN), endstop_ISR, CHANGE);
140
-      #else
141
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
142
-        static_assert(digitalPinToPCICR(Y_MAX_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
143
-        pciSetup(Y_MAX_PIN);
144
-      #endif
133
+  #if HAS_Y_MAX
134
+    #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
135
+      attachInterrupt(digitalPinToInterrupt(Y_MAX_PIN), endstop_ISR, CHANGE);
136
+    #else
137
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
138
+      static_assert(digitalPinToPCICR(Y_MAX_PIN) != NULL, "Y_MAX_PIN is not interrupt-capable");
139
+      pciSetup(Y_MAX_PIN);
145 140
     #endif
141
+  #endif
146 142
 
147
-    #if HAS_Y_MIN
148
-      #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
149
-        attachInterrupt(digitalPinToInterrupt(Y_MIN_PIN), endstop_ISR, CHANGE);
150
-      #else
151
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
152
-        static_assert(digitalPinToPCICR(Y_MIN_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
153
-        pciSetup(Y_MIN_PIN);
154
-      #endif
143
+  #if HAS_Y_MIN
144
+    #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
145
+      attachInterrupt(digitalPinToInterrupt(Y_MIN_PIN), endstop_ISR, CHANGE);
146
+    #else
147
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
148
+      static_assert(digitalPinToPCICR(Y_MIN_PIN) != NULL, "Y_MIN_PIN is not interrupt-capable");
149
+      pciSetup(Y_MIN_PIN);
155 150
     #endif
151
+  #endif
156 152
 
157
-    #if HAS_Z_MAX
158
-      #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
159
-        attachInterrupt(digitalPinToInterrupt(Z_MAX_PIN), endstop_ISR, CHANGE);
160
-      #else
161
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
162
-        static_assert(digitalPinToPCICR(Z_MAX_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
163
-        pciSetup(Z_MAX_PIN);
164
-      #endif
153
+  #if HAS_Z_MAX
154
+    #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
155
+      attachInterrupt(digitalPinToInterrupt(Z_MAX_PIN), endstop_ISR, CHANGE);
156
+    #else
157
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
158
+      static_assert(digitalPinToPCICR(Z_MAX_PIN) != NULL, "Z_MAX_PIN is not interrupt-capable");
159
+      pciSetup(Z_MAX_PIN);
165 160
     #endif
161
+  #endif
166 162
 
167
-    #if HAS_Z_MIN
168
-      #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
169
-        attachInterrupt(digitalPinToInterrupt(Z_MIN_PIN), endstop_ISR, CHANGE);
170
-      #else
171
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
172
-        static_assert(digitalPinToPCICR(Z_MIN_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
173
-        pciSetup(Z_MIN_PIN);
174
-      #endif
163
+  #if HAS_Z_MIN
164
+    #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
165
+      attachInterrupt(digitalPinToInterrupt(Z_MIN_PIN), endstop_ISR, CHANGE);
166
+    #else
167
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
168
+      static_assert(digitalPinToPCICR(Z_MIN_PIN) != NULL, "Z_MIN_PIN is not interrupt-capable");
169
+      pciSetup(Z_MIN_PIN);
175 170
     #endif
171
+  #endif
176 172
 
177
-    #if HAS_Z2_MAX
178
-      #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
179
-        attachInterrupt(digitalPinToInterrupt(Z2_MAX_PIN), endstop_ISR, CHANGE);
180
-      #else
181
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
182
-        static_assert(digitalPinToPCICR(Z2_MAX_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
183
-        pciSetup(Z2_MAX_PIN);
184
-      #endif
173
+  #if HAS_Z2_MAX
174
+    #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
175
+      attachInterrupt(digitalPinToInterrupt(Z2_MAX_PIN), endstop_ISR, CHANGE);
176
+    #else
177
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
178
+      static_assert(digitalPinToPCICR(Z2_MAX_PIN) != NULL, "Z2_MAX_PIN is not interrupt-capable");
179
+      pciSetup(Z2_MAX_PIN);
185 180
     #endif
181
+  #endif
186 182
 
187
-    #if HAS_Z2_MIN
188
-      #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
189
-        attachInterrupt(digitalPinToInterrupt(Z2_MIN_PIN), endstop_ISR, CHANGE);
190
-      #else
191
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
192
-        static_assert(digitalPinToPCICR(Z2_MIN_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
193
-        pciSetup(Z2_MIN_PIN);
194
-      #endif
183
+  #if HAS_Z2_MIN
184
+    #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
185
+      attachInterrupt(digitalPinToInterrupt(Z2_MIN_PIN), endstop_ISR, CHANGE);
186
+    #else
187
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
188
+      static_assert(digitalPinToPCICR(Z2_MIN_PIN) != NULL, "Z2_MIN_PIN is not interrupt-capable");
189
+      pciSetup(Z2_MIN_PIN);
195 190
     #endif
191
+  #endif
196 192
 
197
-    #if HAS_Z_MIN_PROBE_PIN
198
-      #if (digitalPinToInterrupt(Z_MIN_PROBE_PIN) != NOT_AN_INTERRUPT)
199
-        attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
200
-      #else
201
-        // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
202
-        static_assert(digitalPinToPCICR(Z_MIN_PROBE_PIN) != NULL, "ENDSTOP_INTERRUPT_ERROR");
203
-        pciSetup(Z_MIN_PROBE_PIN);
204
-      #endif
193
+  #if HAS_Z_MIN_PROBE_PIN
194
+    #if (digitalPinToInterrupt(Z_MIN_PROBE_PIN) != NOT_AN_INTERRUPT)
195
+      attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
196
+    #else
197
+      // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration!
198
+      static_assert(digitalPinToPCICR(Z_MIN_PROBE_PIN) != NULL, "Z_MIN_PROBE_PIN is not interrupt-capable");
199
+      pciSetup(Z_MIN_PROBE_PIN);
205 200
     #endif
201
+  #endif
206 202
 
207
-    // When we arive here without error each pin has ether a EXT-interrupt or a PCI.
208
-  }
209
-
203
+  // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
204
+}
210 205
 
211 206
 #endif //_ENDSTOP_INTERRUPTS_H_

+ 54
- 45
Marlin/example_configurations/Cartesio/Configuration.h Wyświetl plik

@@ -201,55 +201,64 @@
201 201
 //===========================================================================
202 202
 //============================= Thermal Settings ============================
203 203
 //===========================================================================
204
-//
205
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
-//
207
-//// Temperature sensor settings:
208
-// -3 is thermocouple with MAX31855 (only for sensor 0)
209
-// -2 is thermocouple with MAX6675 (only for sensor 0)
210
-// -1 is thermocouple with AD595
211
-// 0 is not used
212
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
213
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
214
-// 3 is Mendel-parts thermistor (4.7k pullup)
215
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
216
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
217
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
218
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
219
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
220
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
221
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
222
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
223
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
224
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
225
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
226
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
227
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
228
-// 66 is 4.7M High Temperature thermistor from Dyze Design
229
-// 70 is the 100K thermistor found in the bq Hephestos 2
230
-//
231
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
232
-//                          (but gives greater accuracy and more stable PID)
233
-// 51 is 100k thermistor - EPCOS (1k pullup)
234
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
235
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
236
-//
237
-// 1047 is Pt1000 with 4k7 pullup
238
-// 1010 is Pt1000 with 1k pullup (non standard)
239
-// 147 is Pt100 with 4k7 pullup
240
-// 110 is Pt100 with 1k pullup (non standard)
241
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
242
-//     Use it for Testing or Development purposes. NEVER for production machine.
243
-//#define DUMMY_THERMISTOR_998_VALUE 25
244
-//#define DUMMY_THERMISTOR_999_VALUE 100
245
-// :{ '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" }
204
+
205
+/**
206
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
207
+ * 
208
+ * Temperature sensors available:
209
+ *
210
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
211
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
212
+ *    -1 : thermocouple with AD595
213
+ *     0 : not used
214
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
215
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
216
+ *     3 : Mendel-parts thermistor (4.7k pullup)
217
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
218
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
219
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
220
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
221
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
222
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
223
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
224
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
225
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
226
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
227
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
228
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
229
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
230
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
231
+ *    70 : the 100K thermistor found in the bq Hephestos 2
232
+ * 
233
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
234
+ *                              (but gives greater accuracy and more stable PID)
235
+ *    51 : 100k thermistor - EPCOS (1k pullup)
236
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
237
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
238
+ * 
239
+ *  1047 : Pt1000 with 4k7 pullup
240
+ *  1010 : Pt1000 with 1k pullup (non standard)
241
+ *   147 : Pt100 with 4k7 pullup
242
+ *   110 : Pt100 with 1k pullup (non standard)
243
+ *
244
+ *         Use these for Testing or Development purposes. NEVER for production machine.
245
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
246
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
247
+ *
248
+ * :{ '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" }
249
+ */
246 250
 #define TEMP_SENSOR_0 -1
247 251
 #define TEMP_SENSOR_1 -1
248 252
 #define TEMP_SENSOR_2 1
249 253
 #define TEMP_SENSOR_3 0
250 254
 #define TEMP_SENSOR_BED 1
251 255
 
252
-// 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.
256
+// Dummy thermistor constant temperature readings, for use with 998 and 999
257
+#define DUMMY_THERMISTOR_998_VALUE 25
258
+#define DUMMY_THERMISTOR_999_VALUE 100
259
+
260
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
261
+// from the two sensors differ too much the print will be aborted.
253 262
 //#define TEMP_SENSOR_1_AS_REDUNDANT
254 263
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
255 264
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/Felix/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 1
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -427,8 +436,8 @@
427 436
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
428 437
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
429 438
 
430
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
431
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
439
+// Enable this feature if all enabled endstop pins are interrupt-capable.
440
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
432 441
 //#define ENDSTOP_INTERRUPTS_FEATURE
433 442
 
434 443
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/Felix/DUAL/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 1
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 1
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -427,8 +436,8 @@
427 436
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
428 437
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
429 438
 
430
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
431
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
439
+// Enable this feature if all enabled endstop pins are interrupt-capable.
440
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
432 441
 //#define ENDSTOP_INTERRUPTS_FEATURE
433 442
 
434 443
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/Hephestos/Configuration.h Wyświetl plik

@@ -203,55 +203,64 @@
203 203
 //===========================================================================
204 204
 //============================= Thermal Settings ============================
205 205
 //===========================================================================
206
-//
207
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
208
-//
209
-//// Temperature sensor settings:
210
-// -3 is thermocouple with MAX31855 (only for sensor 0)
211
-// -2 is thermocouple with MAX6675 (only for sensor 0)
212
-// -1 is thermocouple with AD595
213
-// 0 is not used
214
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
215
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
216
-// 3 is Mendel-parts thermistor (4.7k pullup)
217
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
218
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
219
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
220
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
221
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
222
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
223
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
224
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
225
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
226
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
227
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
228
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
229
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
230
-// 66 is 4.7M High Temperature thermistor from Dyze Design
231
-// 70 is the 100K thermistor found in the bq Hephestos 2
232
-//
233
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
234
-//                          (but gives greater accuracy and more stable PID)
235
-// 51 is 100k thermistor - EPCOS (1k pullup)
236
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
237
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
238
-//
239
-// 1047 is Pt1000 with 4k7 pullup
240
-// 1010 is Pt1000 with 1k pullup (non standard)
241
-// 147 is Pt100 with 4k7 pullup
242
-// 110 is Pt100 with 1k pullup (non standard)
243
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
244
-//     Use it for Testing or Development purposes. NEVER for production machine.
245
-//#define DUMMY_THERMISTOR_998_VALUE 25
246
-//#define DUMMY_THERMISTOR_999_VALUE 100
247
-// :{ '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" }
206
+
207
+/**
208
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
209
+ * 
210
+ * Temperature sensors available:
211
+ *
212
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
213
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
214
+ *    -1 : thermocouple with AD595
215
+ *     0 : not used
216
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
217
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
218
+ *     3 : Mendel-parts thermistor (4.7k pullup)
219
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
220
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
221
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
222
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
223
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
224
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
225
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
226
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
227
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
228
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
229
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
230
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
231
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
233
+ *    70 : the 100K thermistor found in the bq Hephestos 2
234
+ * 
235
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
236
+ *                              (but gives greater accuracy and more stable PID)
237
+ *    51 : 100k thermistor - EPCOS (1k pullup)
238
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
239
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
240
+ * 
241
+ *  1047 : Pt1000 with 4k7 pullup
242
+ *  1010 : Pt1000 with 1k pullup (non standard)
243
+ *   147 : Pt100 with 4k7 pullup
244
+ *   110 : Pt100 with 1k pullup (non standard)
245
+ *
246
+ *         Use these for Testing or Development purposes. NEVER for production machine.
247
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
248
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
249
+ *
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
+ */
248 252
 #define TEMP_SENSOR_0 1
249 253
 #define TEMP_SENSOR_1 0
250 254
 #define TEMP_SENSOR_2 0
251 255
 #define TEMP_SENSOR_3 0
252 256
 #define TEMP_SENSOR_BED 0
253 257
 
254
-// 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.
258
+// Dummy thermistor constant temperature readings, for use with 998 and 999
259
+#define DUMMY_THERMISTOR_998_VALUE 25
260
+#define DUMMY_THERMISTOR_999_VALUE 100
261
+
262
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
263
+// from the two sensors differ too much the print will be aborted.
255 264
 //#define TEMP_SENSOR_1_AS_REDUNDANT
256 265
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
257 266
 
@@ -437,8 +446,8 @@
437 446
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
438 447
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
439 448
 
440
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
441
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
449
+// Enable this feature if all enabled endstop pins are interrupt-capable.
450
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
442 451
 //#define ENDSTOP_INTERRUPTS_FEATURE
443 452
 
444 453
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/Hephestos_2/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 70
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -439,8 +448,8 @@
439 448
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
440 449
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
441 450
 
442
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
443
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
451
+// Enable this feature if all enabled endstop pins are interrupt-capable.
452
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
444 453
 //#define ENDSTOP_INTERRUPTS_FEATURE
445 454
 
446 455
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/K8200/Configuration.h Wyświetl plik

@@ -207,55 +207,64 @@
207 207
 //===========================================================================
208 208
 //============================= Thermal Settings ============================
209 209
 //===========================================================================
210
-//
211
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
212
-//
213
-//// Temperature sensor settings:
214
-// -3 is thermocouple with MAX31855 (only for sensor 0)
215
-// -2 is thermocouple with MAX6675 (only for sensor 0)
216
-// -1 is thermocouple with AD595
217
-// 0 is not used
218
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
219
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
220
-// 3 is Mendel-parts thermistor (4.7k pullup)
221
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
222
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
223
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
224
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
225
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
226
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
227
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
228
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
229
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
230
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
231
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
232
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
233
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
234
-// 66 is 4.7M High Temperature thermistor from Dyze Design
235
-// 70 is the 100K thermistor found in the bq Hephestos 2
236
-//
237
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
238
-//                          (but gives greater accuracy and more stable PID)
239
-// 51 is 100k thermistor - EPCOS (1k pullup)
240
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
241
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
242
-//
243
-// 1047 is Pt1000 with 4k7 pullup
244
-// 1010 is Pt1000 with 1k pullup (non standard)
245
-// 147 is Pt100 with 4k7 pullup
246
-// 110 is Pt100 with 1k pullup (non standard)
247
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
248
-//     Use it for Testing or Development purposes. NEVER for production machine.
249
-//#define DUMMY_THERMISTOR_998_VALUE 25
250
-//#define DUMMY_THERMISTOR_999_VALUE 100
251
-// :{ '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" }
210
+
211
+/**
212
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
213
+ * 
214
+ * Temperature sensors available:
215
+ *
216
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
217
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
218
+ *    -1 : thermocouple with AD595
219
+ *     0 : not used
220
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
221
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
222
+ *     3 : Mendel-parts thermistor (4.7k pullup)
223
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
224
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
225
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
226
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
227
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
228
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
229
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
230
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
231
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
232
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
233
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
234
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
235
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
236
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
237
+ *    70 : the 100K thermistor found in the bq Hephestos 2
238
+ * 
239
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
240
+ *                              (but gives greater accuracy and more stable PID)
241
+ *    51 : 100k thermistor - EPCOS (1k pullup)
242
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
243
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
244
+ * 
245
+ *  1047 : Pt1000 with 4k7 pullup
246
+ *  1010 : Pt1000 with 1k pullup (non standard)
247
+ *   147 : Pt100 with 4k7 pullup
248
+ *   110 : Pt100 with 1k pullup (non standard)
249
+ *
250
+ *         Use these for Testing or Development purposes. NEVER for production machine.
251
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
252
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
253
+ *
254
+ * :{ '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" }
255
+ */
252 256
 #define TEMP_SENSOR_0 5
253 257
 #define TEMP_SENSOR_1 0
254 258
 #define TEMP_SENSOR_2 0
255 259
 #define TEMP_SENSOR_3 0
256 260
 #define TEMP_SENSOR_BED 5
257 261
 
258
-// 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.
262
+// Dummy thermistor constant temperature readings, for use with 998 and 999
263
+#define DUMMY_THERMISTOR_998_VALUE 25
264
+#define DUMMY_THERMISTOR_999_VALUE 100
265
+
266
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
267
+// from the two sensors differ too much the print will be aborted.
259 268
 //#define TEMP_SENSOR_1_AS_REDUNDANT
260 269
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
261 270
 
@@ -462,8 +471,8 @@
462 471
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
463 472
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
464 473
 
465
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
466
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
474
+// Enable this feature if all enabled endstop pins are interrupt-capable.
475
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
467 476
 //#define ENDSTOP_INTERRUPTS_FEATURE
468 477
 
469 478
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/K8400/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 5
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/K8400/Dual-head/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 5
246 250
 #define TEMP_SENSOR_1 5
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 1
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/RigidBot/Configuration.h Wyświetl plik

@@ -203,55 +203,64 @@
203 203
 //===========================================================================
204 204
 //============================= Thermal Settings ============================
205 205
 //===========================================================================
206
-//
207
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
208
-//
209
-//// Temperature sensor settings:
210
-// -3 is thermocouple with MAX31855 (only for sensor 0)
211
-// -2 is thermocouple with MAX6675 (only for sensor 0)
212
-// -1 is thermocouple with AD595
213
-// 0 is not used
214
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
215
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
216
-// 3 is Mendel-parts thermistor (4.7k pullup)
217
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
218
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
219
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
220
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
221
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
222
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
223
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
224
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
225
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
226
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
227
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
228
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
229
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
230
-// 66 is 4.7M High Temperature thermistor from Dyze Design
231
-// 70 is the 100K thermistor found in the bq Hephestos 2
232
-//
233
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
234
-//                          (but gives greater accuracy and more stable PID)
235
-// 51 is 100k thermistor - EPCOS (1k pullup)
236
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
237
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
238
-//
239
-// 1047 is Pt1000 with 4k7 pullup
240
-// 1010 is Pt1000 with 1k pullup (non standard)
241
-// 147 is Pt100 with 4k7 pullup
242
-// 110 is Pt100 with 1k pullup (non standard)
243
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
244
-//     Use it for Testing or Development purposes. NEVER for production machine.
245
-//#define DUMMY_THERMISTOR_998_VALUE 25
246
-//#define DUMMY_THERMISTOR_999_VALUE 100
247
-// :{ '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" }
206
+
207
+/**
208
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
209
+ * 
210
+ * Temperature sensors available:
211
+ *
212
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
213
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
214
+ *    -1 : thermocouple with AD595
215
+ *     0 : not used
216
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
217
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
218
+ *     3 : Mendel-parts thermistor (4.7k pullup)
219
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
220
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
221
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
222
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
223
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
224
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
225
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
226
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
227
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
228
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
229
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
230
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
231
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
233
+ *    70 : the 100K thermistor found in the bq Hephestos 2
234
+ * 
235
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
236
+ *                              (but gives greater accuracy and more stable PID)
237
+ *    51 : 100k thermistor - EPCOS (1k pullup)
238
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
239
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
240
+ * 
241
+ *  1047 : Pt1000 with 4k7 pullup
242
+ *  1010 : Pt1000 with 1k pullup (non standard)
243
+ *   147 : Pt100 with 4k7 pullup
244
+ *   110 : Pt100 with 1k pullup (non standard)
245
+ *
246
+ *         Use these for Testing or Development purposes. NEVER for production machine.
247
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
248
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
249
+ *
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
+ */
248 252
 #define TEMP_SENSOR_0 1 // DGlass3D = 5; RigidBot = 1; 3DSv6 = 5
249 253
 #define TEMP_SENSOR_1 0
250 254
 #define TEMP_SENSOR_2 0
251 255
 #define TEMP_SENSOR_3 0
252 256
 #define TEMP_SENSOR_BED 1
253 257
 
254
-// 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.
258
+// Dummy thermistor constant temperature readings, for use with 998 and 999
259
+#define DUMMY_THERMISTOR_998_VALUE 25
260
+#define DUMMY_THERMISTOR_999_VALUE 100
261
+
262
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
263
+// from the two sensors differ too much the print will be aborted.
255 264
 //#define TEMP_SENSOR_1_AS_REDUNDANT
256 265
 //#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
257 266
 
@@ -442,8 +451,8 @@
442 451
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
443 452
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
444 453
 
445
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
446
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
454
+// Enable this feature if all enabled endstop pins are interrupt-capable.
455
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
447 456
 //#define ENDSTOP_INTERRUPTS_FEATURE
448 457
 
449 458
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/SCARA/Configuration.h Wyświetl plik

@@ -232,55 +232,64 @@
232 232
 //===========================================================================
233 233
 //============================= Thermal Settings ============================
234 234
 //===========================================================================
235
-//
236
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
237
-//
238
-//// Temperature sensor settings:
239
-// -3 is thermocouple with MAX31855 (only for sensor 0)
240
-// -2 is thermocouple with MAX6675 (only for sensor 0)
241
-// -1 is thermocouple with AD595
242
-// 0 is not used
243
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
244
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
245
-// 3 is Mendel-parts thermistor (4.7k pullup)
246
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
247
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
248
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
249
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
250
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
251
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
252
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
253
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
254
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
255
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
256
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
257
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
258
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
259
-// 66 is 4.7M High Temperature thermistor from Dyze Design
260
-// 70 is the 100K thermistor found in the bq Hephestos 2
261
-//
262
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
263
-//                          (but gives greater accuracy and more stable PID)
264
-// 51 is 100k thermistor - EPCOS (1k pullup)
265
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
266
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
267
-//
268
-// 1047 is Pt1000 with 4k7 pullup
269
-// 1010 is Pt1000 with 1k pullup (non standard)
270
-// 147 is Pt100 with 4k7 pullup
271
-// 110 is Pt100 with 1k pullup (non standard)
272
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
273
-//     Use it for Testing or Development purposes. NEVER for production machine.
274
-//#define DUMMY_THERMISTOR_998_VALUE 25
275
-//#define DUMMY_THERMISTOR_999_VALUE 100
276
-// :{ '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" }
235
+
236
+/**
237
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
238
+ * 
239
+ * Temperature sensors available:
240
+ *
241
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
242
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
243
+ *    -1 : thermocouple with AD595
244
+ *     0 : not used
245
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
246
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
247
+ *     3 : Mendel-parts thermistor (4.7k pullup)
248
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
249
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
250
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
251
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
252
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
253
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
254
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
255
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
256
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
257
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
258
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
259
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
260
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
261
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
262
+ *    70 : the 100K thermistor found in the bq Hephestos 2
263
+ * 
264
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
265
+ *                              (but gives greater accuracy and more stable PID)
266
+ *    51 : 100k thermistor - EPCOS (1k pullup)
267
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
268
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
269
+ * 
270
+ *  1047 : Pt1000 with 4k7 pullup
271
+ *  1010 : Pt1000 with 1k pullup (non standard)
272
+ *   147 : Pt100 with 4k7 pullup
273
+ *   110 : Pt100 with 1k pullup (non standard)
274
+ *
275
+ *         Use these for Testing or Development purposes. NEVER for production machine.
276
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
277
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
278
+ *
279
+ * :{ '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" }
280
+ */
277 281
 #define TEMP_SENSOR_0 1
278 282
 #define TEMP_SENSOR_1 0
279 283
 #define TEMP_SENSOR_2 0
280 284
 #define TEMP_SENSOR_3 0
281 285
 #define TEMP_SENSOR_BED 1
282 286
 
283
-// 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.
287
+// Dummy thermistor constant temperature readings, for use with 998 and 999
288
+#define DUMMY_THERMISTOR_998_VALUE 25
289
+#define DUMMY_THERMISTOR_999_VALUE 100
290
+
291
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
292
+// from the two sensors differ too much the print will be aborted.
284 293
 //#define TEMP_SENSOR_1_AS_REDUNDANT
285 294
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
286 295
 
@@ -460,8 +469,8 @@
460 469
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
461 470
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
462 471
 
463
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
464
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
472
+// Enable this feature if all enabled endstop pins are interrupt-capable.
473
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
465 474
 //#define ENDSTOP_INTERRUPTS_FEATURE
466 475
 
467 476
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/TAZ4/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 7
246 250
 #define TEMP_SENSOR_1 7
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 7
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -466,8 +475,8 @@
466 475
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
467 476
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
468 477
 
469
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
470
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
478
+// Enable this feature if all enabled endstop pins are interrupt-capable.
479
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
471 480
 //#define ENDSTOP_INTERRUPTS_FEATURE
472 481
 
473 482
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/WITBOX/Configuration.h Wyświetl plik

@@ -203,55 +203,64 @@
203 203
 //===========================================================================
204 204
 //============================= Thermal Settings ============================
205 205
 //===========================================================================
206
-//
207
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
208
-//
209
-//// Temperature sensor settings:
210
-// -3 is thermocouple with MAX31855 (only for sensor 0)
211
-// -2 is thermocouple with MAX6675 (only for sensor 0)
212
-// -1 is thermocouple with AD595
213
-// 0 is not used
214
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
215
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
216
-// 3 is Mendel-parts thermistor (4.7k pullup)
217
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
218
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
219
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
220
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
221
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
222
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
223
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
224
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
225
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
226
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
227
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
228
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
229
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
230
-// 66 is 4.7M High Temperature thermistor from Dyze Design
231
-// 70 is the 100K thermistor found in the bq Hephestos 2
232
-//
233
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
234
-//                          (but gives greater accuracy and more stable PID)
235
-// 51 is 100k thermistor - EPCOS (1k pullup)
236
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
237
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
238
-//
239
-// 1047 is Pt1000 with 4k7 pullup
240
-// 1010 is Pt1000 with 1k pullup (non standard)
241
-// 147 is Pt100 with 4k7 pullup
242
-// 110 is Pt100 with 1k pullup (non standard)
243
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
244
-//     Use it for Testing or Development purposes. NEVER for production machine.
245
-//#define DUMMY_THERMISTOR_998_VALUE 25
246
-//#define DUMMY_THERMISTOR_999_VALUE 100
247
-// :{ '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" }
206
+
207
+/**
208
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
209
+ * 
210
+ * Temperature sensors available:
211
+ *
212
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
213
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
214
+ *    -1 : thermocouple with AD595
215
+ *     0 : not used
216
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
217
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
218
+ *     3 : Mendel-parts thermistor (4.7k pullup)
219
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
220
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
221
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
222
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
223
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
224
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
225
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
226
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
227
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
228
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
229
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
230
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
231
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
232
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
233
+ *    70 : the 100K thermistor found in the bq Hephestos 2
234
+ * 
235
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
236
+ *                              (but gives greater accuracy and more stable PID)
237
+ *    51 : 100k thermistor - EPCOS (1k pullup)
238
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
239
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
240
+ * 
241
+ *  1047 : Pt1000 with 4k7 pullup
242
+ *  1010 : Pt1000 with 1k pullup (non standard)
243
+ *   147 : Pt100 with 4k7 pullup
244
+ *   110 : Pt100 with 1k pullup (non standard)
245
+ *
246
+ *         Use these for Testing or Development purposes. NEVER for production machine.
247
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
248
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
249
+ *
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
+ */
248 252
 #define TEMP_SENSOR_0 1
249 253
 #define TEMP_SENSOR_1 0
250 254
 #define TEMP_SENSOR_2 0
251 255
 #define TEMP_SENSOR_3 0
252 256
 #define TEMP_SENSOR_BED 0
253 257
 
254
-// 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.
258
+// Dummy thermistor constant temperature readings, for use with 998 and 999
259
+#define DUMMY_THERMISTOR_998_VALUE 25
260
+#define DUMMY_THERMISTOR_999_VALUE 100
261
+
262
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
263
+// from the two sensors differ too much the print will be aborted.
255 264
 //#define TEMP_SENSOR_1_AS_REDUNDANT
256 265
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
257 266
 
@@ -437,8 +446,8 @@
437 446
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
438 447
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
439 448
 
440
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
441
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
449
+// Enable this feature if all enabled endstop pins are interrupt-capable.
450
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
442 451
 //#define ENDSTOP_INTERRUPTS_FEATURE
443 452
 
444 453
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/adafruit/ST7565/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -445,8 +454,8 @@
445 454
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
446 455
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
447 456
 
448
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
449
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
457
+// Enable this feature if all enabled endstop pins are interrupt-capable.
458
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
450 459
 //#define ENDSTOP_INTERRUPTS_FEATURE
451 460
 
452 461
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/delta/biv2.5/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 5
246 250
 #define TEMP_SENSOR_1 5
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 1
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -489,8 +498,8 @@
489 498
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
490 499
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
491 500
 
492
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
493
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
501
+// Enable this feature if all enabled endstop pins are interrupt-capable.
502
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
494 503
 //#define ENDSTOP_INTERRUPTS_FEATURE
495 504
 
496 505
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/delta/generic/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 -1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 0
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -489,8 +498,8 @@
489 498
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
490 499
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
491 500
 
492
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
493
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
501
+// Enable this feature if all enabled endstop pins are interrupt-capable.
502
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
494 503
 //#define ENDSTOP_INTERRUPTS_FEATURE
495 504
 
496 505
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/delta/kossel_mini/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 7
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 11
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 5
254 263
 
@@ -489,8 +498,8 @@
489 498
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
490 499
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
491 500
 
492
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
493
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
501
+// Enable this feature if all enabled endstop pins are interrupt-capable.
502
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
494 503
 //#define ENDSTOP_INTERRUPTS_FEATURE
495 504
 
496 505
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/delta/kossel_pro/Configuration.h Wyświetl plik

@@ -206,55 +206,64 @@
206 206
 //===========================================================================
207 207
 //============================= Thermal Settings ============================
208 208
 //===========================================================================
209
-//
210
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
211
-//
212
-//// Temperature sensor settings:
213
-// -3 is thermocouple with MAX31855 (only for sensor 0)
214
-// -2 is thermocouple with MAX6675 (only for sensor 0)
215
-// -1 is thermocouple with AD595
216
-// 0 is not used
217
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
218
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
219
-// 3 is Mendel-parts thermistor (4.7k pullup)
220
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
221
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
222
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
223
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
224
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
225
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
226
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
227
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
228
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
229
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
230
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
231
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
232
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
233
-// 66 is 4.7M High Temperature thermistor from Dyze Design
234
-// 70 is the 100K thermistor found in the bq Hephestos 2
235
-//
236
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
237
-//                          (but gives greater accuracy and more stable PID)
238
-// 51 is 100k thermistor - EPCOS (1k pullup)
239
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
240
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
241
-//
242
-// 1047 is Pt1000 with 4k7 pullup
243
-// 1010 is Pt1000 with 1k pullup (non standard)
244
-// 147 is Pt100 with 4k7 pullup
245
-// 110 is Pt100 with 1k pullup (non standard)
246
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
247
-//     Use it for Testing or Development purposes. NEVER for production machine.
248
-//#define DUMMY_THERMISTOR_998_VALUE 25
249
-//#define DUMMY_THERMISTOR_999_VALUE 100
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" }
209
+
210
+/**
211
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
212
+ * 
213
+ * Temperature sensors available:
214
+ *
215
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
216
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
217
+ *    -1 : thermocouple with AD595
218
+ *     0 : not used
219
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
220
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
221
+ *     3 : Mendel-parts thermistor (4.7k pullup)
222
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
223
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
224
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
225
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
226
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
227
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
228
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
229
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
230
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
231
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
232
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
233
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
234
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
235
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
236
+ *    70 : the 100K thermistor found in the bq Hephestos 2
237
+ * 
238
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
239
+ *                              (but gives greater accuracy and more stable PID)
240
+ *    51 : 100k thermistor - EPCOS (1k pullup)
241
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
242
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
243
+ * 
244
+ *  1047 : Pt1000 with 4k7 pullup
245
+ *  1010 : Pt1000 with 1k pullup (non standard)
246
+ *   147 : Pt100 with 4k7 pullup
247
+ *   110 : Pt100 with 1k pullup (non standard)
248
+ *
249
+ *         Use these for Testing or Development purposes. NEVER for production machine.
250
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
251
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
252
+ *
253
+ * :{ '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" }
254
+ */
251 255
 #define TEMP_SENSOR_0 5
252 256
 #define TEMP_SENSOR_1 0
253 257
 #define TEMP_SENSOR_2 0
254 258
 #define TEMP_SENSOR_3 0
255 259
 #define TEMP_SENSOR_BED 5
256 260
 
257
-// 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.
261
+// Dummy thermistor constant temperature readings, for use with 998 and 999
262
+#define DUMMY_THERMISTOR_998_VALUE 25
263
+#define DUMMY_THERMISTOR_999_VALUE 100
264
+
265
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
266
+// from the two sensors differ too much the print will be aborted.
258 267
 //#define TEMP_SENSOR_1_AS_REDUNDANT
259 268
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
260 269
 
@@ -478,8 +487,8 @@
478 487
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
479 488
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
480 489
 
481
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
482
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
490
+// Enable this feature if all enabled endstop pins are interrupt-capable.
491
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
483 492
 //#define ENDSTOP_INTERRUPTS_FEATURE
484 493
 
485 494
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/delta/kossel_xl/Configuration.h Wyświetl plik

@@ -193,55 +193,64 @@
193 193
 //===========================================================================
194 194
 //============================= Thermal Settings ============================
195 195
 //===========================================================================
196
-//
197
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
198
-//
199
-//// Temperature sensor settings:
200
-// -3 is thermocouple with MAX31855 (only for sensor 0)
201
-// -2 is thermocouple with MAX6675 (only for sensor 0)
202
-// -1 is thermocouple with AD595
203
-// 0 is not used
204
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
205
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
206
-// 3 is Mendel-parts thermistor (4.7k pullup)
207
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
208
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
209
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
210
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
211
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
212
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
213
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
214
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
215
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
216
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
217
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
218
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
219
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
220
-// 66 is 4.7M High Temperature thermistor from Dyze Design
221
-// 70 is the 100K thermistor found in the bq Hephestos 2
222
-//
223
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
224
-//                          (but gives greater accuracy and more stable PID)
225
-// 51 is 100k thermistor - EPCOS (1k pullup)
226
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
227
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
228
-//
229
-// 1047 is Pt1000 with 4k7 pullup
230
-// 1010 is Pt1000 with 1k pullup (non standard)
231
-// 147 is Pt100 with 4k7 pullup
232
-// 110 is Pt100 with 1k pullup (non standard)
233
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
234
-//     Use it for Testing or Development purposes. NEVER for production machine.
235
-//#define DUMMY_THERMISTOR_998_VALUE 25
236
-//#define DUMMY_THERMISTOR_999_VALUE 100
237
-// :{ '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" }
196
+
197
+/**
198
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
199
+ * 
200
+ * Temperature sensors available:
201
+ *
202
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
203
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
204
+ *    -1 : thermocouple with AD595
205
+ *     0 : not used
206
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
207
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
208
+ *     3 : Mendel-parts thermistor (4.7k pullup)
209
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
210
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
211
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
212
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
213
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
214
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
215
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
216
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
217
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
218
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
219
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
220
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
221
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
222
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
223
+ *    70 : the 100K thermistor found in the bq Hephestos 2
224
+ * 
225
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
226
+ *                              (but gives greater accuracy and more stable PID)
227
+ *    51 : 100k thermistor - EPCOS (1k pullup)
228
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
229
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
230
+ * 
231
+ *  1047 : Pt1000 with 4k7 pullup
232
+ *  1010 : Pt1000 with 1k pullup (non standard)
233
+ *   147 : Pt100 with 4k7 pullup
234
+ *   110 : Pt100 with 1k pullup (non standard)
235
+ *
236
+ *         Use these for Testing or Development purposes. NEVER for production machine.
237
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
238
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
239
+ *
240
+ * :{ '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" }
241
+ */
238 242
 #define TEMP_SENSOR_0 5
239 243
 #define TEMP_SENSOR_1 0
240 244
 #define TEMP_SENSOR_2 0
241 245
 #define TEMP_SENSOR_3 0
242 246
 #define TEMP_SENSOR_BED 5
243 247
 
244
-// 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.
248
+// Dummy thermistor constant temperature readings, for use with 998 and 999
249
+#define DUMMY_THERMISTOR_998_VALUE 25
250
+#define DUMMY_THERMISTOR_999_VALUE 100
251
+
252
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
253
+// from the two sensors differ too much the print will be aborted.
245 254
 //#define TEMP_SENSOR_1_AS_REDUNDANT
246 255
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
247 256
 
@@ -487,8 +496,8 @@
487 496
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
488 497
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
489 498
 
490
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
491
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
499
+// Enable this feature if all enabled endstop pins are interrupt-capable.
500
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
492 501
 //#define ENDSTOP_INTERRUPTS_FEATURE
493 502
 
494 503
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/makibox/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 1
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 12
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -448,8 +457,8 @@
448 457
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
449 458
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
450 459
 
451
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
452
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
460
+// Enable this feature if all enabled endstop pins are interrupt-capable.
461
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
453 462
 //#define ENDSTOP_INTERRUPTS_FEATURE
454 463
 
455 464
 //=============================================================================

+ 54
- 45
Marlin/example_configurations/tvrrug/Round2/Configuration.h Wyświetl plik

@@ -200,55 +200,64 @@
200 200
 //===========================================================================
201 201
 //============================= Thermal Settings ============================
202 202
 //===========================================================================
203
-//
204
-//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
205
-//
206
-//// Temperature sensor settings:
207
-// -3 is thermocouple with MAX31855 (only for sensor 0)
208
-// -2 is thermocouple with MAX6675 (only for sensor 0)
209
-// -1 is thermocouple with AD595
210
-// 0 is not used
211
-// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
212
-// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
213
-// 3 is Mendel-parts thermistor (4.7k pullup)
214
-// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
215
-// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
216
-// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
217
-// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
218
-// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
219
-// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
220
-// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
221
-// 10 is 100k RS thermistor 198-961 (4.7k pullup)
222
-// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
223
-// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
224
-// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
225
-// 20 is the PT100 circuit found in the Ultimainboard V2.x
226
-// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
227
-// 66 is 4.7M High Temperature thermistor from Dyze Design
228
-// 70 is the 100K thermistor found in the bq Hephestos 2
229
-//
230
-//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
231
-//                          (but gives greater accuracy and more stable PID)
232
-// 51 is 100k thermistor - EPCOS (1k pullup)
233
-// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
234
-// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
235
-//
236
-// 1047 is Pt1000 with 4k7 pullup
237
-// 1010 is Pt1000 with 1k pullup (non standard)
238
-// 147 is Pt100 with 4k7 pullup
239
-// 110 is Pt100 with 1k pullup (non standard)
240
-// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
241
-//     Use it for Testing or Development purposes. NEVER for production machine.
242
-//#define DUMMY_THERMISTOR_998_VALUE 25
243
-//#define DUMMY_THERMISTOR_999_VALUE 100
244
-// :{ '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" }
203
+
204
+/**
205
+ * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
206
+ * 
207
+ * Temperature sensors available:
208
+ *
209
+ *    -3 : thermocouple with MAX31855 (only for sensor 0)
210
+ *    -2 : thermocouple with MAX6675 (only for sensor 0)
211
+ *    -1 : thermocouple with AD595
212
+ *     0 : not used
213
+ *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
214
+ *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
215
+ *     3 : Mendel-parts thermistor (4.7k pullup)
216
+ *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
217
+ *     5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
218
+ *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
219
+ *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
220
+ *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
221
+ *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
222
+ *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
223
+ *    10 : 100k RS thermistor 198-961 (4.7k pullup)
224
+ *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
225
+ *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
226
+ *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
227
+ *    20 : the PT100 circuit found in the Ultimainboard V2.x
228
+ *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
229
+ *    66 : 4.7M High Temperature thermistor from Dyze Design
230
+ *    70 : the 100K thermistor found in the bq Hephestos 2
231
+ * 
232
+ *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
233
+ *                              (but gives greater accuracy and more stable PID)
234
+ *    51 : 100k thermistor - EPCOS (1k pullup)
235
+ *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
236
+ *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
237
+ * 
238
+ *  1047 : Pt1000 with 4k7 pullup
239
+ *  1010 : Pt1000 with 1k pullup (non standard)
240
+ *   147 : Pt100 with 4k7 pullup
241
+ *   110 : Pt100 with 1k pullup (non standard)
242
+ *
243
+ *         Use these for Testing or Development purposes. NEVER for production machine.
244
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
245
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
246
+ *
247
+ * :{ '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" }
248
+ */
245 249
 #define TEMP_SENSOR_0 5
246 250
 #define TEMP_SENSOR_1 0
247 251
 #define TEMP_SENSOR_2 0
248 252
 #define TEMP_SENSOR_3 0
249 253
 #define TEMP_SENSOR_BED 5
250 254
 
251
-// 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.
255
+// Dummy thermistor constant temperature readings, for use with 998 and 999
256
+#define DUMMY_THERMISTOR_998_VALUE 25
257
+#define DUMMY_THERMISTOR_999_VALUE 100
258
+
259
+// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
260
+// from the two sensors differ too much the print will be aborted.
252 261
 //#define TEMP_SENSOR_1_AS_REDUNDANT
253 262
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
254 263
 
@@ -435,8 +444,8 @@
435 444
 #define Z_MAX_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
436 445
 #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
437 446
 
438
-// If all used endstop pins are able to cause interrupts, you can enable ENDSTOP_INTERRUPTS_FEATURE.
439
-// Then the function testing the endstops will only be called, if the state of one of the endstops changed.
447
+// Enable this feature if all enabled endstop pins are interrupt-capable.
448
+// This will remove the need to poll the interrupt pins, saving many CPU cycles.
440 449
 //#define ENDSTOP_INTERRUPTS_FEATURE
441 450
 
442 451
 //=============================================================================

+ 11
- 9
Marlin/stepper.cpp Wyświetl plik

@@ -378,19 +378,21 @@ void Stepper::isr() {
378 378
   }
379 379
 
380 380
   // Update endstops state, if enabled
381
-  if (endstops.enabled
381
+  if ((endstops.enabled
382 382
     #if HAS_BED_PROBE
383 383
       || endstops.z_probe_enabled
384 384
     #endif
385
-  )
386
-  #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
387
-    if(e_hit) {
388
-  #endif
389
-      endstops.update();
390
-  #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
385
+    )
386
+    #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
387
+      && e_hit
388
+    #endif
389
+  ) {
390
+    endstops.update();
391
+
392
+    #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
391 393
       e_hit--;
392
-    }
393
-  #endif
394
+    #endif
395
+  }
394 396
 
395 397
   // Take multiple steps per interrupt (For high speed moves)
396 398
   bool all_steps_done = false;

Ładowanie…
Anuluj
Zapisz