zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1082 from Fourmi/Marlin_v1

Browse source 
Add thermistor table
This commit is contained in:
Erik van der Zalm 2014-10-06 13:39:36 +02:00
parent 764921bdbf a664763e6f
commit ce85515428
2 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/Configuration.h
View file

@ -126,6 +126,7 @@
// 10 is 100k RS thermistor 198-961 (4.7k pullup) // 10 is 100k RS thermistor 198-961 (4.7k pullup)
// 11 is 100k beta 3950 1% thermistor (4.7k pullup) // 11 is 100k beta 3950 1% thermistor (4.7k pullup)
// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) // 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
// 20 is the PT100 circuit found in the Ultimainboard V2.x // 20 is the PT100 circuit found in the Ultimainboard V2.x
// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 // 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
// //

69
Marlin/thermistortables.h
View file

@ -621,6 +621,75 @@ const short temptable_11[][2] PROGMEM = {
}; };
#endif #endif
#if (THERMISTORHEATER_0 == 13) || (THERMISTORHEATER_1 == 13) || (THERMISTORHEATER_2 == 13) || (THERMISTORBED == 13)
// Hisens thermistor B25/50 =3950 +/-1%
const short temptable_12[][2] PROGMEM = {
{ 22.5*OVERSAMPLENR, 300 },
{ 24.125*OVERSAMPLENR, 295 },
{ 25.875*OVERSAMPLENR, 290 },
{ 27.8125*OVERSAMPLENR, 285 },
{ 29.9375*OVERSAMPLENR, 280 },
{ 32.25*OVERSAMPLENR, 275 },
{ 34.8125*OVERSAMPLENR, 270 },
{ 37.625*OVERSAMPLENR, 265 },
{ 40.6875*OVERSAMPLENR, 260 },
{ 44.0625*OVERSAMPLENR, 255 },
{ 47.75*OVERSAMPLENR, 250 },
{ 51.8125*OVERSAMPLENR, 245 },
{ 56.3125*OVERSAMPLENR, 240 },
{ 61.25*OVERSAMPLENR, 235 },
{ 66.75*OVERSAMPLENR, 230 },
{ 72.8125*OVERSAMPLENR, 225 },
{ 79.5*OVERSAMPLENR, 220 },
{ 87*OVERSAMPLENR, 215 },
{ 95.3125*OVERSAMPLENR, 210 },
{ 104.1875*OVERSAMPLENR, 205 },
{ 112.75*OVERSAMPLENR, 200 },
{ 123.125*OVERSAMPLENR, 195 },
{ 135.75*OVERSAMPLENR, 190 },
{ 148.3125*OVERSAMPLENR, 185 },
{ 163.8125*OVERSAMPLENR, 180 },
{ 179*OVERSAMPLENR, 175 },
{ 211.125*OVERSAMPLENR, 170 },
{ 216.125*OVERSAMPLENR, 165 },
{ 236.5625*OVERSAMPLENR, 160 },
{ 258.5*OVERSAMPLENR, 155 },
{ 279.875*OVERSAMPLENR, 150 },
{ 305.375*OVERSAMPLENR, 145 },
{ 333.25*OVERSAMPLENR, 140 },
{ 362.5625*OVERSAMPLENR, 135 },
{ 393.6875*OVERSAMPLENR, 130 },
{ 425*OVERSAMPLENR, 125 },
{ 460.625*OVERSAMPLENR, 120 },
{ 495.1875*OVERSAMPLENR, 115 },
{ 530.875*OVERSAMPLENR, 110 },
{ 567.25*OVERSAMPLENR, 105 },
{ 601.625*OVERSAMPLENR, 100 },
{ 637.875*OVERSAMPLENR, 95 },
{ 674.5625*OVERSAMPLENR, 90 },
{ 710*OVERSAMPLENR, 85 },
{ 744.125*OVERSAMPLENR, 80 },
{ 775.9375*OVERSAMPLENR, 75 },
{ 806.875*OVERSAMPLENR, 70 },
{ 835.1875*OVERSAMPLENR, 65 },
{ 861.125*OVERSAMPLENR, 60 },
{ 884.375*OVERSAMPLENR, 55 },
{ 904.5625*OVERSAMPLENR, 50 },
{ 923.8125*OVERSAMPLENR, 45 },
{ 940.375*OVERSAMPLENR, 40 },
{ 954.625*OVERSAMPLENR, 35 },
{ 966.875*OVERSAMPLENR, 30 },
{ 977.0625*OVERSAMPLENR, 25 },
{ 986*OVERSAMPLENR, 20 },
{ 993.375*OVERSAMPLENR, 15 },
{ 999.5*OVERSAMPLENR, 10 },
{ 1004.5*OVERSAMPLENR, 5 },
{ 1008.5*OVERSAMPLENR, 0 }
};
#endif
#if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics #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. /* 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 */ This does not match the normal thermistor behaviour so we need to set the following defines */