more tweaks

MarlinFirmware · Jun 10, 2021 · 399b2f1 · 399b2f1
1 parent 86e8f96
commit 399b2f1
Show file tree

Hide file tree

Showing 52 changed files with 81 additions and 75 deletions.
diff --git a/Marlin/src/HAL/LPC1768/tft/xpt2046.h b/Marlin/src/HAL/LPC1768/tft/xpt2046.h
@@ -54,7 +54,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 

diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -56,7 +56,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 

diff --git a/Marlin/src/HAL/STM32F1/tft/xpt2046.h b/Marlin/src/HAL/STM32F1/tft/xpt2046.h
@@ -54,7 +54,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -512,7 +512,14 @@
  * Temp Sensor defines
  */
 
-#define ANY_TEMP_SENSOR_IS(n) (TEMP_SENSOR_0 == (n) || TEMP_SENSOR_1 == (n) || TEMP_SENSOR_2 == (n) || TEMP_SENSOR_3 == (n) || TEMP_SENSOR_4 == (n) || TEMP_SENSOR_5 == (n) || TEMP_SENSOR_6 == (n) || TEMP_SENSOR_7 == (n) || TEMP_SENSOR_BED == (n) || TEMP_SENSOR_PROBE == (n) || TEMP_SENSOR_CHAMBER == (n) || TEMP_SENSOR_COOLER == (n) || TEMP_SENSOR_REDUNDANT == (n))
+#define ANY_TEMP_SENSOR_IS(n) ( \
+     n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
+  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
+  || n == TEMP_SENSOR_BED \
+  || n == TEMP_SENSOR_PROBE \
+  || n == TEMP_SENSOR_CHAMBER \
+  || n == TEMP_SENSOR_COOLER \
+  || n == TEMP_SENSOR_REDUNDANT )
 #if ANY_TEMP_SENSOR_IS(1000)
   #define HAS_USER_THERMISTORS 1
 #endif
@@ -522,79 +529,79 @@
 #if TEMP_SENSOR_REDUNDANT && !PIN_EXISTS(TEMP_REDUNDANT)
   #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
     #if !PIN_EXISTS(TEMP_COOLER)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be COOLER: requires TEMP_COOLER_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
     #if !PIN_EXISTS(TEMP_PROBE)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be PROBE: requires TEMP_PROBE_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
     #if !PIN_EXISTS(TEMP_CHAMBER)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be CHAMBER: requires TEMP_CHAMBER_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
     #if !PIN_EXISTS(TEMP_BED)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be BED: requires TEMP_BED_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
     #if !PIN_EXISTS(TEMP_0)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 0: requires TEMP_0_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_0_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
     #if !PIN_EXISTS(TEMP_1)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 1: requires TEMP_1_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_1_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
     #if !PIN_EXISTS(TEMP_2)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 2: requires TEMP_2_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_2_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
     #if !PIN_EXISTS(TEMP_3)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 3: requires TEMP_3_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_3_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
     #if !PIN_EXISTS(TEMP_4)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 4: requires TEMP_4_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_4_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
     #if !PIN_EXISTS(TEMP_5)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 5: requires TEMP_5_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_5_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
     #if !PIN_EXISTS(TEMP_6)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 6: requires TEMP_6_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_6_PIN
     #endif
   #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
     #if !PIN_EXISTS(TEMP_7)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE cannot be 7: requires TEMP_7_PIN."
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
     #else
       #define TEMP_REDUNDANT_PIN TEMP_7_PIN
     #endif
   #endif
 
-  #if !defined(TEMP_SENSOR_REDUNDANT_MAX_DIFF)
+  #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
     #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
   #endif
 #endif

diff --git a/Marlin/src/module/thermistor/thermistor_1.h b/Marlin/src/module/thermistor/thermistor_1.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_1[] PROGMEM = {
+constexpr temp_entry_t temptable_1[] PROGMEM = {
   { OV(  23), 300 },
   { OV(  25), 295 },
   { OV(  27), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_10.h b/Marlin/src/module/thermistor/thermistor_10.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, RS thermistor 198-961
-const temp_entry_t temptable_10[] PROGMEM = {
+constexpr temp_entry_t temptable_10[] PROGMEM = {
   { OV(   1), 929 },
   { OV(  36), 299 },
   { OV(  71), 246 },

diff --git a/Marlin/src/module/thermistor/thermistor_1010.h b/Marlin/src/module/thermistor/thermistor_1010.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_1010 1
 
 // Pt1000 with 1k0 pullup
-const temp_entry_t temptable_1010[] PROGMEM = {
+constexpr temp_entry_t temptable_1010[] PROGMEM = {
   PtLine(  0, 1000, 1000),
   PtLine( 25, 1000, 1000),
   PtLine( 50, 1000, 1000),

diff --git a/Marlin/src/module/thermistor/thermistor_1047.h b/Marlin/src/module/thermistor/thermistor_1047.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_1047 1
 
 // Pt1000 with 4k7 pullup
-const temp_entry_t temptable_1047[] PROGMEM = {
+constexpr temp_entry_t temptable_1047[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 1000, 4700),
   PtLine( 50, 1000, 4700),

diff --git a/Marlin/src/module/thermistor/thermistor_11.h b/Marlin/src/module/thermistor/thermistor_11.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, QU-BD silicone bed QWG-104F-3950 thermistor
-const temp_entry_t temptable_11[] PROGMEM = {
+constexpr temp_entry_t temptable_11[] PROGMEM = {
   { OV(   1), 938 },
   { OV(  31), 314 },
   { OV(  41), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_110.h b/Marlin/src/module/thermistor/thermistor_110.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_110 1
 
 // Pt100 with 1k0 pullup
-const temp_entry_t temptable_110[] PROGMEM = {
+constexpr temp_entry_t temptable_110[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 100, 1000),
   PtLine( 50, 100, 1000),

diff --git a/Marlin/src/module/thermistor/thermistor_12.h b/Marlin/src/module/thermistor/thermistor_12.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4700 K, 4.7 kOhm pull-up, (personal calibration for Makibox hot bed)
-const temp_entry_t temptable_12[] PROGMEM = {
+constexpr temp_entry_t temptable_12[] PROGMEM = {
   { OV(  35), 180 }, // top rating 180C
   { OV( 211), 140 },
   { OV( 233), 135 },

diff --git a/Marlin/src/module/thermistor/thermistor_13.h b/Marlin/src/module/thermistor/thermistor_13.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, Hisens thermistor
-const temp_entry_t temptable_13[] PROGMEM = {
+constexpr temp_entry_t temptable_13[] PROGMEM = {
   { OV( 20.04), 300 },
   { OV( 23.19), 290 },
   { OV( 26.71), 280 },

diff --git a/Marlin/src/module/thermistor/thermistor_147.h b/Marlin/src/module/thermistor/thermistor_147.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_147 1
 
 // Pt100 with 4k7 pullup
-const temp_entry_t temptable_147[] PROGMEM = {
+constexpr temp_entry_t temptable_147[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 100, 4700),
   PtLine( 50, 100, 4700),

diff --git a/Marlin/src/module/thermistor/thermistor_15.h b/Marlin/src/module/thermistor/thermistor_15.h
@@ -22,7 +22,7 @@
 #pragma once
 
  // 100k bed thermistor in JGAurora A5. Calibrated by Sam Pinches 21st Jan 2018 using cheap k-type thermocouple inserted into heater block, using TM-902C meter.
-const temp_entry_t temptable_15[] PROGMEM = {
+constexpr temp_entry_t temptable_15[] PROGMEM = {
   { OV(  31), 275 },
   { OV(  33), 270 },
   { OV(  35), 260 },

diff --git a/Marlin/src/module/thermistor/thermistor_17.h b/Marlin/src/module/thermistor/thermistor_17.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // Dagoma NTC 100k white thermistor
-const temp_entry_t temptable_17[] PROGMEM = {
+constexpr temp_entry_t temptable_17[] PROGMEM = {
   { OV(  16),  309 },
   { OV(  18),  307 },
   { OV(  20),  300 },

diff --git a/Marlin/src/module/thermistor/thermistor_18.h b/Marlin/src/module/thermistor/thermistor_18.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 - version (measured/tested/approved)
-const temp_entry_t temptable_18[] PROGMEM = {
+constexpr temp_entry_t temptable_18[] PROGMEM = {
   { OV(   1), 713 },
   { OV(  17), 284 },
   { OV(  20), 275 },

diff --git a/Marlin/src/module/thermistor/thermistor_2.h b/Marlin/src/module/thermistor/thermistor_2.h
@@ -26,7 +26,7 @@
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 //
-const temp_entry_t temptable_2[] PROGMEM = {
+constexpr temp_entry_t temptable_2[] PROGMEM = {
   { OV(   1), 848 },
   { OV(  30), 300 }, // top rating 300C
   { OV(  34), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_20.h b/Marlin/src/module/thermistor/thermistor_20.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_20 1
 
 // Pt100 with INA826 amp on Ultimaker v2.0 electronics
-const temp_entry_t temptable_20[] PROGMEM = {
+constexpr temp_entry_t temptable_20[] PROGMEM = {
   { OV(  0),    0 },
   { OV(227),    1 },
   { OV(236),   10 },

diff --git a/Marlin/src/module/thermistor/thermistor_201.h b/Marlin/src/module/thermistor/thermistor_201.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_201 1
 
 // Pt100 with LMV324 amp on Overlord v1.1 electronics
-const temp_entry_t temptable_201[] PROGMEM = {
+constexpr temp_entry_t temptable_201[] PROGMEM = {
   { OV(   0),   0 },
   { OV(   8),   1 },
   { OV(  23),   6 },

diff --git a/Marlin/src/module/thermistor/thermistor_202.h b/Marlin/src/module/thermistor/thermistor_202.h
@@ -3,7 +3,7 @@
 // Temptable sent from dealer technologyoutlet.co.uk
 //
 
-const temp_entry_t temptable_202[] PROGMEM = {
+constexpr temp_entry_t temptable_202[] PROGMEM = {
   { OV(   1), 864 },
   { OV(  35), 300 },
   { OV(  38), 295 },

diff --git a/Marlin/src/module/thermistor/thermistor_21.h b/Marlin/src/module/thermistor/thermistor_21.h
@@ -28,7 +28,7 @@
 
 // Pt100 with INA826 amplifier board with 5v supply based on Thermistor 20, with 3v3 ADC reference on the mainboard.
 // If the ADC reference and INA826 board supply voltage are identical, Thermistor 20 instead.
-const temp_entry_t temptable_21[] PROGMEM = {
+constexpr temp_entry_t temptable_21[] PROGMEM = {
   { OV(  0),    0 },
   { OV(227),    1 },
   { OV(236),   10 },

diff --git a/Marlin/src/module/thermistor/thermistor_22.h b/Marlin/src/module/thermistor/thermistor_22.h
@@ -21,7 +21,7 @@
  */
 
 // 100k hotend thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
-const temp_entry_t temptable_22[] PROGMEM = {
+constexpr temp_entry_t temptable_22[] PROGMEM = {
   { OV(   1), 352 },
   { OV(   6), 341 },
   { OV(  11), 330 },

diff --git a/Marlin/src/module/thermistor/thermistor_23.h b/Marlin/src/module/thermistor/thermistor_23.h
@@ -21,7 +21,7 @@
  */
 
 // 100k hotbed thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
-const temp_entry_t temptable_23[] PROGMEM = {
+constexpr temp_entry_t temptable_23[] PROGMEM = {
   { OV(   1), 938 },
   { OV(  11), 423 },
   { OV(  21), 351 },

diff --git a/Marlin/src/module/thermistor/thermistor_3.h b/Marlin/src/module/thermistor/thermistor_3.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4120 K, 4.7 kOhm pull-up, mendel-parts
-const temp_entry_t temptable_3[] PROGMEM = {
+constexpr temp_entry_t temptable_3[] PROGMEM = {
   { OV(   1), 864 },
   { OV(  21), 300 },
   { OV(  25), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_30.h b/Marlin/src/module/thermistor/thermistor_30.h
@@ -28,7 +28,7 @@
 // B Value Tolerance         + / - 1%
 // Kis3d Silicone Heater 24V 200W/300W with 6mm Precision cast plate (EN AW 5083)
 // Temperature setting time 10 min to determine the 12Bit ADC value on the surface. (le3tspeak)
-const temp_entry_t temptable_30[] PROGMEM = {
+constexpr temp_entry_t temptable_30[] PROGMEM = {
   { OV(   1), 938 },
   { OV( 298), 125 }, // 1193 - 125°
   { OV( 321), 121 }, // 1285 - 121°

diff --git a/Marlin/src/module/thermistor/thermistor_331.h b/Marlin/src/module/thermistor/thermistor_331.h
@@ -24,7 +24,7 @@
 #define OVM(V) OV((V)*(0.327/0.5))
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_331[] PROGMEM = {
+constexpr temp_entry_t temptable_331[] PROGMEM = {
   { OVM(  23), 300 },
   { OVM(  25), 295 },
   { OVM(  27), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_332.h b/Marlin/src/module/thermistor/thermistor_332.h
@@ -24,7 +24,7 @@
 #define OVM(V) OV((V)*(0.327/0.327))
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_332[] PROGMEM = {
+constexpr temp_entry_t temptable_332[] PROGMEM = {
   { OVM( 268), 150 },
   { OVM( 293), 145 },
   { OVM( 320), 141 },

diff --git a/Marlin/src/module/thermistor/thermistor_4.h b/Marlin/src/module/thermistor/thermistor_4.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 10 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, Generic 10k thermistor
-const temp_entry_t temptable_4[] PROGMEM = {
+constexpr temp_entry_t temptable_4[] PROGMEM = {
   { OV(   1), 430 },
   { OV(  54), 137 },
   { OV( 107), 107 },

diff --git a/Marlin/src/module/thermistor/thermistor_5.h b/Marlin/src/module/thermistor/thermistor_5.h
@@ -26,7 +26,7 @@
 // ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan)
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
-const temp_entry_t temptable_5[] PROGMEM = {
+constexpr temp_entry_t temptable_5[] PROGMEM = {
   { OV(   1), 713 },
   { OV(  17), 300 }, // top rating 300C
   { OV(  20), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_501.h b/Marlin/src/module/thermistor/thermistor_501.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // 100k Zonestar thermistor. Adjusted By Hally
-const temp_entry_t temptable_501[] PROGMEM = {
+constexpr temp_entry_t temptable_501[] PROGMEM = {
    { OV(   1), 713 },
    { OV(  14), 300 }, // Top rating 300C
    { OV(  16), 290 },

diff --git a/Marlin/src/module/thermistor/thermistor_502.h b/Marlin/src/module/thermistor/thermistor_502.h
@@ -23,7 +23,7 @@
 
 // Unknown thermistor for the Zonestar P802M hot bed. Adjusted By Nerseth
 // These were the shipped settings from Zonestar in original firmware: P802M_8_Repetier_V1.6_Zonestar.zip
-const temp_entry_t temptable_502[] PROGMEM = {
+constexpr temp_entry_t temptable_502[] PROGMEM = {
    { OV(  56.0 / 4), 300 },
    { OV( 187.0 / 4), 250 },
    { OV( 615.0 / 4), 190 },

diff --git a/Marlin/src/module/thermistor/thermistor_503.h b/Marlin/src/module/thermistor/thermistor_503.h
@@ -23,7 +23,7 @@
 
 // Zonestar (Z8XM2) Heated Bed thermistor. Added By AvanOsch
 // These are taken from the Zonestar settings in original Repetier firmware: Z8XM2_ZRIB_LCD12864_V51.zip
-const temp_entry_t temptable_503[] PROGMEM = {
+constexpr temp_entry_t temptable_503[] PROGMEM = {
    { OV(  12), 300 },
    { OV(  27), 270 },
    { OV(  47), 250 },

diff --git a/Marlin/src/module/thermistor/thermistor_51.h b/Marlin/src/module/thermistor/thermistor_51.h
@@ -26,7 +26,7 @@
 // Verified by linagee.
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 // Advantage: Twice the resolution and better linearity from 150C to 200C
-const temp_entry_t temptable_51[] PROGMEM = {
+constexpr temp_entry_t temptable_51[] PROGMEM = {
   { OV(   1), 350 },
   { OV( 190), 250 }, // top rating 250C
   { OV( 203), 245 },