From decf8447889c5a000bef33de41efaf23dd1b4e42 Mon Sep 17 00:00:00 2001 From: Arne Husth Date: Sun, 31 Dec 2017 14:46:56 +0100 Subject: [PATCH] Update of comments in thermistor table files. No functional changes. --- Marlin/thermistornames.h | 10 +++++----- Marlin/thermistortable_1.h | 2 +- Marlin/thermistortable_10.h | 2 +- Marlin/thermistortable_11.h | 2 +- Marlin/thermistortable_12.h | 2 +- Marlin/thermistortable_13.h | 2 +- Marlin/thermistortable_2.h | 2 +- Marlin/thermistortable_3.h | 2 +- Marlin/thermistortable_4.h | 2 +- Marlin/thermistortable_5.h | 1 + Marlin/thermistortable_51.h | 1 + Marlin/thermistortable_52.h | 1 + Marlin/thermistortable_55.h | 1 + Marlin/thermistortable_6.h | 2 +- Marlin/thermistortable_60.h | 1 + Marlin/thermistortable_66.h | 2 +- Marlin/thermistortable_7.h | 2 +- Marlin/thermistortable_70.h | 2 +- Marlin/thermistortable_71.h | 2 +- Marlin/thermistortable_75.h | 3 ++- Marlin/thermistortable_8.h | 2 +- Marlin/thermistortable_9.h | 2 +- 22 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Marlin/thermistornames.h b/Marlin/thermistornames.h index 2e672a450..e444a9545 100644 --- a/Marlin/thermistornames.h +++ b/Marlin/thermistornames.h @@ -44,11 +44,11 @@ #elif THERMISTOR_ID == 6 #define THERMISTOR_NAME "EPCOS (alt)" #elif THERMISTOR_ID == 7 - #define THERMISTOR_NAME "HW 104LAG" + #define THERMISTOR_NAME "Honeywell 104LAG" #elif THERMISTOR_ID == 71 - #define THERMISTOR_NAME "HW 104LAF" + #define THERMISTOR_NAME "Honeywell 104LAF" #elif THERMISTOR_ID == 8 - #define THERMISTOR_NAME "E3104FXT" + #define THERMISTOR_NAME "E3104FHT" #elif THERMISTOR_ID == 9 #define THERMISTOR_NAME "GE AL03006" #elif THERMISTOR_ID == 10 @@ -56,9 +56,9 @@ #elif THERMISTOR_ID == 11 #define THERMISTOR_NAME "1% beta 3950" #elif THERMISTOR_ID == 12 - #define THERMISTOR_NAME "E3104FXT (alt)" + #define THERMISTOR_NAME "Unknown" #elif THERMISTOR_ID == 13 - #define THERMISTOR_NAME "Hisens 3950" + #define THERMISTOR_NAME "Hisens" #elif THERMISTOR_ID == 20 #define THERMISTOR_NAME "PT100 UltiMB" #elif THERMISTOR_ID == 60 diff --git a/Marlin/thermistortable_1.h b/Marlin/thermistortable_1.h index c3395a5aa..ea887952f 100644 --- a/Marlin/thermistortable_1.h +++ b/Marlin/thermistortable_1.h @@ -20,7 +20,7 @@ * */ -// 100k bed thermistor +// R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor const short temptable_1[][2] PROGMEM = { { OV( 23), 300 }, { OV( 25), 295 }, diff --git a/Marlin/thermistortable_10.h b/Marlin/thermistortable_10.h index 2a49d6b14..b54425fff 100644 --- a/Marlin/thermistortable_10.h +++ b/Marlin/thermistortable_10.h @@ -20,7 +20,7 @@ * */ -// 100k RS thermistor 198-961 (4.7k pullup) +// R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, RS thermistor 198-961 const short temptable_10[][2] PROGMEM = { { OV( 1), 929 }, { OV( 36), 299 }, diff --git a/Marlin/thermistortable_11.h b/Marlin/thermistortable_11.h index cc5715b78..eb8030697 100644 --- a/Marlin/thermistortable_11.h +++ b/Marlin/thermistortable_11.h @@ -20,7 +20,7 @@ * */ -// QU-BD silicone bed QWG-104F-3950 thermistor +// R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, QU-BD silicone bed QWG-104F-3950 thermistor const short temptable_11[][2] PROGMEM = { { OV( 1), 938 }, { OV( 31), 314 }, diff --git a/Marlin/thermistortable_12.h b/Marlin/thermistortable_12.h index aff539e2c..c05ba4077 100644 --- a/Marlin/thermistortable_12.h +++ b/Marlin/thermistortable_12.h @@ -20,7 +20,7 @@ * */ -// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// R25 = 100 kOhm, beta25 = 4700 K, 4.7 kOhm pull-up, (personal calibration for Makibox hot bed) const short temptable_12[][2] PROGMEM = { { OV( 35), 180 }, // top rating 180C { OV( 211), 140 }, diff --git a/Marlin/thermistortable_13.h b/Marlin/thermistortable_13.h index b4d827e45..b0bfd8aa6 100644 --- a/Marlin/thermistortable_13.h +++ b/Marlin/thermistortable_13.h @@ -20,7 +20,7 @@ * */ -// Hisens thermistor B25/50 =3950 +/-1% +// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, Hisens thermistor const short temptable_13[][2] PROGMEM = { { OV( 20.04), 300 }, { OV( 23.19), 290 }, diff --git a/Marlin/thermistortable_2.h b/Marlin/thermistortable_2.h index 03c2d39be..e747b2ffa 100644 --- a/Marlin/thermistortable_2.h +++ b/Marlin/thermistortable_2.h @@ -21,7 +21,7 @@ */ // -// 200k ATC Semitec 204GT-2 +// R25 = 200 kOhm, beta25 = 4338 K, 4.7 kOhm pull-up, ATC Semitec 204GT-2 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance // diff --git a/Marlin/thermistortable_3.h b/Marlin/thermistortable_3.h index 3a5a0141f..a82a9b6ff 100644 --- a/Marlin/thermistortable_3.h +++ b/Marlin/thermistortable_3.h @@ -20,7 +20,7 @@ * */ -// mendel-parts +// R25 = 100 kOhm, beta25 = 4120 K, 4.7 kOhm pull-up, mendel-parts const short temptable_3[][2] PROGMEM = { { OV( 1), 864 }, { OV( 21), 300 }, diff --git a/Marlin/thermistortable_4.h b/Marlin/thermistortable_4.h index 8a611a206..6c3ea6170 100644 --- a/Marlin/thermistortable_4.h +++ b/Marlin/thermistortable_4.h @@ -20,7 +20,7 @@ * */ -// 10k thermistor +// R25 = 10 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, Generic 10k thermistor const short temptable_4[][2] PROGMEM = { { OV( 1), 430 }, { OV( 54), 137 }, diff --git a/Marlin/thermistortable_5.h b/Marlin/thermistortable_5.h index 07f68feb2..7f654b1e6 100644 --- a/Marlin/thermistortable_5.h +++ b/Marlin/thermistortable_5.h @@ -20,6 +20,7 @@ * */ +// R25 = 100 kOhm, beta25 = 4267 K, 4.7 kOhm pull-up // 100k ParCan thermistor (104GT-2) // ATC Semitec 104GT-2 (Used in ParCan) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf diff --git a/Marlin/thermistortable_51.h b/Marlin/thermistortable_51.h index 198f564c4..0746c7055 100644 --- a/Marlin/thermistortable_51.h +++ b/Marlin/thermistortable_51.h @@ -20,6 +20,7 @@ * */ +// R25 = 100 kOhm, beta25 = 4092 K, 1 kOhm pull-up, // 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // Verified by linagee. // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance diff --git a/Marlin/thermistortable_52.h b/Marlin/thermistortable_52.h index 361ebb427..63b53e1a7 100644 --- a/Marlin/thermistortable_52.h +++ b/Marlin/thermistortable_52.h @@ -20,6 +20,7 @@ * */ +// R25 = 200 kOhm, beta25 = 4338 K, 1 kOhm pull-up, // 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance diff --git a/Marlin/thermistortable_55.h b/Marlin/thermistortable_55.h index c4f3961dd..aa6677feb 100644 --- a/Marlin/thermistortable_55.h +++ b/Marlin/thermistortable_55.h @@ -20,6 +20,7 @@ * */ +// R25 = 100 kOhm, beta25 = 4267 K, 1 kOhm pull-up, // 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!) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance diff --git a/Marlin/thermistortable_6.h b/Marlin/thermistortable_6.h index ab21ae667..bb97267ba 100644 --- a/Marlin/thermistortable_6.h +++ b/Marlin/thermistortable_6.h @@ -20,7 +20,7 @@ * */ -// 100k Epcos thermistor +// R25 = 100 kOhm, beta25 = 4092 K, 8.2 kOhm pull-up, 100k Epcos (?) thermistor const short temptable_6[][2] PROGMEM = { { OV( 1), 350 }, { OV( 28), 250 }, // top rating 250C diff --git a/Marlin/thermistortable_60.h b/Marlin/thermistortable_60.h index 3340ac6b5..ab92406f4 100644 --- a/Marlin/thermistortable_60.h +++ b/Marlin/thermistortable_60.h @@ -20,6 +20,7 @@ * */ +// R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, // Maker's Tool Works Kapton Bed Thermistor // ./createTemperatureLookup.py --r0=100000 --t0=25 --r1=0 --r2=4700 --beta=3950 // r0: 100000 diff --git a/Marlin/thermistortable_66.h b/Marlin/thermistortable_66.h index 78d5fb8bf..7fb9a2d20 100644 --- a/Marlin/thermistortable_66.h +++ b/Marlin/thermistortable_66.h @@ -20,7 +20,7 @@ * */ -// DyzeDesign 500°C Thermistor +// R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign 500 °C Thermistor const short temptable_66[][2] PROGMEM = { { OV( 17.5), 850 }, { OV( 17.9), 500 }, diff --git a/Marlin/thermistortable_7.h b/Marlin/thermistortable_7.h index 5302a4056..025c53ce9 100644 --- a/Marlin/thermistortable_7.h +++ b/Marlin/thermistortable_7.h @@ -20,7 +20,7 @@ * */ -// 100k Honeywell 135-104LAG-J01 +// R25 = 100 kOhm, beta25 = 3974 K, 4.7 kOhm pull-up, Honeywell 135-104LAG-J01 const short temptable_7[][2] PROGMEM = { { OV( 1), 941 }, { OV( 19), 362 }, diff --git a/Marlin/thermistortable_70.h b/Marlin/thermistortable_70.h index 990e45f3c..fd7838b80 100644 --- a/Marlin/thermistortable_70.h +++ b/Marlin/thermistortable_70.h @@ -20,7 +20,7 @@ * */ -// bqh2 stock thermistor +// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, bqh2 stock thermistor const short temptable_70[][2] PROGMEM = { { OV( 22), 300 }, { OV( 24), 295 }, diff --git a/Marlin/thermistortable_71.h b/Marlin/thermistortable_71.h index 2ba14d0cb..c7b8a64e3 100644 --- a/Marlin/thermistortable_71.h +++ b/Marlin/thermistortable_71.h @@ -20,7 +20,7 @@ * */ -// 100k Honeywell 135-104LAF-J01 +// R25 = 100 kOhm, beta25 = 3974 K, 4.7 kOhm pull-up, Honeywell 135-104LAF-J01 // R0 = 100000 Ohm // T0 = 25 °C // Beta = 3974 diff --git a/Marlin/thermistortable_75.h b/Marlin/thermistortable_75.h index 758c2a04b..dda764949 100644 --- a/Marlin/thermistortable_75.h +++ b/Marlin/thermistortable_75.h @@ -20,7 +20,8 @@ * */ -// Generic Silicon Heat Pad with NTC 100K thermistor ( Beta 25/50 3950K) +// R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, +// Generic Silicon Heat Pad with NTC 100K thermistor // // Many of the generic silicon heat pads use the MGB18-104F39050L32 Thermistor It is used for various // wattage and voltage heat pads. This table is correct if this part is used. It has been diff --git a/Marlin/thermistortable_8.h b/Marlin/thermistortable_8.h index 2a27f7c6f..3ef78da0c 100644 --- a/Marlin/thermistortable_8.h +++ b/Marlin/thermistortable_8.h @@ -20,7 +20,7 @@ * */ -// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// R25 = 100 kOhm, beta25 = 3950 K, 10 kOhm pull-up, NTCS0603E3104FHT const short temptable_8[][2] PROGMEM = { { OV( 1), 704 }, { OV( 54), 216 }, diff --git a/Marlin/thermistortable_9.h b/Marlin/thermistortable_9.h index 2d83dd47a..e9ef924d1 100644 --- a/Marlin/thermistortable_9.h +++ b/Marlin/thermistortable_9.h @@ -20,7 +20,7 @@ * */ -// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, GE Sensing AL03006-58.2K-97-G1 const short temptable_9[][2] PROGMEM = { { OV( 1), 936 }, { OV( 36), 300 },