CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #877 from Nutz95/Marlin_v1

Browse Source 
pull Request to Add beta 3950 1% thermistor table into marlin firmware
This commit is contained in:
nothinman 2014-04-13 22:33:58 +01:00
commit a23a5395f9
2 changed files with 130 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@ -115,6 +115,7 @@
// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
// 10 is 100k RS thermistor 198-961 (4.7k pullup)
// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
// 20 is the PT100 circuit found in the Ultimainboard V2.x
// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
//

57
Marlin/thermistortables.h
View File

@ -564,6 +564,63 @@ const short temptable_10[][2] PROGMEM = {
};
#endif
#if (THERMISTORHEATER_0 == 11) || (THERMISTORHEATER_1 == 11) || (THERMISTORHEATER_2 == 11) || (THERMISTORBED == 11)
// QU-BD silicone bed QWG-104F-3950 thermistor
const short temptable_11[][2] PROGMEM = {
{1*OVERSAMPLENR, 938},
{31*OVERSAMPLENR, 314},
{41*OVERSAMPLENR, 290},
{51*OVERSAMPLENR, 272},
{61*OVERSAMPLENR, 258},
{71*OVERSAMPLENR, 247},
{81*OVERSAMPLENR, 237},
{91*OVERSAMPLENR, 229},
{101*OVERSAMPLENR, 221},
{111*OVERSAMPLENR, 215},
{121*OVERSAMPLENR, 209},
{131*OVERSAMPLENR, 204},
{141*OVERSAMPLENR, 199},
{151*OVERSAMPLENR, 195},
{161*OVERSAMPLENR, 190},
{171*OVERSAMPLENR, 187},
{181*OVERSAMPLENR, 183},
{191*OVERSAMPLENR, 179},
{201*OVERSAMPLENR, 176},
{221*OVERSAMPLENR, 170},
{241*OVERSAMPLENR, 165},
{261*OVERSAMPLENR, 160},
{281*OVERSAMPLENR, 155},
{301*OVERSAMPLENR, 150},
{331*OVERSAMPLENR, 144},
{361*OVERSAMPLENR, 139},
{391*OVERSAMPLENR, 133},
{421*OVERSAMPLENR, 128},
{451*OVERSAMPLENR, 123},
{491*OVERSAMPLENR, 117},
{531*OVERSAMPLENR, 111},
{571*OVERSAMPLENR, 105},
{611*OVERSAMPLENR, 100},
{641*OVERSAMPLENR, 95},
{681*OVERSAMPLENR, 90},
{711*OVERSAMPLENR, 85},
{751*OVERSAMPLENR, 79},
{791*OVERSAMPLENR, 72},
{811*OVERSAMPLENR, 69},
{831*OVERSAMPLENR, 65},
{871*OVERSAMPLENR, 57},
{881*OVERSAMPLENR, 55},
{901*OVERSAMPLENR, 51},
{921*OVERSAMPLENR, 45},
{941*OVERSAMPLENR, 39},
{971*OVERSAMPLENR, 28},
{981*OVERSAMPLENR, 23},
{991*OVERSAMPLENR, 17},
{1001*OVERSAMPLENR, 9},
{1021*OVERSAMPLENR, -27}
};
#endif
#if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
/* The PT100 in the Ultimaker v2.0 electronics has a high sample value for a high temperature.
This does not match the normal thermistor behaviour so we need to set the following defines */