Pārlūkot izejas kodu

Fix thermistor table

Scott Lahteine 6 gadus atpakaļ
vecāks
revīzija
858b2fa21a

+ 1
- 1
Marlin/src/lcd/thermistornames.h Parādīt failu

@@ -74,7 +74,7 @@
74 74
   #define THERMISTOR_NAME "E3104FXT (alt)"
75 75
 #elif THERMISTOR_ID == 13
76 76
   #define THERMISTOR_NAME "Hisens 3950"
77
-  #elif THERMISTOR_ID == 18
77
+#elif THERMISTOR_ID == 18
78 78
   #define THERMISTOR_NAME "ATC Semitec 204GT-2"
79 79
 #elif THERMISTOR_ID == 20
80 80
   #define THERMISTOR_NAME "PT100 UltiMB"

+ 36
- 36
Marlin/src/module/thermistor/thermistor_18.h Parādīt failu

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -19,40 +19,40 @@
19 19
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20 20
  *
21 21
  */
22
- 
23
-// 18 is ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 - version (measured/tested/approved)
22
+
23
+// ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 - version (measured/tested/approved)
24 24
 const short temptable_18[][2] PROGMEM = {
25
-  {1*OVERSAMPLENR,713},
26
-  {17*OVERSAMPLENR,284},
27
-  {20*OVERSAMPLENR,275},
28
-  {23*OVERSAMPLENR,267},
29
-  {27*OVERSAMPLENR,257},
30
-  {31*OVERSAMPLENR,250},
31
-  {37*OVERSAMPLENR,240},
32
-  {43*OVERSAMPLENR,232},
33
-  {51*OVERSAMPLENR,222},
34
-  {61*OVERSAMPLENR,213},
35
-  {73*OVERSAMPLENR,204},
36
-  {87*OVERSAMPLENR,195},
37
-  {106*OVERSAMPLENR,185},
38
-  {128*OVERSAMPLENR,175},
39
-  {155*OVERSAMPLENR,166},
40
-  {189*OVERSAMPLENR,156},
41
-  {230*OVERSAMPLENR,146},
42
-  {278*OVERSAMPLENR,137},
43
-  {336*OVERSAMPLENR,127},
44
-  {402*OVERSAMPLENR,117},
45
-  {476*OVERSAMPLENR,107},
46
-  {554*OVERSAMPLENR,97},
47
-  {635*OVERSAMPLENR,87},
48
-  {713*OVERSAMPLENR,78},
49
-  {784*OVERSAMPLENR,68},
50
-  {846*OVERSAMPLENR,58},
51
-  {897*OVERSAMPLENR,49},
52
-  {937*OVERSAMPLENR,39},
53
-  {966*OVERSAMPLENR,30},
54
-  {986*OVERSAMPLENR,20},
55
-  {1000*OVERSAMPLENR,10},
56
-  {1010*OVERSAMPLENR,0},
57
-  {1024*OVERSAMPLENR,-273} // for safety
25
+  { OV(   1), 713 },
26
+  { OV(  17), 284 },
27
+  { OV(  20), 275 },
28
+  { OV(  23), 267 },
29
+  { OV(  27), 257 },
30
+  { OV(  31), 250 },
31
+  { OV(  37), 240 },
32
+  { OV(  43), 232 },
33
+  { OV(  51), 222 },
34
+  { OV(  61), 213 },
35
+  { OV(  73), 204 },
36
+  { OV(  87), 195 },
37
+  { OV( 106), 185 },
38
+  { OV( 128), 175 },
39
+  { OV( 155), 166 },
40
+  { OV( 189), 156 },
41
+  { OV( 230), 146 },
42
+  { OV( 278), 137 },
43
+  { OV( 336), 127 },
44
+  { OV( 402), 117 },
45
+  { OV( 476), 107 },
46
+  { OV( 554),  97 },
47
+  { OV( 635),  87 },
48
+  { OV( 713),  78 },
49
+  { OV( 784),  68 },
50
+  { OV( 846),  58 },
51
+  { OV( 897),  49 },
52
+  { OV( 937),  39 },
53
+  { OV( 966),  30 },
54
+  { OV( 986),  20 },
55
+  { OV(1000),  10 },
56
+  { OV(1010),   0 },
57
+  { OV(1024),-273 } // for safety
58 58
 };

Notiek ielāde…
Atcelt
Saglabāt