add thermistor table 22 for ATOM JD head thermistor MF-58(the shippin…

…g one should be this one)
cyberbsd · Sep 17, 2014 · 7298870 · 7298870
1 parent bfab4a1
commit 7298870
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 6 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -172,7 +172,7 @@
 // 147 is Pt100 with 4k7 pullup
 // 110 is Pt100 with 1k pullup (non standard)
 
-#define TEMP_SENSOR_0 11
+#define TEMP_SENSOR_0 21 //11
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_BED 0
@@ -214,8 +214,8 @@
 // PID settings:
 // Comment the following line to disable PID and enable bang-bang.
 #define PIDTEMP
-#define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current
-#define PID_MAX 255 // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
+#define BANG_MAX 210 // limits current to nozzle while in bang-bang mode; 255=full current
+#define PID_MAX 210 // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
 #ifdef PIDTEMP
   //#define PID_DEBUG // Sends debug data to the serial port.
   //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
@@ -227,9 +227,9 @@
 
 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
 // ATOM
-    #define  DEFAULT_Kp 8.68
-    #define  DEFAULT_Ki 1.66
-    #define  DEFAULT_Kd 11.38
+    #define  DEFAULT_Kp 20.74
+    #define  DEFAULT_Ki 3.19
+    #define  DEFAULT_Kd 33.68
 // Ultimaker
 //    #define  DEFAULT_Kp 22.2
 //    #define  DEFAULT_Ki 1.08

diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h
@@ -621,6 +621,73 @@ const short temptable_11[][2] PROGMEM = {
 };
 #endif
 
+#if (THERMISTORHEATER_0 == 21) || (THERMISTORHEATER_1 == 21) || (THERMISTORHEATER_2 == 21) || (THERMISTORBED == 21)
+// 100k Termistor Chino Aliexpress MF58 // UTILIZADo por el Argento //Ultima actualizacion 24-feb-2014
+const short temptable_21[][2] PROGMEM = {
+    {     380,       300     }, // r=   112 adc=23.74
+    {     409,       295     }, // r=   120 adc=25.56
+    {     441,       290     }, // r=   130 adc=27.56
+    {     476,       285     }, // r=   141 adc=29.73
+    {     514,       280     }, // r=   152 adc=32.11
+    {     556,       275     }, // r=   165 adc=34.72
+    {     601,       270     }, // r=   179 adc=37.57
+    {     651,       265     }, // r=   195 adc=40.70
+    {     706,       260     }, // r=   212 adc=44.13
+    {     766,       255     }, // r=   231 adc=47.90
+    {     833,       250     }, // r=   252 adc=52.04
+    {     905,       245     }, // r=   275 adc=56.59
+    {     985,       240     }, // r=   301 adc=61.59
+    {    1073,       235     }, // r=   330 adc=67.09
+    {    1170,       230     }, // r=   362 adc=73.15
+    {    1277,       225     }, // r=   398 adc=79.82
+    {    1395,       220     }, // r=   438 adc=87.17
+    {    1524,       215     }, // r=   483 adc=95.25
+    {    1667,       210     }, // r=   533 adc=104.16
+    {    1823,       205     }, // r=   589 adc=113.96
+    {    1996,       200     }, // r=   653 adc=124.74
+    {    2185,       195     }, // r=   724 adc=136.59
+    {    2394,       190     }, // r=   805 adc=149.61
+    {    2622,       185     }, // r=   897 adc=163.88
+    {    2872,       180     }, // r=  1000 adc=179.50
+    {    3145,       175     }, // r=  1118 adc=196.58
+    {    3443,       170     }, // r=  1252 adc=215.18
+    {    3767,       165     }, // r=  1405 adc=235.41
+    {    4117,       160     }, // r=  1580 adc=257.32
+    {    4495,       155     }, // r=  1780 adc=280.96
+    {    4902,       150     }, // r=  2009 adc=306.36
+    {    5336,       145     }, // r=  2273 adc=333.51
+    {    5798,       140     }, // r=  2578 adc=362.36
+    {    6286,       135     }, // r=  2930 adc=392.85
+    {    6797,       130     }, // r=  3338 adc=424.83
+    {    7330,       125     }, // r=  3812 adc=458.12
+    {    7880,       120     }, // r=  4363 adc=492.50
+    {    8443,       115     }, // r=  5007 adc=527.70
+    {    9014,       110     }, // r=  5761 adc=563.39
+    {    9588,       105     }, // r=  6646 adc=599.24
+    {   10158,       100     }, // r=  7688 adc=634.87
+    {   10719,        95     }, // r=  8917 adc=669.91
+    {   11264,        90     }, // r= 10373 adc=704.01
+    {   11789,        85     }, // r= 12102 adc=736.84
+    {   12289,        80     }, // r= 14162 adc=768.09
+    {   12760,        75     }, // r= 16623 adc=797.51
+    {   13199,        70     }, // r= 19575 adc=824.93
+    {   13603,        65     }, // r= 23127 adc=850.21
+    {   13973,        60     }, // r= 27415 adc=873.28
+    {   14306,        55     }, // r= 32611 adc=894.14
+    {   14605,        50     }, // r= 38931 adc=912.80
+    {   14870,        45     }, // r= 46648 adc=929.36
+    {   15103,        40     }, // r= 56107 adc=943.93
+    {   15306,        35     }, // r= 67749 adc=956.64
+    {   15482,        30     }, // r= 82138 adc=967.63
+    {   15633,        25     }, // r=100000 adc=977.08
+    {   15762,        20     }, // r=122272 adc=985.13
+    {   15871,        15     }, // r=150172 adc=991.95
+    {   15963,        10     }, // r=185290 adc=997.69
+    {   16040,         5     }, // r=229714 adc=1002.49
+    {   16104,         0     }, // r=286200 adc=1006.47
+};
+#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 */