Merge branch 'master' into experimental

Sprinter/thermistortables.h

@@ -69,30 +69,73 @@ const short temptable_1[NUMTEMPS_1][2] = {
 {	1008	,	0	} //safety
 };
 #endif
-#if (THERMISTORHEATER == 2) || (THERMISTORBED == 2) //200k bed thermistor
+#if (THERMISTORHEATER == 2) || (THERMISTORBED == 2) //200k bed thermistor verified by arcol
-#define NUMTEMPS_2 21
+#define NUMTEMPS_2 64
 const short temptable_2[NUMTEMPS_2][2] = {
-   {1, 848},
+   {  16, 315},
-   {54, 275},
+   {  17, 310},
-   {107, 228},
+   {  18, 305},
-   {160, 202},
+   {  19, 300},
-   {213, 185},
+   {  20, 295},
-   {266, 171},
+   {  21, 290},
-   {319, 160},
+   {  22, 285},
-   {372, 150},
+   {  23, 280},
-   {425, 141},
+   {  24, 275},
-   {478, 133},
+   {  25, 270},
-   {531, 125},
+   {  29, 265},
-   {584, 118},
+   {  30, 260},
-   {637, 110},
+   {  35, 255},
-   {690, 103},
+   {  40, 250},
-   {743, 95},
+   {  45, 245},
-   {796, 86},
+   {  50, 240},
-   {849, 77},
+   {  55, 235},
-   {902, 65},
+   {  60, 230},
-   {955, 49},
+   {  65, 225},
-   {1008, 17},
+   {  70, 220},
-   {1020, 0} //safety
+   {  90, 215},
+   {  95, 210},
+   { 103, 205},
+   { 105, 200},
+   { 115, 195},
+   { 130, 190},
+   { 150, 185},
+   { 167, 180},
+   { 190, 175},
+   { 200, 170},
+   { 230, 165},
+   { 250, 160},
+   { 270, 155},
+   { 300, 150},
+   { 330, 145},
+   { 360, 140},
+   { 380, 135},
+   { 408, 130},
+   { 450, 125},
+   { 500, 120},
+   { 530, 115},
+   { 550, 110},
+   { 570, 105},
+   { 595, 100},
+   { 615,  95},
+   { 640,  90},
+   { 665,  85},
+   { 700,  80},
+   { 740,  75},
+   { 780,  70},
+   { 810,  65},
+   { 840,  60},
+   { 880,  55},
+   { 920,  50},
+   { 960,  45},
+   { 980,  40},
+   { 990,  35},
+   {1000,  30},
+   {1005,  25},
+   {1006,  20},
+   {1009,  15},
+   {1010,  10},
+   {1020,   5},
+   {1023,   0} //safety
 };
 
 #endif