Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of comments in thermistor table files. No functional changes. #8968

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Marlin/thermistornames.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,21 @@
#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
#define THERMISTOR_NAME "RS 198-961"
#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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_10.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_11.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_12.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_13.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_4.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
1 change: 1 addition & 0 deletions Marlin/thermistortable_5.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Marlin/thermistortable_51.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Marlin/thermistortable_52.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Marlin/thermistortable_55.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_6.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Marlin/thermistortable_60.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_66.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

// DyzeDesign 500°C Thermistor
// R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign 500C Thermistor
const short temptable_66[][2] PROGMEM = {
{ OV( 17.5), 850 },
{ OV( 17.9), 500 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_7.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_70.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_71.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Marlin/thermistortable_75.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_8.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion Marlin/thermistortable_9.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down