From 4695a57eaf7f7aedb8f9acffbf1619d91a935e4a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 14 Jan 2020 21:25:18 -0600 Subject: [PATCH 01/12] Get test configs from GitHub --- buildroot/bin/restore_configs | 15 +++++++++++---- buildroot/bin/use_example_configs | 19 +++++++------------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs index a1ac70aa96a2..b79f9d341c81 100755 --- a/buildroot/bin/restore_configs +++ b/buildroot/bin/restore_configs @@ -1,11 +1,18 @@ #!/usr/bin/env bash -cp config/default/Configuration*.h Marlin +RESTORE="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/default" -PINS="Marlin/src/pins" +cd Marlin + +rm -f _Bootscreen.h +rm -f _Statusscreen.h + +PINS="src/pins" RAMPS="$PINS/ramps/pins_RAMPS.h" BKUP="$PINS/ramps/pins_RAMPS.backup.h" [ -f $BKUP ] && { cp "$BKUP" "$RAMPS" ; rm -f $BKUP ; } -rm -f Marlin/_Bootscreen.h -rm -f Marlin/_Statusscreen.h +curl -LJO "$RESTORE/Configuration.h" +curl -LJO "$RESTORE/Configuration_adv.h" + +cd - diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs index a0a0dcd3dd8a..2e88b38047f7 100755 --- a/buildroot/bin/use_example_configs +++ b/buildroot/bin/use_example_configs @@ -2,18 +2,13 @@ restore_configs -if [ -f "config/examples/$@/Configuration.h" ]; then - cp "config/examples/$@/Configuration.h" Marlin/ -fi +EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples" -if [ -f "config/examples/$@/Configuration_adv.h" ]; then - cp "config/examples/$@/Configuration_adv.h" Marlin/ -fi +cd Marlin -if [ -f "config/examples/$@/_Bootscreen.h" ]; then - cp "config/examples/$@/_Bootscreen.h" Marlin/ -fi +curl -LJO "$EXAMPLES/$@/Configuration.h" +curl -LJO "$EXAMPLES/$@/Configuration_adv.h" +curl -LJO "$EXAMPLES/$@/_Bootscreen.h" +curl -LJO "$EXAMPLES/$@/_Statusscreen.h" -if [ -f "config/examples/$@/_Statusscreen.h" ]; then - cp "config/examples/$@/_Statusscreen.h" Marlin/ -fi +cd - From 6a2dc5c1f77f0cc2a5172ebd2291c3941d3a4107 Mon Sep 17 00:00:00 2001 From: Axel Date: Sun, 12 Apr 2020 23:18:45 -0400 Subject: [PATCH 02/12] Update README.md --- config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/README.md b/config/README.md index be986b7058a6..be40ffb153e1 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # Where have all the configurations gone? -## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip +## https://github.com/MarlinFirmware/Configurations/releases From fc4c7912198baca20c33b6aec563aab06271625f Mon Sep 17 00:00:00 2001 From: Axel Date: Sun, 12 Apr 2020 23:21:56 -0400 Subject: [PATCH 03/12] spaces erases --- buildroot/bin/restore_configs | 1 - buildroot/bin/use_example_configs | 1 - 2 files changed, 2 deletions(-) diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs index 5a02003c0398..b2d0ea19ac8c 100644 --- a/buildroot/bin/restore_configs +++ b/buildroot/bin/restore_configs @@ -1,6 +1,5 @@ #!/usr/bin/env bash - git checkout Marlin/Configuration*.h 2>/dev/null git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs index 90be209df529..4510f689f2b0 100644 --- a/buildroot/bin/use_example_configs +++ b/buildroot/bin/use_example_configs @@ -2,7 +2,6 @@ restore_configs - EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.0.x/config/examples" cd Marlin From d996623d7717e38019b30ac2a950ab3ceae375c9 Mon Sep 17 00:00:00 2001 From: Axel Date: Mon, 13 Apr 2020 20:12:43 -0400 Subject: [PATCH 04/12] Unnecesary line Line is giving issues compiling for mightyboard --- Marlin/src/feature/digipot/digipot_mcp4018.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp index ebfbee794ab5..675b3e38f0e4 100644 --- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp +++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp @@ -25,7 +25,6 @@ #if BOTH(DIGIPOT_I2C, DIGIPOT_MCP4018) #include -#include #include //https://github.com/stawel/SlowSoftI2CMaster // Settings for the I2C based DIGIPOT (MCP4018) based on WT150 From 901d270d141310177087e2ef5157d366a39b7186 Mon Sep 17 00:00:00 2001 From: Axel Date: Mon, 13 Apr 2020 20:25:46 -0400 Subject: [PATCH 05/12] undo changes (keep bugfix upstream solution) --- config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/README.md b/config/README.md index be40ffb153e1..be986b7058a6 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # Where have all the configurations gone? -## https://github.com/MarlinFirmware/Configurations/releases +## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip From e34a9163a950b25277d043376a17139eed95e988 Mon Sep 17 00:00:00 2001 From: Axel Date: Sun, 12 Apr 2020 23:18:45 -0400 Subject: [PATCH 06/12] Fix Mightyboard build --- Marlin/src/feature/digipot/digipot_mcp4018.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp index ebfbee794ab5..675b3e38f0e4 100644 --- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp +++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp @@ -25,7 +25,6 @@ #if BOTH(DIGIPOT_I2C, DIGIPOT_MCP4018) #include -#include #include //https://github.com/stawel/SlowSoftI2CMaster // Settings for the I2C based DIGIPOT (MCP4018) based on WT150 From 80d9e9f88174e812d387913774224314f5e69ca4 Mon Sep 17 00:00:00 2001 From: Axel Date: Thu, 30 Apr 2020 03:04:50 -0400 Subject: [PATCH 07/12] Added Th Tables for a Rostock 22 for hot end, calibrated 23 for heated bed --- Marlin/src/module/thermistor/thermistor_22.h | 71 ++++++++++ Marlin/src/module/thermistor/thermistor_23.h | 129 +++++++++++++++++++ Marlin/src/module/thermistor/thermistors.h | 6 + 3 files changed, 206 insertions(+) create mode 100644 Marlin/src/module/thermistor/thermistor_22.h create mode 100644 Marlin/src/module/thermistor/thermistor_23.h diff --git a/Marlin/src/module/thermistor/thermistor_22.h b/Marlin/src/module/thermistor/thermistor_22.h new file mode 100644 index 000000000000..07c69eada685 --- /dev/null +++ b/Marlin/src/module/thermistor/thermistor_22.h @@ -0,0 +1,71 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 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 . + * + */ + +const short temptable_22[][2] PROGMEM = { + { OV(1), 352}, + { OV(6), 341}, + { OV(11), 330}, + { OV(16), 319}, + { OV(20), 307}, + { OV(26), 296}, + { OV(31), 285}, + { OV(40), 274}, + { OV(51), 263}, + { OV(61), 251}, + { OV(72), 245}, + { OV(77), 240}, + { OV(82), 237}, + { OV(87), 232}, + { OV(91), 229}, + { OV(94), 227}, + { OV(97), 225}, + { OV(100), 223}, + { OV(104), 221}, + { OV(108), 219}, + { OV(115), 214}, + { OV(126), 209}, + { OV(137), 204}, + { OV(147), 200}, + { OV(158), 193}, + { OV(167), 192}, + { OV(177), 189}, + { OV(197), 163}, + { OV(230), 174}, + { OV(267), 165}, + { OV(310), 158}, + { OV(336), 151}, + { OV(379), 143}, + { OV(413), 138}, + { OV(480), 127}, + { OV(580), 110}, + { OV(646), 100}, + { OV(731), 88}, + { OV(768), 84}, + { OV(861), 69}, + { OV(935), 50}, + { OV(975), 38}, + { OV(1001), 27}, + { OV(1011), 22}, + { OV(1015), 13}, + { OV(1020), 6}, + { OV(1023), 0} +}; diff --git a/Marlin/src/module/thermistor/thermistor_23.h b/Marlin/src/module/thermistor/thermistor_23.h new file mode 100644 index 000000000000..b4fbc3e73fda --- /dev/null +++ b/Marlin/src/module/thermistor/thermistor_23.h @@ -0,0 +1,129 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 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 . + * + */ + + +const short temptable_23[][2] PROGMEM = { + { OV(1), 938}, + { OV(11), 423}, + { OV(21), 351}, + { OV(31), 314}, + { OV(41), 290}, + { OV(51), 272}, + { OV(61), 258}, + { OV(71), 247}, + { OV(81), 237}, + { OV(91), 229}, + { OV(101), 221}, + { OV(111), 215}, + { OV(121), 209}, + { OV(131), 204}, + { OV(141), 199}, + { OV(151), 195}, + { OV(161), 190}, + { OV(171), 187}, + { OV(181), 183}, + { OV(191), 179}, + { OV(201), 176}, + { OV(211), 173}, + { OV(221), 170}, + { OV(231), 167}, + { OV(241), 165}, + { OV(251), 162}, + { OV(261), 160}, + { OV(271), 157}, + { OV(281), 155}, + { OV(291), 153}, + { OV(301), 150}, + { OV(311), 148}, + { OV(321), 146}, + { OV(331), 144}, + { OV(341), 142}, + { OV(351), 140}, + { OV(361), 139}, + { OV(371), 137}, + { OV(381), 135}, + { OV(391), 133}, + { OV(401), 131}, + { OV(411), 130}, + { OV(421), 128}, + { OV(431), 126}, + { OV(441), 125}, + { OV(451), 123}, + { OV(461), 122}, + { OV(471), 120}, + { OV(481), 119}, + { OV(491), 117}, + { OV(501), 116}, + { OV(511), 114}, + { OV(521), 113}, + { OV(531), 111}, + { OV(541), 110}, + { OV(551), 108}, + { OV(561), 107}, + { OV(571), 105}, + { OV(581), 104}, + { OV(591), 102}, + { OV(601), 101}, + { OV(611), 100}, + { OV(621), 98}, + { OV(631), 97}, + { OV(641), 95}, + { OV(651), 94}, + { OV(661), 92}, + { OV(671), 91}, + { OV(681), 90}, + { OV(691), 88}, + { OV(701), 87}, + { OV(711), 85}, + { OV(721), 84}, + { OV(731), 82}, + { OV(741), 81}, + { OV(751), 79}, + { OV(761), 77}, + { OV(771), 76}, + { OV(781), 74}, + { OV(791), 72}, + { OV(801), 71}, + { OV(811), 69}, + { OV(821), 67}, + { OV(831), 65}, + { OV(841), 63}, + { OV(851), 62}, + { OV(861), 60}, + { OV(871), 57}, + { OV(881), 55}, + { OV(891), 53}, + { OV(901), 51}, + { OV(911), 48}, + { OV(921), 45}, + { OV(931), 42}, + { OV(941), 39}, + { OV(951), 36}, + { OV(961), 32}, + { OV(971), 28}, + { OV(981), 25}, + { OV(991), 23}, + { OV(1001), 21}, + { OV(1011), 19}, + { OV(1021), 5} + }; + diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h index 032386c2bd23..cc06adc93961 100644 --- a/Marlin/src/module/thermistor/thermistors.h +++ b/Marlin/src/module/thermistor/thermistors.h @@ -109,6 +109,12 @@ #if ANY_THERMISTOR_IS(21) // Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics" #include "thermistor_21.h" #endif +#if ANY_THERMISTOR_IS(22) // Thermistor in a Rostock 301 hot end, calibrated with a multimeter + #include "thermistor_22.h" +#endif +#if ANY_THERMISTOR_IS(23) // By AluOne https://github.com/MarlinFirmware/Marlin/issues/12622 was 22 renumbered to 23, may need calibration/checking + #include "thermistor_23.h" +#endif #if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS" #include "thermistor_51.h" #endif From 2aa375055992a3953b8e7866a13e891785bcb887 Mon Sep 17 00:00:00 2001 From: Axel Date: Thu, 30 Apr 2020 11:56:52 -0400 Subject: [PATCH 08/12] Add description --- Marlin/src/module/thermistor/thermistor_22.h | 1 + Marlin/src/module/thermistor/thermistor_23.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/src/module/thermistor/thermistor_22.h b/Marlin/src/module/thermistor/thermistor_22.h index 07c69eada685..3f9c922db949 100644 --- a/Marlin/src/module/thermistor/thermistor_22.h +++ b/Marlin/src/module/thermistor/thermistor_22.h @@ -20,6 +20,7 @@ * */ +// 100k hotend thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB const short temptable_22[][2] PROGMEM = { { OV(1), 352}, { OV(6), 341}, diff --git a/Marlin/src/module/thermistor/thermistor_23.h b/Marlin/src/module/thermistor/thermistor_23.h index b4fbc3e73fda..11417df118f0 100644 --- a/Marlin/src/module/thermistor/thermistor_23.h +++ b/Marlin/src/module/thermistor/thermistor_23.h @@ -20,7 +20,7 @@ * */ - +// 100k hotbed thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB const short temptable_23[][2] PROGMEM = { { OV(1), 938}, { OV(11), 423}, From 293ce728e635dfd4bcc167fe469be0c4546412ae Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 2 May 2020 18:34:26 -0500 Subject: [PATCH 09/12] Update thermistors.h --- Marlin/src/module/thermistor/thermistors.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h index cc06adc93961..b66e30b5ccbd 100644 --- a/Marlin/src/module/thermistor/thermistors.h +++ b/Marlin/src/module/thermistor/thermistors.h @@ -109,10 +109,10 @@ #if ANY_THERMISTOR_IS(21) // Pt100 with INA826 amp with 3.3v excitation based on "Pt100 with INA826 amp on Ultimaker v2.0 electronics" #include "thermistor_21.h" #endif -#if ANY_THERMISTOR_IS(22) // Thermistor in a Rostock 301 hot end, calibrated with a multimeter +#if ANY_THERMISTOR_IS(22) // Thermistor in a Rostock 301 hot end, calibrated with a multimeter #include "thermistor_22.h" #endif -#if ANY_THERMISTOR_IS(23) // By AluOne https://github.com/MarlinFirmware/Marlin/issues/12622 was 22 renumbered to 23, may need calibration/checking +#if ANY_THERMISTOR_IS(23) // By AluOne #12622. Formerly 22 above. May need calibration/checking. #include "thermistor_23.h" #endif #if ANY_THERMISTOR_IS(51) // beta25 = 4092 K, R25 = 100 kOhm, Pull-up = 1 kOhm, "EPCOS" From fca4c3fa0605ea03a55a9d0078e8e56e61c65617 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 2 May 2020 18:41:42 -0500 Subject: [PATCH 10/12] Fix formatting, add descriptions --- Marlin/Configuration.h | 2 + Marlin/src/module/thermistor/thermistor_22.h | 94 ++++----- Marlin/src/module/thermistor/thermistor_23.h | 211 +++++++++---------- 3 files changed, 154 insertions(+), 153 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9564cad8a4f5..88ebc1018be5 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -387,6 +387,8 @@ * 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR) * 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....) + * 22 : Calibrated 100k with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB) + * 23 : Alternative 100k with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB) * 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup diff --git a/Marlin/src/module/thermistor/thermistor_22.h b/Marlin/src/module/thermistor/thermistor_22.h index 3f9c922db949..b3ef68a47e46 100644 --- a/Marlin/src/module/thermistor/thermistor_22.h +++ b/Marlin/src/module/thermistor/thermistor_22.h @@ -22,51 +22,51 @@ // 100k hotend thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB const short temptable_22[][2] PROGMEM = { - { OV(1), 352}, - { OV(6), 341}, - { OV(11), 330}, - { OV(16), 319}, - { OV(20), 307}, - { OV(26), 296}, - { OV(31), 285}, - { OV(40), 274}, - { OV(51), 263}, - { OV(61), 251}, - { OV(72), 245}, - { OV(77), 240}, - { OV(82), 237}, - { OV(87), 232}, - { OV(91), 229}, - { OV(94), 227}, - { OV(97), 225}, - { OV(100), 223}, - { OV(104), 221}, - { OV(108), 219}, - { OV(115), 214}, - { OV(126), 209}, - { OV(137), 204}, - { OV(147), 200}, - { OV(158), 193}, - { OV(167), 192}, - { OV(177), 189}, - { OV(197), 163}, - { OV(230), 174}, - { OV(267), 165}, - { OV(310), 158}, - { OV(336), 151}, - { OV(379), 143}, - { OV(413), 138}, - { OV(480), 127}, - { OV(580), 110}, - { OV(646), 100}, - { OV(731), 88}, - { OV(768), 84}, - { OV(861), 69}, - { OV(935), 50}, - { OV(975), 38}, - { OV(1001), 27}, - { OV(1011), 22}, - { OV(1015), 13}, - { OV(1020), 6}, - { OV(1023), 0} + { OV( 1), 352 }, + { OV( 6), 341 }, + { OV( 11), 330 }, + { OV( 16), 319 }, + { OV( 20), 307 }, + { OV( 26), 296 }, + { OV( 31), 285 }, + { OV( 40), 274 }, + { OV( 51), 263 }, + { OV( 61), 251 }, + { OV( 72), 245 }, + { OV( 77), 240 }, + { OV( 82), 237 }, + { OV( 87), 232 }, + { OV( 91), 229 }, + { OV( 94), 227 }, + { OV( 97), 225 }, + { OV( 100), 223 }, + { OV( 104), 221 }, + { OV( 108), 219 }, + { OV( 115), 214 }, + { OV( 126), 209 }, + { OV( 137), 204 }, + { OV( 147), 200 }, + { OV( 158), 193 }, + { OV( 167), 192 }, + { OV( 177), 189 }, + { OV( 197), 163 }, + { OV( 230), 174 }, + { OV( 267), 165 }, + { OV( 310), 158 }, + { OV( 336), 151 }, + { OV( 379), 143 }, + { OV( 413), 138 }, + { OV( 480), 127 }, + { OV( 580), 110 }, + { OV( 646), 100 }, + { OV( 731), 88 }, + { OV( 768), 84 }, + { OV( 861), 69 }, + { OV( 935), 50 }, + { OV( 975), 38 }, + { OV(1001), 27 }, + { OV(1011), 22 }, + { OV(1015), 13 }, + { OV(1020), 6 }, + { OV(1023), 0 } }; diff --git a/Marlin/src/module/thermistor/thermistor_23.h b/Marlin/src/module/thermistor/thermistor_23.h index 11417df118f0..46c025d21aaf 100644 --- a/Marlin/src/module/thermistor/thermistor_23.h +++ b/Marlin/src/module/thermistor/thermistor_23.h @@ -21,109 +21,108 @@ */ // 100k hotbed thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB -const short temptable_23[][2] PROGMEM = { - { OV(1), 938}, - { OV(11), 423}, - { OV(21), 351}, - { OV(31), 314}, - { OV(41), 290}, - { OV(51), 272}, - { OV(61), 258}, - { OV(71), 247}, - { OV(81), 237}, - { OV(91), 229}, - { OV(101), 221}, - { OV(111), 215}, - { OV(121), 209}, - { OV(131), 204}, - { OV(141), 199}, - { OV(151), 195}, - { OV(161), 190}, - { OV(171), 187}, - { OV(181), 183}, - { OV(191), 179}, - { OV(201), 176}, - { OV(211), 173}, - { OV(221), 170}, - { OV(231), 167}, - { OV(241), 165}, - { OV(251), 162}, - { OV(261), 160}, - { OV(271), 157}, - { OV(281), 155}, - { OV(291), 153}, - { OV(301), 150}, - { OV(311), 148}, - { OV(321), 146}, - { OV(331), 144}, - { OV(341), 142}, - { OV(351), 140}, - { OV(361), 139}, - { OV(371), 137}, - { OV(381), 135}, - { OV(391), 133}, - { OV(401), 131}, - { OV(411), 130}, - { OV(421), 128}, - { OV(431), 126}, - { OV(441), 125}, - { OV(451), 123}, - { OV(461), 122}, - { OV(471), 120}, - { OV(481), 119}, - { OV(491), 117}, - { OV(501), 116}, - { OV(511), 114}, - { OV(521), 113}, - { OV(531), 111}, - { OV(541), 110}, - { OV(551), 108}, - { OV(561), 107}, - { OV(571), 105}, - { OV(581), 104}, - { OV(591), 102}, - { OV(601), 101}, - { OV(611), 100}, - { OV(621), 98}, - { OV(631), 97}, - { OV(641), 95}, - { OV(651), 94}, - { OV(661), 92}, - { OV(671), 91}, - { OV(681), 90}, - { OV(691), 88}, - { OV(701), 87}, - { OV(711), 85}, - { OV(721), 84}, - { OV(731), 82}, - { OV(741), 81}, - { OV(751), 79}, - { OV(761), 77}, - { OV(771), 76}, - { OV(781), 74}, - { OV(791), 72}, - { OV(801), 71}, - { OV(811), 69}, - { OV(821), 67}, - { OV(831), 65}, - { OV(841), 63}, - { OV(851), 62}, - { OV(861), 60}, - { OV(871), 57}, - { OV(881), 55}, - { OV(891), 53}, - { OV(901), 51}, - { OV(911), 48}, - { OV(921), 45}, - { OV(931), 42}, - { OV(941), 39}, - { OV(951), 36}, - { OV(961), 32}, - { OV(971), 28}, - { OV(981), 25}, - { OV(991), 23}, - { OV(1001), 21}, - { OV(1011), 19}, - { OV(1021), 5} - }; - +const short temptable_23[][2] PROGMEM = { + { OV( 1), 938 }, + { OV( 11), 423 }, + { OV( 21), 351 }, + { OV( 31), 314 }, + { OV( 41), 290 }, + { OV( 51), 272 }, + { OV( 61), 258 }, + { OV( 71), 247 }, + { OV( 81), 237 }, + { OV( 91), 229 }, + { OV( 101), 221 }, + { OV( 111), 215 }, + { OV( 121), 209 }, + { OV( 131), 204 }, + { OV( 141), 199 }, + { OV( 151), 195 }, + { OV( 161), 190 }, + { OV( 171), 187 }, + { OV( 181), 183 }, + { OV( 191), 179 }, + { OV( 201), 176 }, + { OV( 211), 173 }, + { OV( 221), 170 }, + { OV( 231), 167 }, + { OV( 241), 165 }, + { OV( 251), 162 }, + { OV( 261), 160 }, + { OV( 271), 157 }, + { OV( 281), 155 }, + { OV( 291), 153 }, + { OV( 301), 150 }, + { OV( 311), 148 }, + { OV( 321), 146 }, + { OV( 331), 144 }, + { OV( 341), 142 }, + { OV( 351), 140 }, + { OV( 361), 139 }, + { OV( 371), 137 }, + { OV( 381), 135 }, + { OV( 391), 133 }, + { OV( 401), 131 }, + { OV( 411), 130 }, + { OV( 421), 128 }, + { OV( 431), 126 }, + { OV( 441), 125 }, + { OV( 451), 123 }, + { OV( 461), 122 }, + { OV( 471), 120 }, + { OV( 481), 119 }, + { OV( 491), 117 }, + { OV( 501), 116 }, + { OV( 511), 114 }, + { OV( 521), 113 }, + { OV( 531), 111 }, + { OV( 541), 110 }, + { OV( 551), 108 }, + { OV( 561), 107 }, + { OV( 571), 105 }, + { OV( 581), 104 }, + { OV( 591), 102 }, + { OV( 601), 101 }, + { OV( 611), 100 }, + { OV( 621), 98 }, + { OV( 631), 97 }, + { OV( 641), 95 }, + { OV( 651), 94 }, + { OV( 661), 92 }, + { OV( 671), 91 }, + { OV( 681), 90 }, + { OV( 691), 88 }, + { OV( 701), 87 }, + { OV( 711), 85 }, + { OV( 721), 84 }, + { OV( 731), 82 }, + { OV( 741), 81 }, + { OV( 751), 79 }, + { OV( 761), 77 }, + { OV( 771), 76 }, + { OV( 781), 74 }, + { OV( 791), 72 }, + { OV( 801), 71 }, + { OV( 811), 69 }, + { OV( 821), 67 }, + { OV( 831), 65 }, + { OV( 841), 63 }, + { OV( 851), 62 }, + { OV( 861), 60 }, + { OV( 871), 57 }, + { OV( 881), 55 }, + { OV( 891), 53 }, + { OV( 901), 51 }, + { OV( 911), 48 }, + { OV( 921), 45 }, + { OV( 931), 42 }, + { OV( 941), 39 }, + { OV( 951), 36 }, + { OV( 961), 32 }, + { OV( 971), 28 }, + { OV( 981), 25 }, + { OV( 991), 23 }, + { OV(1001), 21 }, + { OV(1011), 19 }, + { OV(1021), 5 } +}; From 435a13d4d19b08815afe246bb7036d044f55a59e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 2 May 2020 18:43:29 -0500 Subject: [PATCH 11/12] Fix description --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 88ebc1018be5..de61230a6f32 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -387,8 +387,8 @@ * 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR) * 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....) - * 22 : Calibrated 100k with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB) - * 23 : Alternative 100k with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB) + * 22 : 100k (hotend) with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB) + * 23 : 100k (bed) with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB) * 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup From 3bff4778c5338f19c8f7e733973da865735db194 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 2 May 2020 18:44:28 -0500 Subject: [PATCH 12/12] chmod ga+r --- buildroot/bin/restore_configs | 0 buildroot/bin/use_example_configs | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 buildroot/bin/restore_configs mode change 100644 => 100755 buildroot/bin/use_example_configs diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs old mode 100644 new mode 100755 diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs old mode 100644 new mode 100755