Moved temp sensor tables from type 6 to 1

Thanks to printbus for all the clarity on why we should be using the stock Marlin thermistortables.h and type 1: http://3dprintboard.com/showthread.php?6142-Comparison-of-Type-1-and-Typ e-6-thermistortables-h-data
beckdac · Sep 28, 2014 · 1d1628d · 1d1628d
1 parent 3f5a5ee
commit 1d1628d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 55 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -141,10 +141,10 @@
 // 147 is Pt100 with 4k7 pullup
 // 110 is Pt100 with 1k pullup (non standard)
 
-#define TEMP_SENSOR_0 6
+#define TEMP_SENSOR_0 1
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
-#define TEMP_SENSOR_BED 6
+#define TEMP_SENSOR_BED 1
 
 // This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
 //#define TEMP_SENSOR_1_AS_REDUNDANT

diff --git a/Marlin/Configuration.h.without_ABL b/Marlin/Configuration.h.without_ABL
@@ -141,10 +141,10 @@
 // 147 is Pt100 with 4k7 pullup
 // 110 is Pt100 with 1k pullup (non standard)
 
-#define TEMP_SENSOR_0 6
+#define TEMP_SENSOR_0 1
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
-#define TEMP_SENSOR_BED 6
+#define TEMP_SENSOR_BED 1
 
 // This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
 //#define TEMP_SENSOR_1_AS_REDUNDANT

diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h
@@ -211,57 +211,44 @@ const short temptable_5[][2] PROGMEM = {
 
 #if (THERMISTORHEATER_0 == 6) || (THERMISTORHEATER_1 == 6) || (THERMISTORHEATER_2 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor
 const short temptable_6[][2] PROGMEM = {
-   {47*OVERSAMPLENR, 250},
-   {51*OVERSAMPLENR, 245},
-   {55*OVERSAMPLENR, 240},
-   {60*OVERSAMPLENR, 235},
-   {65*OVERSAMPLENR, 230},
-   {71*OVERSAMPLENR, 225},
-   {77*OVERSAMPLENR, 220},
-   {84*OVERSAMPLENR, 215},
-   {91*OVERSAMPLENR, 210},
-   {100*OVERSAMPLENR, 205},
-   {109*OVERSAMPLENR, 200},
-   {119*OVERSAMPLENR, 195},
-   {130*OVERSAMPLENR, 190},
-   {142*OVERSAMPLENR, 185},
-   {155*OVERSAMPLENR, 180},
-   {170*OVERSAMPLENR, 175},
-   {186*OVERSAMPLENR, 170},
-   {204*OVERSAMPLENR, 165},
-   {223*OVERSAMPLENR, 160},
-   {244*OVERSAMPLENR, 155},
-   {267*OVERSAMPLENR, 150},
-   {291*OVERSAMPLENR, 145},
-   {318*OVERSAMPLENR, 140},
-   {347*OVERSAMPLENR, 135},
-   {377*OVERSAMPLENR, 130},
-   {409*OVERSAMPLENR, 125},
-   {443*OVERSAMPLENR, 120},
-   {478*OVERSAMPLENR, 115},
-   {514*OVERSAMPLENR, 110},
-   {552*OVERSAMPLENR, 105},
-   {589*OVERSAMPLENR, 100},
-   {627*OVERSAMPLENR, 95},
-   {664*OVERSAMPLENR, 90},
-   {701*OVERSAMPLENR, 85},
-   {736*OVERSAMPLENR, 80},
-   {769*OVERSAMPLENR, 75},
-   {801*OVERSAMPLENR, 70},
-   {830*OVERSAMPLENR, 65},
-   {857*OVERSAMPLENR, 60},
-   {882*OVERSAMPLENR, 55},
-   {904*OVERSAMPLENR, 50},
-   {923*OVERSAMPLENR, 45},
-   {940*OVERSAMPLENR, 40},
-   {955*OVERSAMPLENR, 35},
-   {967*OVERSAMPLENR, 30},
-   {978*OVERSAMPLENR, 25},
-   {987*OVERSAMPLENR, 20},
-   {995*OVERSAMPLENR, 15},
-   {1001*OVERSAMPLENR, 10},
-   {1006*OVERSAMPLENR, 5},
-   {1010*OVERSAMPLENR, 0}
+   {1*OVERSAMPLENR, 350},
+   {28*OVERSAMPLENR, 250}, //top rating 250C
+   {31*OVERSAMPLENR, 245},
+   {35*OVERSAMPLENR, 240},
+   {39*OVERSAMPLENR, 235},
+   {42*OVERSAMPLENR, 230},
+   {44*OVERSAMPLENR, 225},
+   {49*OVERSAMPLENR, 220},
+   {53*OVERSAMPLENR, 215},
+   {62*OVERSAMPLENR, 210},
+   {71*OVERSAMPLENR, 205}, //fitted graphically
+   {78*OVERSAMPLENR, 200}, //fitted graphically
+   {94*OVERSAMPLENR, 190},
+   {102*OVERSAMPLENR, 185},
+   {116*OVERSAMPLENR, 170},
+   {143*OVERSAMPLENR, 160},
+   {183*OVERSAMPLENR, 150},
+   {223*OVERSAMPLENR, 140},
+   {270*OVERSAMPLENR, 130},
+   {318*OVERSAMPLENR, 120},
+   {383*OVERSAMPLENR, 110},
+   {413*OVERSAMPLENR, 105},
+   {439*OVERSAMPLENR, 100},
+   {484*OVERSAMPLENR, 95},
+   {513*OVERSAMPLENR, 90},
+   {607*OVERSAMPLENR, 80},
+   {664*OVERSAMPLENR, 70},
+   {781*OVERSAMPLENR, 60},
+   {810*OVERSAMPLENR, 55},
+   {849*OVERSAMPLENR, 50},
+   {914*OVERSAMPLENR, 45},
+   {914*OVERSAMPLENR, 40},
+   {935*OVERSAMPLENR, 35},
+   {954*OVERSAMPLENR, 30},
+   {970*OVERSAMPLENR, 25},
+   {978*OVERSAMPLENR, 22},
+   {1008*OVERSAMPLENR, 3},
+   {1023*OVERSAMPLENR, 0}  //to allow internal 0 degrees C
 };
 #endif