Update Marlin/thermistortables.h

This commit is contained in:
linagee 2012-05-20 04:55:22 -06:00
parent 2aa9f7b131
commit 96a4baa0be

View File

@ -170,67 +170,40 @@ const short temptable_4[][2] PROGMEM = {
#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2) #if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2)
const short temptable_5[][2] PROGMEM = { const short temptable_5[][2] PROGMEM = {
{1*OVERSAMPLENR, 713}, // ATC Semitec 104GT-2 (Used in ParCan)
{18*OVERSAMPLENR, 316}, // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
{35*OVERSAMPLENR, 266}, // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
{52*OVERSAMPLENR, 239}, {17*OVERSAMPLENR, 300},
{69*OVERSAMPLENR, 221}, {20*OVERSAMPLENR, 290},
{86*OVERSAMPLENR, 208}, {23*OVERSAMPLENR, 280},
{103*OVERSAMPLENR, 197}, {27*OVERSAMPLENR, 270},
{120*OVERSAMPLENR, 188}, {31*OVERSAMPLENR, 260},
{137*OVERSAMPLENR, 181}, {37*OVERSAMPLENR, 250},
{154*OVERSAMPLENR, 174}, {43*OVERSAMPLENR, 240},
{171*OVERSAMPLENR, 169}, {51*OVERSAMPLENR, 230},
{188*OVERSAMPLENR, 163}, {61*OVERSAMPLENR, 220},
{205*OVERSAMPLENR, 159}, {73*OVERSAMPLENR, 210},
{222*OVERSAMPLENR, 154}, {87*OVERSAMPLENR, 200},
{239*OVERSAMPLENR, 150}, {106*OVERSAMPLENR, 190},
{256*OVERSAMPLENR, 147}, {128*OVERSAMPLENR, 180},
{273*OVERSAMPLENR, 143}, {155*OVERSAMPLENR, 170},
{290*OVERSAMPLENR, 140}, {189*OVERSAMPLENR, 160},
{307*OVERSAMPLENR, 136}, {230*OVERSAMPLENR, 150},
{324*OVERSAMPLENR, 133}, {278*OVERSAMPLENR, 140},
{341*OVERSAMPLENR, 130}, {336*OVERSAMPLENR, 130},
{358*OVERSAMPLENR, 128}, {402*OVERSAMPLENR, 120},
{375*OVERSAMPLENR, 125}, {476*OVERSAMPLENR, 110},
{392*OVERSAMPLENR, 122}, {554*OVERSAMPLENR, 100},
{409*OVERSAMPLENR, 120}, {635*OVERSAMPLENR, 90},
{426*OVERSAMPLENR, 117}, {713*OVERSAMPLENR, 80},
{443*OVERSAMPLENR, 115}, {784*OVERSAMPLENR, 70},
{460*OVERSAMPLENR, 112}, {846*OVERSAMPLENR, 60},
{477*OVERSAMPLENR, 110}, {897*OVERSAMPLENR, 50},
{494*OVERSAMPLENR, 108}, {937*OVERSAMPLENR, 40},
{511*OVERSAMPLENR, 106}, {966*OVERSAMPLENR, 30},
{528*OVERSAMPLENR, 103}, {986*OVERSAMPLENR, 20},
{545*OVERSAMPLENR, 101}, {1000*OVERSAMPLENR, 10},
{562*OVERSAMPLENR, 99}, {1010*OVERSAMPLENR, 0}
{579*OVERSAMPLENR, 97},
{596*OVERSAMPLENR, 95},
{613*OVERSAMPLENR, 92},
{630*OVERSAMPLENR, 90},
{647*OVERSAMPLENR, 88},
{664*OVERSAMPLENR, 86},
{681*OVERSAMPLENR, 84},
{698*OVERSAMPLENR, 81},
{715*OVERSAMPLENR, 79},
{732*OVERSAMPLENR, 77},
{749*OVERSAMPLENR, 75},
{766*OVERSAMPLENR, 72},
{783*OVERSAMPLENR, 70},
{800*OVERSAMPLENR, 67},
{817*OVERSAMPLENR, 64},
{834*OVERSAMPLENR, 61},
{851*OVERSAMPLENR, 58},
{868*OVERSAMPLENR, 55},
{885*OVERSAMPLENR, 52},
{902*OVERSAMPLENR, 48},
{919*OVERSAMPLENR, 44},
{936*OVERSAMPLENR, 40},
{953*OVERSAMPLENR, 34},
{970*OVERSAMPLENR, 28},
{987*OVERSAMPLENR, 20},
{1004*OVERSAMPLENR, 8},
{1021*OVERSAMPLENR, 0}
}; };
#endif #endif
@ -336,7 +309,7 @@ const short temptable_7[][2] PROGMEM = {
#if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORBED == 51) #if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORBED == 51)
// 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // 100k EPCOS (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 // Verified by linagee.
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
// Advantage: Twice the resolution and better linearity from 150C to 200C // Advantage: Twice the resolution and better linearity from 150C to 200C
const short temptable_51[][2] PROGMEM = { const short temptable_51[][2] PROGMEM = {