New termistor table MarlinFirmware#17 for MKS. Enable FAN auto regula…

…tion (aka IS_MONO_FAN). Set DiscoEasy200 name.
damicreabox · Aug 30, 2016 · 7753280 · 7753280
1 parent e5f9f71
commit 7753280
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 8 deletions.
diff --git a/LinuxAddons/Dagoma/conf/serie/D200_MKS/Base b/LinuxAddons/Dagoma/conf/serie/D200_MKS/Base
@@ -3,7 +3,7 @@ Set STRING_CONFIG_H_AUTHOR '"Dagoma.Fr"'
 Set MOTHERBOARD BOARD_MKS_BASE
 Enable CUSTOM_MACHINE_NAME
 Set CUSTOM_MACHINE_NAME '"Discovery 200"'
-Set TEMP_SENSOR_0 16
+Set TEMP_SENSOR_0 17
 
 Set TEMP_WINDOW 3
 Set TEMP_BED_WINDOW 3

diff --git a/LinuxAddons/Dagoma/conf/serie/D200_V2/Base b/LinuxAddons/Dagoma/conf/serie/D200_V2/Base
@@ -6,13 +6,13 @@ Set STRING_CONFIG_H_AUTHOR '"Dagoma.Fr"'
 
 Set MOTHERBOARD BOARD_MKS_BASE
 Enable CUSTOM_MACHINE_NAME
-Set CUSTOM_MACHINE_NAME '"Discovery 200.2"'
+Set CUSTOM_MACHINE_NAME '"DiscEasy200"'
 
 #
 # Temp stuff
 ###############################################################################
 
-Set TEMP_SENSOR_0 16
+Set TEMP_SENSOR_0 17
 
 Set TEMP_WINDOW 3
 Set TEMP_BED_WINDOW 3
@@ -40,9 +40,9 @@ Set MIN_Z_HEIGHT_FOR_HOMING 7
 
 Enable Z_SAFE_HOMING
 
-#Enable IS_MONO_FAN
-#Set MONO_FAN_MIN_TEMP 50.0
-#Set MONO_FAN_MAX_TEMP 100.0
+Enable IS_MONO_FAN
+Set MONO_FAN_MIN_TEMP 50.0
+Set MONO_FAN_MAX_TEMP 100.0
 
 Set DEFAULT_AXIS_STEPS_PER_UNIT '{80,80,2560,98}'
 Set DEFAULT_MAX_FEEDRATE '{500, 500, 4, 25}'
@@ -115,8 +115,10 @@ Set SECOND_SERIAL_BAUDRATE 115200
 Enable WIFI_PRINT
 
 #
-# LCD Stuff
+# LCD Stuff, even if not enabled
 ###############################################################################
 
 Set PLA_PREHEAT_HPB_TEMP 60
 Set ABS_PREHEAT_HPB_TEMP 90
+
+Set LANGUAGE_INCLUDE 'GENERATE_LANGUAGE_INCLUDE(fr)'
diff --git a/LinuxAddons/Dagoma/conf/serie/Delta/Base b/LinuxAddons/Dagoma/conf/serie/Delta/Base
@@ -5,7 +5,7 @@ Set MOTHERBOARD BOARD_MKS_BASE
 Enable CUSTOM_MACHINE_NAME
 Set CUSTOM_MACHINE_NAME '"Delta SQRT 200"'
 
-Set TEMP_SENSOR_0 16
+Set TEMP_SENSOR_0 17
 
 Set TEMP_WINDOW 3
 Set TEMP_BED_WINDOW 3

diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h
@@ -1131,6 +1131,65 @@ const short temptable_16[][2] PROGMEM = {
 };
 #endif
 
+
+#if (THERMISTORHEATER_0 == 17) || (THERMISTORHEATER_1 == 17) || (THERMISTORHEATER_2 == 17) || (THERMISTORHEATER_3 == 17) || (THERMISTORBED == 17)
+// 17 is 100K thermistor - Alternative ATC Semitec 104GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base - version (measured/tested/approved)
+const short temptable_17[][2] PROGMEM = {
+  {16*OVERSAMPLENR,309},
+  {18*OVERSAMPLENR,307},
+  {20*OVERSAMPLENR,300},
+  {22*OVERSAMPLENR,293},
+  {26*OVERSAMPLENR,284},
+  {29*OVERSAMPLENR,272},
+  {33*OVERSAMPLENR,266},
+  {36*OVERSAMPLENR,260},
+  {42*OVERSAMPLENR,252},
+  {46*OVERSAMPLENR,247},
+  {48*OVERSAMPLENR,244},
+  {51*OVERSAMPLENR,241},
+  {62*OVERSAMPLENR,231},
+  {73*OVERSAMPLENR,222},
+  {78*OVERSAMPLENR,219},
+  {87*OVERSAMPLENR,212},
+  {98*OVERSAMPLENR,207},
+  {109*OVERSAMPLENR,201},
+  {118*OVERSAMPLENR,197},
+  {131*OVERSAMPLENR,191},
+  {145*OVERSAMPLENR,186},
+  {160*OVERSAMPLENR,181},
+  {177*OVERSAMPLENR,175},
+  {203*OVERSAMPLENR,169},
+  {222*OVERSAMPLENR,164},
+  {256*OVERSAMPLENR,156},
+  {283*OVERSAMPLENR,151},
+  {312*OVERSAMPLENR,145},
+  {343*OVERSAMPLENR,140},
+  {377*OVERSAMPLENR,131},
+  {413*OVERSAMPLENR,125},
+  {454*OVERSAMPLENR,119},
+  {496*OVERSAMPLENR,113},
+  {537*OVERSAMPLENR,108},
+  {578*OVERSAMPLENR,102},
+  {619*OVERSAMPLENR,97},
+  {658*OVERSAMPLENR,92},
+  {695*OVERSAMPLENR,87},
+  {735*OVERSAMPLENR,81},
+  {773*OVERSAMPLENR,75},
+  {808*OVERSAMPLENR,70},
+  {844*OVERSAMPLENR,64},
+  {868*OVERSAMPLENR,59},
+  {892*OVERSAMPLENR,54},
+  {914*OVERSAMPLENR,49},
+  {935*OVERSAMPLENR,42},
+  {951*OVERSAMPLENR,38},
+  {967*OVERSAMPLENR,32},
+  {975*OVERSAMPLENR,28},
+  {1000*OVERSAMPLENR,20},
+  {1010*OVERSAMPLENR,10},
+  {1024*OVERSAMPLENR,-273} // for safety
+};
+#endif
+
 // Pt1000 and Pt100 handling
 //
 // Rt=R0*(1+a*T+b*T*T) [for T>0]