Browse Source

Update of comments in thermistor files. No functional changes. (#8986)

ABH10 7 years ago
parent
commit
ac6bf7226a

+ 1
- 1
Marlin/src/module/thermistor/thermistor_1.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k bed thermistor
23
+// R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
24 24
 const short temptable_1[][2] PROGMEM = {
25 25
   { OV(  23), 300 },
26 26
   { OV(  25), 295 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_10.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k RS thermistor 198-961 (4.7k pullup)
23
+// R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, RS thermistor 198-961
24 24
 const short temptable_10[][2] PROGMEM = {
25 25
   { OV(   1), 929 },
26 26
   { OV(  36), 299 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_11.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// QU-BD silicone bed QWG-104F-3950 thermistor
23
+// R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, QU-BD silicone bed QWG-104F-3950 thermistor
24 24
 const short temptable_11[][2] PROGMEM = {
25 25
   { OV(   1), 938 },
26 26
   { OV(  31), 314 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_12.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
23
+// R25 = 100 kOhm, beta25 = 4700 K, 4.7 kOhm pull-up, (personal calibration for Makibox hot bed)
24 24
 const short temptable_12[][2] PROGMEM = {
25 25
   { OV(  35), 180 }, // top rating 180C
26 26
   { OV( 211), 140 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_13.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// Hisens thermistor B25/50 =3950 +/-1%
23
+// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, Hisens thermistor
24 24
 const short temptable_13[][2] PROGMEM = {
25 25
   { OV( 20.04), 300 },
26 26
   { OV( 23.19), 290 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_2.h View File

@@ -21,7 +21,7 @@
21 21
  */
22 22
 
23 23
 //
24
-// 200k ATC Semitec 204GT-2
24
+// R25 = 200 kOhm, beta25 = 4338 K, 4.7 kOhm pull-up, ATC Semitec 204GT-2
25 25
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
26 26
 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
27 27
 //

+ 1
- 1
Marlin/src/module/thermistor/thermistor_3.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// mendel-parts
23
+// R25 = 100 kOhm, beta25 = 4120 K, 4.7 kOhm pull-up, mendel-parts
24 24
 const short temptable_3[][2] PROGMEM = {
25 25
   { OV(   1), 864 },
26 26
   { OV(  21), 300 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_4.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 10k thermistor
23
+// R25 = 10 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, Generic 10k thermistor
24 24
 const short temptable_4[][2] PROGMEM = {
25 25
   { OV(   1), 430 },
26 26
   { OV(  54), 137 },

+ 1
- 0
Marlin/src/module/thermistor/thermistor_5.h View File

@@ -20,6 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
+// R25 = 100 kOhm, beta25 = 4267 K, 4.7 kOhm pull-up
23 24
 // 100k ParCan thermistor (104GT-2)
24 25
 // ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan)
25 26
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf

+ 1
- 0
Marlin/src/module/thermistor/thermistor_51.h View File

@@ -20,6 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
+// R25 = 100 kOhm, beta25 = 4092 K, 1 kOhm pull-up,
23 24
 // 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
24 25
 // Verified by linagee.
25 26
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance

+ 1
- 0
Marlin/src/module/thermistor/thermistor_52.h View File

@@ -20,6 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
+// R25 = 200 kOhm, beta25 = 4338 K, 1 kOhm pull-up,
23 24
 // 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
24 25
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
25 26
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance

+ 1
- 0
Marlin/src/module/thermistor/thermistor_55.h View File

@@ -20,6 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
+// R25 = 100 kOhm, beta25 = 4267 K, 1 kOhm pull-up,
23 24
 // 100k ATC Semitec 104GT-2 (Used on ParCan) (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
24 25
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
25 26
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance

+ 1
- 1
Marlin/src/module/thermistor/thermistor_6.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k Epcos thermistor
23
+// R25 = 100 kOhm, beta25 = 4092 K, 8.2 kOhm pull-up, 100k Epcos (?) thermistor
24 24
 const short temptable_6[][2] PROGMEM = {
25 25
   { OV(   1), 350 },
26 26
   { OV(  28), 250 }, // top rating 250C

+ 1
- 0
Marlin/src/module/thermistor/thermistor_60.h View File

@@ -20,6 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
+// R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up,
23 24
 // Maker's Tool Works Kapton Bed Thermistor
24 25
 // ./createTemperatureLookup.py --r0=100000 --t0=25 --r1=0 --r2=4700 --beta=3950
25 26
 // r0: 100000

+ 1
- 1
Marlin/src/module/thermistor/thermistor_66.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// DyzeDesign 500°C Thermistor
23
+// R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign 500 °C Thermistor
24 24
 const short temptable_66[][2] PROGMEM = {
25 25
   { OV(  17.5), 850 },
26 26
   { OV(  17.9), 500 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_7.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k Honeywell 135-104LAG-J01
23
+// R25 = 100 kOhm, beta25 = 3974 K, 4.7 kOhm pull-up, Honeywell 135-104LAG-J01
24 24
 const short temptable_7[][2] PROGMEM = {
25 25
   { OV(   1), 941 },
26 26
   { OV(  19), 362 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_70.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// bqh2 stock thermistor
23
+// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, bqh2 stock thermistor
24 24
 const short temptable_70[][2] PROGMEM = {
25 25
   { OV(  22), 300 },
26 26
   { OV(  24), 295 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_71.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k Honeywell 135-104LAF-J01
23
+// R25 = 100 kOhm, beta25 = 3974 K, 4.7 kOhm pull-up, Honeywell 135-104LAF-J01
24 24
 // R0 = 100000 Ohm
25 25
 // T0 = 25 °C
26 26
 // Beta = 3974

+ 2
- 1
Marlin/src/module/thermistor/thermistor_75.h View File

@@ -20,7 +20,8 @@
20 20
  *
21 21
  */
22 22
 
23
-// Generic Silicon Heat Pad with NTC 100K thermistor ( Beta 25/50 3950K)
23
+// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up,
24
+// Generic Silicon Heat Pad with NTC 100K thermistor
24 25
 //
25 26
 // Many of the generic silicon heat pads use the MGB18-104F39050L32 Thermistor   It is used for various
26 27
 // wattage and voltage heat pads.  This table is correct if this part is used.   It has been

+ 1
- 1
Marlin/src/module/thermistor/thermistor_8.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
23
+// R25 = 100 kOhm, beta25 = 3950 K, 10 kOhm pull-up, NTCS0603E3104FHT
24 24
 const short temptable_8[][2] PROGMEM = {
25 25
   { OV(   1), 704 },
26 26
   { OV(  54), 216 },

+ 1
- 1
Marlin/src/module/thermistor/thermistor_9.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
23
+// R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, GE Sensing AL03006-58.2K-97-G1
24 24
 const short temptable_9[][2] PROGMEM = {
25 25
   { OV(   1), 936 },
26 26
   { OV(  36), 300 },

+ 21
- 21
Marlin/src/module/thermistor/thermistors.h View File

@@ -40,43 +40,43 @@
40 40
 #define PtAdVal(T,R0,Rup) (short)(1024/(Rup/PtRt(T,R0)+1))
41 41
 #define PtLine(T,R0,Rup) { OV(PtAdVal(T,R0,Rup)), T },
42 42
 
43
-#if ANY_THERMISTOR_IS(1) // 100k bed thermistor
43
+#if ANY_THERMISTOR_IS(1) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "EPCOS"
44 44
   #include "thermistor_1.h"
45 45
 #endif
46
-#if ANY_THERMISTOR_IS(2) // 200k bed thermistor
46
+#if ANY_THERMISTOR_IS(2) // 4338 K, R25 = 200 kOhm, Pull-up = 4.7 kOhm, "ATC Semitec 204GT-2"
47 47
   #include "thermistor_2.h"
48 48
 #endif
49
-#if ANY_THERMISTOR_IS(3) // mendel-parts
49
+#if ANY_THERMISTOR_IS(3) // beta25 = 4120 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Mendel-parts"
50 50
   #include "thermistor_3.h"
51 51
 #endif
52
-#if ANY_THERMISTOR_IS(4) // 10k thermistor
52
+#if ANY_THERMISTOR_IS(4) // beta25 = 3950 K, R25 = 10 kOhm, Pull-up = 4.7 kOhm, "Generic"
53 53
   #include "thermistor_4.h"
54 54
 #endif
55
-#if ANY_THERMISTOR_IS(5) // 100k ParCan thermistor (104GT-2)
55
+#if ANY_THERMISTOR_IS(5) // beta25 = 4267 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "ParCan, ATC 104GT-2"
56 56
   #include "thermistor_5.h"
57 57
 #endif
58
-#if ANY_THERMISTOR_IS(6) // 100k Epcos thermistor
58
+#if ANY_THERMISTOR_IS(6) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 8.2 kOhm, "EPCOS ?"
59 59
   #include "thermistor_6.h"
60 60
 #endif
61
-#if ANY_THERMISTOR_IS(7) // 100k Honeywell 135-104LAG-J01
61
+#if ANY_THERMISTOR_IS(7) // beta25 = 3974 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Honeywell 135-104LAG-J01"
62 62
   #include "thermistor_7.h"
63 63
 #endif
64
-#if ANY_THERMISTOR_IS(71) // 100k Honeywell 135-104LAF-J01
64
+#if ANY_THERMISTOR_IS(71) // beta25 = 3974 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Honeywell 135-104LAF-J01"
65 65
   #include "thermistor_71.h"
66 66
 #endif
67
-#if ANY_THERMISTOR_IS(8) // 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
67
+#if ANY_THERMISTOR_IS(8) // beta25 = 3950 K, R25 = 100 kOhm, Pull-up = 10 kOhm, "Vishay E3104FHT"
68 68
   #include "thermistor_8.h"
69 69
 #endif
70
-#if ANY_THERMISTOR_IS(9) // 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
70
+#if ANY_THERMISTOR_IS(9) // beta25 = 3960 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "GE Sensing AL03006-58.2K-97-G1"
71 71
   #include "thermistor_9.h"
72 72
 #endif
73
-#if ANY_THERMISTOR_IS(10) // 100k RS thermistor 198-961 (4.7k pullup)
73
+#if ANY_THERMISTOR_IS(10) // beta25 = 3960 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "RS 198-961"
74 74
   #include "thermistor_10.h"
75 75
 #endif
76
-#if ANY_THERMISTOR_IS(11) // QU-BD silicone bed QWG-104F-3950 thermistor
76
+#if ANY_THERMISTOR_IS(11) // beta25 = 3950 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "QU-BD silicone bed, QWG-104F-3950"
77 77
   #include "thermistor_11.h"
78 78
 #endif
79
-#if ANY_THERMISTOR_IS(13) // Hisens thermistor B25/50 =3950 +/-1%
79
+#if ANY_THERMISTOR_IS(13) // beta25 = 4100 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Hisens"
80 80
   #include "thermistor_13.h"
81 81
 #endif
82 82
 #if ANY_THERMISTOR_IS(15) // JGAurora A5 thermistor calibration
@@ -85,28 +85,28 @@
85 85
 #if ANY_THERMISTOR_IS(20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
86 86
   #include "thermistor_20.h"
87 87
 #endif
88
-#if ANY_THERMISTOR_IS(51) // 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
88
+#if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS"
89 89
   #include "thermistor_51.h"
90 90
 #endif
91
-#if ANY_THERMISTOR_IS(52) // 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
91
+#if ANY_THERMISTOR_IS(52) // beta25 = 4338 K, R25 = 200 kOhm, Pull-up = 1 kOhm, "ATC Semitec 204GT-2"
92 92
   #include "thermistor_52.h"
93 93
 #endif
94
-#if ANY_THERMISTOR_IS(55) // 100k ATC Semitec 104GT-2 (Used on ParCan) (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
94
+#if ANY_THERMISTOR_IS(55) // beta25 = 4267 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "ATC Semitec 104GT-2 (Used on ParCan)"
95 95
   #include "thermistor_55.h"
96 96
 #endif
97
-#if ANY_THERMISTOR_IS(60) // Maker's Tool Works Kapton Bed Thermistor
97
+#if ANY_THERMISTOR_IS(60) // beta25 = 3950 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Maker's Tool Works Kapton Bed"
98 98
   #include "thermistor_60.h"
99 99
 #endif
100
-#if ANY_THERMISTOR_IS(66) // DyzeDesign 500°C Thermistor
100
+#if ANY_THERMISTOR_IS(66) // beta25 = 4500 K, R25 = 2.5 MOhm, Pull-up = 4.7 kOhm, "DyzeDesign 500 °C Thermistor"
101 101
   #include "thermistor_66.h"
102 102
 #endif
103
-#if ANY_THERMISTOR_IS(12) // 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
103
+#if ANY_THERMISTOR_IS(12) // beta25 = 4700 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Personal calibration for Makibox hot bed"
104 104
   #include "thermistor_12.h"
105 105
 #endif
106
-#if ANY_THERMISTOR_IS(70) // bqh2 stock thermistor
106
+#if ANY_THERMISTOR_IS(70) // beta25 = 4100 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Hephestos 2, bqh2 stock thermistor"
107 107
   #include "thermistor_70.h"
108 108
 #endif
109
-#if ANY_THERMISTOR_IS(75) // Many of the generic silicon heat pads use the MGB18-104F39050L32 Thermistor
109
+#if ANY_THERMISTOR_IS(75) // beta25 = 4100 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "MGB18-104F39050L32 thermistor"
110 110
   #include "thermistor_75.h"
111 111
 #endif
112 112
 #if ANY_THERMISTOR_IS(110) // Pt100 with 1k0 pullup

Loading…
Cancel
Save