bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merged Marlin, Marlin non gen6 and Ultimaker changes

Browse Source
This commit is contained in:
Erik van der Zalm
2011-11-04 18:02:56 +01:00
parent 0b1423c303
commit 094afe7c10
22 changed files with 4803 additions and 2044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
Marlin/thermistortables.h
View File

@ -1,132 +1,133 @@
#ifndef THERMISTORTABLES_H_
#define THERMISTORTABLES_H_
#define OVERSAMPLENR 16
#if (THERMISTORHEATER == 1) || (THERMISTORBED == 1) //100k bed thermistor
#define NUMTEMPS_1 61
const short temptable_1[NUMTEMPS_1][2] = {
{ (23*16) , 300 },
{ (25*16) , 295 },
{ (27*16) , 290 },
{ (28*16) , 285 },
{ (31*16) , 280 },
{ (33*16) , 275 },
{ (35*16) , 270 },
{ (38*16) , 265 },
{ (41*16) , 260 },
{ (44*16) , 255 },
{ (48*16) , 250 },
{ (52*16) , 245 },
{ (56*16) , 240 },
{ (61*16) , 235 },
{ (66*16) , 230 },
{ (71*16) , 225 },
{ (78*16) , 220 },
{ (84*16) , 215 },
{ (92*16) , 210 },
{ (100*16), 205 },
{ (109*16), 200 },
{ (120*16), 195 },
{ (131*16), 190 },
{ (143*16), 185 },
{ (156*16), 180 },
{ (171*16), 175 },
{ (187*16), 170 },
{ (205*16), 165 },
{ (224*16), 160 },
{ (245*16), 155 },
{ (268*16), 150 },
{ (293*16), 145 },
{ (320*16), 140 },
{ (348*16), 135 },
{ (379*16), 130 },
{ (411*16), 125 },
{ (445*16), 120 },
{ (480*16), 115 },
{ (516*16), 110 },
{ (553*16), 105 },
{ (591*16), 100 },
{ (628*16), 95 },
{ (665*16), 90 },
{ (702*16), 85 },
{ (737*16), 80 },
{ (770*16), 75 },
{ (801*16), 70 },
{ (830*16), 65 },
{ (857*16), 60 },
{ (881*16), 55 },
{ (903*16), 50 },
{ (922*16), 45 },
{ (939*16), 40 },
{ (954*16), 35 },
{ (966*16), 30 },
{ (977*16), 25 },
{ (985*16), 20 },
{ (993*16), 15 },
{ (999*16), 10 },
{ (1004*16), 5 },
{ (1008*16), 0 } //safety
{ (23*OVERSAMPLENR) , 300 },
{ (25*OVERSAMPLENR) , 295 },
{ (27*OVERSAMPLENR) , 290 },
{ (28*OVERSAMPLENR) , 285 },
{ (31*OVERSAMPLENR) , 280 },
{ (33*OVERSAMPLENR) , 275 },
{ (35*OVERSAMPLENR) , 270 },
{ (38*OVERSAMPLENR) , 265 },
{ (41*OVERSAMPLENR) , 260 },
{ (44*OVERSAMPLENR) , 255 },
{ (48*OVERSAMPLENR) , 250 },
{ (52*OVERSAMPLENR) , 245 },
{ (56*OVERSAMPLENR) , 240 },
{ (61*OVERSAMPLENR) , 235 },
{ (66*OVERSAMPLENR) , 230 },
{ (71*OVERSAMPLENR) , 225 },
{ (78*OVERSAMPLENR) , 220 },
{ (84*OVERSAMPLENR) , 215 },
{ (92*OVERSAMPLENR) , 210 },
{ (100*OVERSAMPLENR), 205 },
{ (109*OVERSAMPLENR), 200 },
{ (120*OVERSAMPLENR), 195 },
{ (131*OVERSAMPLENR), 190 },
{ (143*OVERSAMPLENR), 185 },
{ (156*OVERSAMPLENR), 180 },
{ (171*OVERSAMPLENR), 175 },
{ (187*OVERSAMPLENR), 170 },
{ (205*OVERSAMPLENR), 165 },
{ (224*OVERSAMPLENR), 160 },
{ (245*OVERSAMPLENR), 155 },
{ (268*OVERSAMPLENR), 150 },
{ (293*OVERSAMPLENR), 145 },
{ (320*OVERSAMPLENR), 140 },
{ (348*OVERSAMPLENR), 135 },
{ (379*OVERSAMPLENR), 130 },
{ (411*OVERSAMPLENR), 125 },
{ (445*OVERSAMPLENR), 120 },
{ (480*OVERSAMPLENR), 115 },
{ (516*OVERSAMPLENR), 110 },
{ (553*OVERSAMPLENR), 105 },
{ (591*OVERSAMPLENR), 100 },
{ (628*OVERSAMPLENR), 95 },
{ (665*OVERSAMPLENR), 90 },
{ (702*OVERSAMPLENR), 85 },
{ (737*OVERSAMPLENR), 80 },
{ (770*OVERSAMPLENR), 75 },
{ (801*OVERSAMPLENR), 70 },
{ (830*OVERSAMPLENR), 65 },
{ (857*OVERSAMPLENR), 60 },
{ (881*OVERSAMPLENR), 55 },
{ (903*OVERSAMPLENR), 50 },
{ (922*OVERSAMPLENR), 45 },
{ (939*OVERSAMPLENR), 40 },
{ (954*OVERSAMPLENR), 35 },
{ (966*OVERSAMPLENR), 30 },
{ (977*OVERSAMPLENR), 25 },
{ (985*OVERSAMPLENR), 20 },
{ (993*OVERSAMPLENR), 15 },
{ (999*OVERSAMPLENR), 10 },
{ (1004*OVERSAMPLENR), 5 },
{ (1008*OVERSAMPLENR), 0 } //safety
};
#endif
#if (THERMISTORHEATER == 2) || (THERMISTORBED == 2) //200k bed thermistor
#define NUMTEMPS_2 21
const short temptable_2[NUMTEMPS_2][2] = {
{(1*16), 848},
{(54*16), 275},
{(107*16), 228},
{(160*16), 202},
{(213*16), 185},
{(266*16), 171},
{(319*16), 160},
{(372*16), 150},
{(425*16), 141},
{(478*16), 133},
{(531*16), 125},
{(584*16), 118},
{(637*16), 110},
{(690*16), 103},
{(743*16), 95},
{(796*16), 86},
{(849*16), 77},
{(902*16), 65},
{(955*16), 49},
{(1008*16), 17},
{(1020*16), 0} //safety
{(1*OVERSAMPLENR), 848},
{(54*OVERSAMPLENR), 275},
{(107*OVERSAMPLENR), 228},
{(160*OVERSAMPLENR), 202},
{(213*OVERSAMPLENR), 185},
{(266*OVERSAMPLENR), 171},
{(319*OVERSAMPLENR), 160},
{(372*OVERSAMPLENR), 150},
{(425*OVERSAMPLENR), 141},
{(478*OVERSAMPLENR), 133},
{(531*OVERSAMPLENR), 125},
{(584*OVERSAMPLENR), 118},
{(637*OVERSAMPLENR), 110},
{(690*OVERSAMPLENR), 103},
{(743*OVERSAMPLENR), 95},
{(796*OVERSAMPLENR), 86},
{(849*OVERSAMPLENR), 77},
{(902*OVERSAMPLENR), 65},
{(955*OVERSAMPLENR), 49},
{(1008*OVERSAMPLENR), 17},
{(1020*OVERSAMPLENR), 0} //safety
};
#endif
#if (THERMISTORHEATER == 3) || (THERMISTORBED == 3) //mendel-parts
#define NUMTEMPS_3 28
const short temptable_3[NUMTEMPS_3][2] = {
{(1*16),864},
{(21*16),300},
{(25*16),290},
{(29*16),280},
{(33*16),270},
{(39*16),260},
{(46*16),250},
{(54*16),240},
{(64*16),230},
{(75*16),220},
{(90*16),210},
{(107*16),200},
{(128*16),190},
{(154*16),180},
{(184*16),170},
{(221*16),160},
{(265*16),150},
{(316*16),140},
{(375*16),130},
{(441*16),120},
{(513*16),110},
{(588*16),100},
{(734*16),80},
{(856*16),60},
{(938*16),40},
{(986*16),20},
{(1008*16),0},
{(1018*16),-20}
{(1*OVERSAMPLENR),864},
{(21*OVERSAMPLENR),300},
{(25*OVERSAMPLENR),290},
{(29*OVERSAMPLENR),280},
{(33*OVERSAMPLENR),270},
{(39*OVERSAMPLENR),260},
{(46*OVERSAMPLENR),250},
{(54*OVERSAMPLENR),240},
{(64*OVERSAMPLENR),230},
{(75*OVERSAMPLENR),220},
{(90*OVERSAMPLENR),210},
{(107*OVERSAMPLENR),200},
{(128*OVERSAMPLENR),190},
{(154*OVERSAMPLENR),180},
{(184*OVERSAMPLENR),170},
{(221*OVERSAMPLENR),160},
{(265*OVERSAMPLENR),150},
{(316*OVERSAMPLENR),140},
{(375*OVERSAMPLENR),130},
{(441*OVERSAMPLENR),120},
{(513*OVERSAMPLENR),110},
{(588*OVERSAMPLENR),100},
{(734*OVERSAMPLENR),80},
{(856*OVERSAMPLENR),60},
{(938*OVERSAMPLENR),40},
{(986*OVERSAMPLENR),20},
{(1008*OVERSAMPLENR),0},
{(1018*OVERSAMPLENR),-20}
};
#endif