From c30272f528a10834db3a98ad2516c5638144be87 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Thu, 22 Sep 2022 20:43:27 +0200
Subject: [PATCH 1/5] Update thermistornames.h
---
Marlin/src/lcd/thermistornames.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 2571efe0759c..1b40a8c7d49a 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -124,6 +124,8 @@
#define THERMISTOR_NAME "ATC104GT-2 1K"
#elif THERMISTOR_ID == 1047
#define THERMISTOR_NAME "PT1000 4K7"
+#elif THERMISTOR_ID == 1022
+ #define THERMISTOR_NAME "PT1000 2K2"
#elif THERMISTOR_ID == 1010
#define THERMISTOR_NAME "PT1000 1K"
#elif THERMISTOR_ID == 147
From 44e3d13542042ba4c798b2ca8918ce2ce52274ee Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Thu, 22 Sep 2022 20:44:49 +0200
Subject: [PATCH 2/5] added thermistor_1022.h
---
.../src/module/thermistor/thermistor_1022.h | 45 +++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 Marlin/src/module/thermistor/thermistor_1022.h
diff --git a/Marlin/src/module/thermistor/thermistor_1022.h b/Marlin/src/module/thermistor/thermistor_1022.h
new file mode 100644
index 000000000000..a4393c052b9e
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_1022.h
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE_1022 1
+
+// Pt1000 with 1k0 pullup
+constexpr temp_entry_t temptable_1022[] PROGMEM = {
+ PtLine( 0, 1000, 2200),
+ PtLine( 25, 1000, 2200),
+ PtLine( 50, 1000, 2200),
+ PtLine( 75, 1000, 2200),
+ PtLine(100, 1000, 2200),
+ PtLine(125, 1000, 2200),
+ PtLine(150, 1000, 2200),
+ PtLine(175, 1000, 2200),
+ PtLine(200, 1000, 2200),
+ PtLine(225, 1000, 2200),
+ PtLine(250, 1000, 2200),
+ PtLine(275, 1000, 2200),
+ PtLine(300, 1000, 2200),
+ PtLine(350, 1000, 2200),
+ PtLine(400, 1000, 2200),
+ PtLine(450, 1000, 2200),
+ PtLine(500, 1000, 2200)
+};
\ No newline at end of file
From e3b80231844547f3c097961a06496b36c30bbcd9 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Thu, 22 Sep 2022 20:46:44 +0200
Subject: [PATCH 3/5] Update thermistors.h
---
Marlin/src/module/thermistor/thermistors.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index a38b7f381feb..5d89dd3aa901 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -193,6 +193,9 @@ typedef struct { raw_adc_t value; celsius_t celsius; } temp_entry_t;
#if ANY_THERMISTOR_IS(1010) // Pt1000 with 1k0 pullup
#include "thermistor_1010.h"
#endif
+#if ANY_THERMISTOR_IS(1022) // Pt1000 with 2k2 pullup
+ #include "thermistor_1022.h"
+#endif
#if ANY_THERMISTOR_IS(1047) // Pt1000 with 4k7 pullup
#include "thermistor_1047.h"
#endif
From 17e15f17d58042b04346f5ae7a5c64b718728edc Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Thu, 22 Sep 2022 20:54:25 +0200
Subject: [PATCH 4/5] Update Configuration.h
---
Marlin/Configuration.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a2370d99d083..1d2542e26628 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -518,6 +518,7 @@
* 110 : Pt100 with 1kΩ pullup (atypical)
* 147 : Pt100 with 4.7kΩ pullup
* 1010 : Pt1000 with 1kΩ pullup (atypical)
+ * 1022 : Pt1000 with 2.2kΩ pullup
* 1047 : Pt1000 with 4.7kΩ pullup (E3D)
* 20 : Pt100 with circuit in the Ultimainboard V2.x with mainboard ADC reference voltage = INA826 amplifier-board supply voltage.
* NOTE: (1) Must use an ADC input with no pullup. (2) Some INA826 amplifiers are unreliable at 3.3V so consider using sensor 147, 110, or 21.
From f9e6e562e0b58d92ee8ba39131034bbb384834c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Mon, 26 Sep 2022 16:34:51 -0500
Subject: [PATCH 5/5] =?UTF-8?q?fix=20CRLF,=20=C2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/module/thermistor/thermistor_1022.h | 90 +++++++++----------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/Marlin/src/module/thermistor/thermistor_1022.h b/Marlin/src/module/thermistor/thermistor_1022.h
index a4393c052b9e..1db928fbb86b 100644
--- a/Marlin/src/module/thermistor/thermistor_1022.h
+++ b/Marlin/src/module/thermistor/thermistor_1022.h
@@ -1,45 +1,45 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-#define REVERSE_TEMP_SENSOR_RANGE_1022 1
-
-// Pt1000 with 1k0 pullup
-constexpr temp_entry_t temptable_1022[] PROGMEM = {
- PtLine( 0, 1000, 2200),
- PtLine( 25, 1000, 2200),
- PtLine( 50, 1000, 2200),
- PtLine( 75, 1000, 2200),
- PtLine(100, 1000, 2200),
- PtLine(125, 1000, 2200),
- PtLine(150, 1000, 2200),
- PtLine(175, 1000, 2200),
- PtLine(200, 1000, 2200),
- PtLine(225, 1000, 2200),
- PtLine(250, 1000, 2200),
- PtLine(275, 1000, 2200),
- PtLine(300, 1000, 2200),
- PtLine(350, 1000, 2200),
- PtLine(400, 1000, 2200),
- PtLine(450, 1000, 2200),
- PtLine(500, 1000, 2200)
-};
\ No newline at end of file
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE_1022 1
+
+// Pt1000 with 1k0 pullup
+constexpr temp_entry_t temptable_1022[] PROGMEM = {
+ PtLine( 0, 1000, 2200),
+ PtLine( 25, 1000, 2200),
+ PtLine( 50, 1000, 2200),
+ PtLine( 75, 1000, 2200),
+ PtLine(100, 1000, 2200),
+ PtLine(125, 1000, 2200),
+ PtLine(150, 1000, 2200),
+ PtLine(175, 1000, 2200),
+ PtLine(200, 1000, 2200),
+ PtLine(225, 1000, 2200),
+ PtLine(250, 1000, 2200),
+ PtLine(275, 1000, 2200),
+ PtLine(300, 1000, 2200),
+ PtLine(350, 1000, 2200),
+ PtLine(400, 1000, 2200),
+ PtLine(450, 1000, 2200),
+ PtLine(500, 1000, 2200)
+};