Skip to content

Commit 244c257

Browse files
thinkyheadthinkyhead
committed
🚸 Thermistor updates
1 parent 20ee8dd commit 244c257

File tree

4 files changed

+269
-142
lines changed

4 files changed

+269
-142
lines changed

‎Marlin/Configuration.h

Lines changed: 79 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -443,78 +443,70 @@
443443
// @section temperature
444444

445445
/**
446-
* --NORMAL IS 4.7kΩ PULLUP!-- 1kΩ pullup can be used on hotend sensor, using correct resistor and table
446+
* Temperature Sensors:
447447
*
448-
* Temperature sensors available:
449-
*
450-
* SPI RTD/Thermocouple Boards - IMPORTANT: Read the NOTE below!
451-
* -------
452-
* -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-1)
453-
* NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
454-
* -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1)
455-
* -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-1)
456-
*
457-
* NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
458-
* Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
459-
* Software SPI will be used on those ports instead. You can force Hardware SPI on the default bus in the
460-
* Configuration_adv.h file. At this time, separate Hardware SPI buses for sensors are not supported.
461-
*
462-
* Analog Themocouple Boards
463-
* -------
464-
* -4 : AD8495 with Thermocouple
465-
* -1 : AD595 with Thermocouple
448+
* NORMAL IS 4.7kΩ PULLUP! Hotend sensors can use 1kΩ pullup with correct resistor and table.
466449
*
450+
* ================================================================
467451
* Analog Thermistors - 4.7kΩ pullup - Normal
468-
* -------
469-
* 1 : 100kΩ EPCOS - Best choice for EPCOS thermistors
470-
* 331 : 100kΩ Same as #1, but 3.3V scaled for MEGA
471-
* 332 : 100kΩ Same as #1, but 3.3V scaled for DUE
472-
* 2 : 200kΩ ATC Semitec 204GT-2
473-
* 202 : 200kΩ Copymaster 3D
474-
* 3 : ???Ω Mendel-parts thermistor
475-
* 4 : 10kΩ Generic Thermistor !! DO NOT use for a hotend - it gives bad resolution at high temp. !!
476-
* 5 : 100kΩ ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
477-
* 501 : 100kΩ Zonestar - Tronxy X3A
478-
* 502 : 100kΩ Zonestar - used by hot bed in Zonestar Průša P802M
479-
* 503 : 100kΩ Zonestar (Z8XM2) Heated Bed thermistor
480-
* 504 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-B3950) Hotend Thermistor
481-
* 505 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-3950) Bed Thermistor
482-
* 512 : 100kΩ RPW-Ultra hotend
483-
* 6 : 100kΩ EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
484-
* 7 : 100kΩ Honeywell 135-104LAG-J01
485-
* 71 : 100kΩ Honeywell 135-104LAF-J01
486-
* 8 : 100kΩ Vishay 0603 SMD NTCS0603E3104FXT
487-
* 9 : 100kΩ GE Sensing AL03006-58.2K-97-G1
488-
* 10 : 100kΩ RS PRO 198-961
489-
* 11 : 100kΩ Keenovo AC silicone mats, most Wanhao i3 machines - beta 3950, 1%
490-
* 12 : 100kΩ Vishay 0603 SMD NTCS0603E3104FXT (#8) - calibrated for Makibox hot bed
491-
* 13 : 100kΩ Hisens up to 300°C - for "Simple ONE" & "All In ONE" hotend - beta 3950, 1%
492-
* 15 : 100kΩ Calibrated for JGAurora A5 hotend
493-
* 18 : 200kΩ ATC Semitec 204GT-2 Dagoma.Fr - MKS_Base_DKU001327
494-
* 22 : 100kΩ GTM32 Pro vB - hotend - 4.7kΩ pullup to 3.3V and 220Ω to analog input
495-
* 23 : 100kΩ GTM32 Pro vB - bed - 4.7kΩ pullup to 3.3v and 220Ω to analog input
496-
* 30 : 100kΩ Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K - beta 3950
497-
* 60 : 100kΩ Maker's Tool Works Kapton Bed Thermistor - beta 3950
498-
* 61 : 100kΩ Formbot/Vivedino 350°C Thermistor - beta 3950
499-
* 66 : 4.7MΩ Dyze Design / Trianglelab T-D500 500°C High Temperature Thermistor
500-
* 67 : 500kΩ SliceEngineering 450°C Thermistor
501-
* 68 : PT100 amplifier board from Dyze Design
502-
* 70 : 100kΩ bq Hephestos 2
503-
* 75 : 100kΩ Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
504-
* 2000 : 100kΩ Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
505-
*
506-
* Analog Thermistors - 1kΩ pullup - Atypical, and requires changing out the 4.7kΩ pullup for 1kΩ.
507-
* ------- (but gives greater accuracy and more stable PID)
508-
* 51 : 100kΩ EPCOS (1kΩ pullup)
509-
* 52 : 200kΩ ATC Semitec 204GT-2 (1kΩ pullup)
510-
* 55 : 100kΩ ATC Semitec 104GT-2 - Used in ParCan & J-Head (1kΩ pullup)
511-
*
452+
* ================================================================
453+
* 1 : 100kΩ EPCOS - Best choice for EPCOS thermistors
454+
* 331 : 100kΩ Same as #1, but 3.3V scaled for MEGA
455+
* 332 : 100kΩ Same as #1, but 3.3V scaled for DUE
456+
* 2 : 200kΩ ATC Semitec 204GT-2
457+
* 202 : 200kΩ Copymaster 3D
458+
* 3 : ???Ω Mendel-parts thermistor
459+
* 4 : 10kΩ Generic Thermistor !! DO NOT use for a hotend - it gives bad resolution at high temp. !!
460+
* 5 : 100kΩ ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
461+
* 501 : 100kΩ Zonestar - Tronxy X3A
462+
* 502 : 100kΩ Zonestar - used by hot bed in Zonestar Průša P802M
463+
* 503 : 100kΩ Zonestar (Z8XM2) Heated Bed thermistor
464+
* 504 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-B3950) Hotend Thermistor
465+
* 505 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-3950) Bed Thermistor
466+
* 512 : 100kΩ RPW-Ultra hotend
467+
* 6 : 100kΩ EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
468+
* 7 : 100kΩ Honeywell 135-104LAG-J01
469+
* 71 : 100kΩ Honeywell 135-104LAF-J01
470+
* 8 : 100kΩ Vishay 0603 SMD NTCS0603E3104FXT
471+
* 9 : 100kΩ GE Sensing AL03006-58.2K-97-G1
472+
* 10 : 100kΩ RS PRO 198-961
473+
* 11 : 100kΩ Keenovo AC silicone mats, most Wanhao i3 machines - beta 3950, 1%
474+
* 12 : 100kΩ Vishay 0603 SMD NTCS0603E3104FXT (#8) - calibrated for Makibox hot bed
475+
* 13 : 100kΩ Hisens up to 300°C - for "Simple ONE" & "All In ONE" hotend - beta 3950, 1%
476+
* 14 : 100kΩ (R25), 4092K (beta25), 4.7kΩ pull-up, bed thermistor as used in Ender-5 S1
477+
* 15 : 100kΩ Calibrated for JGAurora A5 hotend
478+
* 17 : 100kΩ Dagoma NTC white thermistor
479+
* 18 : 200kΩ ATC Semitec 204GT-2 Dagoma.Fr - MKS_Base_DKU001327
480+
* 22 : 100kΩ GTM32 Pro vB - hotend - 4.7kΩ pullup to 3.3V and 220Ω to analog input
481+
* 23 : 100kΩ GTM32 Pro vB - bed - 4.7kΩ pullup to 3.3v and 220Ω to analog input
482+
* 30 : 100kΩ Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K - beta 3950
483+
* 60 : 100kΩ Maker's Tool Works Kapton Bed Thermistor - beta 3950
484+
* 61 : 100kΩ Formbot/Vivedino 350°C Thermistor - beta 3950
485+
* 66 : 4.7MΩ Dyze Design / Trianglelab T-D500 500°C High Temperature Thermistor
486+
* 67 : 500kΩ SliceEngineering 450°C Thermistor
487+
* 68 : PT100 Smplifier board from Dyze Design
488+
* 70 : 100kΩ bq Hephestos 2
489+
* 75 : 100kΩ Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
490+
* 666 : 200kΩ Einstart S custom thermistor with 10k pullup.
491+
* 2000 : 100kΩ Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
492+
*
493+
* ================================================================
494+
* Analog Thermistors - 1kΩ pullup
495+
* Atypical, and requires changing out the 4.7kΩ pullup for 1kΩ.
496+
* (but gives greater accuracy and more stable PID)
497+
* ================================================================
498+
* 51 : 100kΩ EPCOS (1kΩ pullup)
499+
* 52 : 200kΩ ATC Semitec 204GT-2 (1kΩ pullup)
500+
* 55 : 100kΩ ATC Semitec 104GT-2 - Used in ParCan & J-Head (1kΩ pullup)
501+
*
502+
* ================================================================
512503
* Analog Thermistors - 10kΩ pullup - Atypical
513-
* -------
514-
* 99 : 100kΩ Found on some Wanhao i3 machines with a 10kΩ pull-up resistor
504+
* ================================================================
505+
* 99 : 100kΩ Found on some Wanhao i3 machines with a 10kΩ pull-up resistor
515506
*
507+
* ================================================================
516508
* Analog RTDs (Pt100/Pt1000)
517-
* -------
509+
* ================================================================
518510
* 110 : Pt100 with 1kΩ pullup (atypical)
519511
* 147 : Pt100 with 4.7kΩ pullup
520512
* 1010 : Pt1000 with 1kΩ pullup (atypical)
@@ -526,15 +518,34 @@
526518
* NOTE: ADC pins are not 5V tolerant. Not recommended because it's possible to damage the CPU by going over 500°C.
527519
* 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
528520
*
521+
* ================================================================
522+
* SPI RTD/Thermocouple Boards
523+
* ================================================================
524+
* -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-2 and bed)
525+
* NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
526+
* -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-2 and bed)
527+
* -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-2 and bed)
528+
*
529+
* NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
530+
* Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
531+
* Software SPI will be used on those ports instead. You can force Hardware SPI on the default bus in the
532+
* Configuration_adv.h file. At this time, separate Hardware SPI buses for sensors are not supported.
533+
*
534+
* ================================================================
535+
* Analog Thermocouple Boards
536+
* ================================================================
537+
* -4 : AD8495 with Thermocouple
538+
* -1 : AD595 with Thermocouple
539+
*
540+
* ================================================================
529541
* Custom/Dummy/Other Thermal Sensors
530-
* ------
542+
* ================================================================
531543
* 0 : not used
532544
* 1000 : Custom - Specify parameters in Configuration_adv.h
533545
*
534546
* !!! Use these for Testing or Development purposes. NEVER for production machine. !!!
535547
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
536548
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
537-
*
538549
*/
539550
#define TEMP_SENSOR_0 1
540551
#define TEMP_SENSOR_1 0

‎Marlin/src/module/thermistor/thermistor_1.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323

2424
// R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
2525
constexpr temp_entry_t temptable_1[] PROGMEM = {
26+
{ OV( 18), 320 },
27+
{ OV( 19), 315 },
28+
{ OV( 20), 310 },
29+
{ OV( 22), 305 },
2630
{ OV( 23), 300 },
2731
{ OV( 25), 295 },
2832
{ OV( 27), 290 },

‎Marlin/src/module/thermistor/thermistor_14.h

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2023 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 <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
#pragma once
23+
24+
// R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
25+
constexpr temp_entry_t temptable_14[] PROGMEM = {
26+
{ OV( 23), 275 },
27+
{ OV( 25), 270 },
28+
{ OV( 27), 265 },
29+
{ OV( 28), 260 },
30+
{ OV( 31), 255 },
31+
{ OV( 33), 250 },
32+
{ OV( 35), 245 },
33+
{ OV( 38), 240 },
34+
{ OV( 41), 235 },
35+
{ OV( 44), 230 },
36+
{ OV( 47), 225 },
37+
{ OV( 52), 220 },
38+
{ OV( 56), 215 },
39+
{ OV( 62), 210 },
40+
{ OV( 68), 205 },
41+
{ OV( 74), 200 },
42+
{ OV( 81), 195 },
43+
{ OV( 90), 190 },
44+
{ OV( 99), 185 },
45+
{ OV( 108), 180 },
46+
{ OV( 121), 175 },
47+
{ OV( 133), 170 },
48+
{ OV( 147), 165 },
49+
{ OV( 162), 160 },
50+
{ OV( 180), 155 },
51+
{ OV( 199), 150 },
52+
{ OV( 219), 145 },
53+
{ OV( 243), 140 },
54+
{ OV( 268), 135 },
55+
{ OV( 296), 130 },
56+
{ OV( 326), 125 },
57+
{ OV( 358), 120 },
58+
{ OV( 398), 115 },
59+
{ OV( 435), 110 },
60+
{ OV( 476), 105 },
61+
{ OV( 519), 100 },
62+
{ OV( 566), 95 },
63+
{ OV( 610), 90 },
64+
{ OV( 658), 85 },
65+
{ OV( 703), 80 },
66+
{ OV( 742), 75 },
67+
{ OV( 773), 70 },
68+
{ OV( 807), 65 },
69+
{ OV( 841), 60 },
70+
{ OV( 871), 55 },
71+
{ OV( 895), 50 },
72+
{ OV( 918), 45 },
73+
{ OV( 937), 40 },
74+
{ OV( 954), 35 },
75+
{ OV( 968), 30 },
76+
{ OV( 978), 25 },
77+
{ OV( 985), 20 },
78+
{ OV( 993), 15 },
79+
{ OV( 999), 10 },
80+
{ OV(1004), 5 },
81+
{ OV(1008), 0 },
82+
{ OV(1012), -5 },
83+
{ OV(1016), -10 },
84+
{ OV(1020), -15 }
85+
};

0 commit comments

Comments
 (0)