Przeglądaj źródła

Add Rostock 301 thermistors (22, 23) (#17806)

Axel 4 lat temu
rodzic
commit
7613383e7b
No account linked to committer's email address

+ 2
- 0
Marlin/Configuration.h Wyświetl plik

@@ -387,6 +387,8 @@
387 387
  *    18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
388 388
  *    20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
389 389
  *    21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
390
+ *    22 : 100k (hotend) with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB)
391
+ *    23 : 100k (bed) with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB)
390 392
  *   201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
391 393
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
392 394
  *    61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup

+ 72
- 0
Marlin/src/module/thermistor/thermistor_22.h Wyświetl plik

@@ -0,0 +1,72 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+// 100k hotend thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
24
+const short temptable_22[][2] PROGMEM = {
25
+  { OV(   1), 352 },
26
+  { OV(   6), 341 },
27
+  { OV(  11), 330 },
28
+  { OV(  16), 319 },
29
+  { OV(  20), 307 },
30
+  { OV(  26), 296 },
31
+  { OV(  31), 285 },
32
+  { OV(  40), 274 },
33
+  { OV(  51), 263 },
34
+  { OV(  61), 251 },
35
+  { OV(  72), 245 },
36
+  { OV(  77), 240 },
37
+  { OV(  82), 237 },
38
+  { OV(  87), 232 },
39
+  { OV(  91), 229 },
40
+  { OV(  94), 227 },
41
+  { OV(  97), 225 },
42
+  { OV( 100), 223 },
43
+  { OV( 104), 221 },
44
+  { OV( 108), 219 },
45
+  { OV( 115), 214 },
46
+  { OV( 126), 209 },
47
+  { OV( 137), 204 },
48
+  { OV( 147), 200 },
49
+  { OV( 158), 193 },
50
+  { OV( 167), 192 },
51
+  { OV( 177), 189 },
52
+  { OV( 197), 163 },
53
+  { OV( 230), 174 },
54
+  { OV( 267), 165 },
55
+  { OV( 310), 158 },
56
+  { OV( 336), 151 },
57
+  { OV( 379), 143 },
58
+  { OV( 413), 138 },
59
+  { OV( 480), 127 },
60
+  { OV( 580), 110 },
61
+  { OV( 646), 100 },
62
+  { OV( 731),  88 },
63
+  { OV( 768),  84 },
64
+  { OV( 861),  69 },
65
+  { OV( 935),  50 },
66
+  { OV( 975),  38 },
67
+  { OV(1001),  27 },
68
+  { OV(1011),  22 },
69
+  { OV(1015),  13 },
70
+  { OV(1020),   6 },
71
+  { OV(1023),   0 }
72
+};

+ 128
- 0
Marlin/src/module/thermistor/thermistor_23.h Wyświetl plik

@@ -0,0 +1,128 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+// 100k hotbed thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
24
+const short temptable_23[][2] PROGMEM = {
25
+  { OV(   1), 938 },
26
+  { OV(  11), 423 },
27
+  { OV(  21), 351 },
28
+  { OV(  31), 314 },
29
+  { OV(  41), 290 },
30
+  { OV(  51), 272 },
31
+  { OV(  61), 258 },
32
+  { OV(  71), 247 },
33
+  { OV(  81), 237 },
34
+  { OV(  91), 229 },
35
+  { OV( 101), 221 },
36
+  { OV( 111), 215 },
37
+  { OV( 121), 209 },
38
+  { OV( 131), 204 },
39
+  { OV( 141), 199 },
40
+  { OV( 151), 195 },
41
+  { OV( 161), 190 },
42
+  { OV( 171), 187 },
43
+  { OV( 181), 183 },
44
+  { OV( 191), 179 },
45
+  { OV( 201), 176 },
46
+  { OV( 211), 173 },
47
+  { OV( 221), 170 },
48
+  { OV( 231), 167 },
49
+  { OV( 241), 165 },
50
+  { OV( 251), 162 },
51
+  { OV( 261), 160 },
52
+  { OV( 271), 157 },
53
+  { OV( 281), 155 },
54
+  { OV( 291), 153 },
55
+  { OV( 301), 150 },
56
+  { OV( 311), 148 },
57
+  { OV( 321), 146 },
58
+  { OV( 331), 144 },
59
+  { OV( 341), 142 },
60
+  { OV( 351), 140 },
61
+  { OV( 361), 139 },
62
+  { OV( 371), 137 },
63
+  { OV( 381), 135 },
64
+  { OV( 391), 133 },
65
+  { OV( 401), 131 },
66
+  { OV( 411), 130 },
67
+  { OV( 421), 128 },
68
+  { OV( 431), 126 },
69
+  { OV( 441), 125 },
70
+  { OV( 451), 123 },
71
+  { OV( 461), 122 },
72
+  { OV( 471), 120 },
73
+  { OV( 481), 119 },
74
+  { OV( 491), 117 },
75
+  { OV( 501), 116 },
76
+  { OV( 511), 114 },
77
+  { OV( 521), 113 },
78
+  { OV( 531), 111 },
79
+  { OV( 541), 110 },
80
+  { OV( 551), 108 },
81
+  { OV( 561), 107 },
82
+  { OV( 571), 105 },
83
+  { OV( 581), 104 },
84
+  { OV( 591), 102 },
85
+  { OV( 601), 101 },
86
+  { OV( 611), 100 },
87
+  { OV( 621),  98 },
88
+  { OV( 631),  97 },
89
+  { OV( 641),  95 },
90
+  { OV( 651),  94 },
91
+  { OV( 661),  92 },
92
+  { OV( 671),  91 },
93
+  { OV( 681),  90 },
94
+  { OV( 691),  88 },
95
+  { OV( 701),  87 },
96
+  { OV( 711),  85 },
97
+  { OV( 721),  84 },
98
+  { OV( 731),  82 },
99
+  { OV( 741),  81 },
100
+  { OV( 751),  79 },
101
+  { OV( 761),  77 },
102
+  { OV( 771),  76 },
103
+  { OV( 781),  74 },
104
+  { OV( 791),  72 },
105
+  { OV( 801),  71 },
106
+  { OV( 811),  69 },
107
+  { OV( 821),  67 },
108
+  { OV( 831),  65 },
109
+  { OV( 841),  63 },
110
+  { OV( 851),  62 },
111
+  { OV( 861),  60 },
112
+  { OV( 871),  57 },
113
+  { OV( 881),  55 },
114
+  { OV( 891),  53 },
115
+  { OV( 901),  51 },
116
+  { OV( 911),  48 },
117
+  { OV( 921),  45 },
118
+  { OV( 931),  42 },
119
+  { OV( 941),  39 },
120
+  { OV( 951),  36 },
121
+  { OV( 961),  32 },
122
+  { OV( 971),  28 },
123
+  { OV( 981),  25 },
124
+  { OV( 991),  23 },
125
+  { OV(1001),  21 },
126
+  { OV(1011),  19 },
127
+  { OV(1021),   5 }
128
+};

+ 6
- 0
Marlin/src/module/thermistor/thermistors.h Wyświetl plik

@@ -109,6 +109,12 @@
109 109
 #if ANY_THERMISTOR_IS(21) // Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics"
110 110
   #include "thermistor_21.h"
111 111
 #endif
112
+#if ANY_THERMISTOR_IS(22) // Thermistor in a Rostock 301 hot end, calibrated with a multimeter
113
+  #include "thermistor_22.h"  
114
+#endif
115
+#if ANY_THERMISTOR_IS(23) // By AluOne #12622. Formerly 22 above. May need calibration/checking.
116
+  #include "thermistor_23.h"
117
+#endif
112 118
 #if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS"
113 119
   #include "thermistor_51.h"
114 120
 #endif

Ładowanie…
Anuluj
Zapisz