Procházet zdrojové kódy

Fix thermistors exist-for-reading tests (#18533)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp před 5 roky
rodič
revize
6df927d3b2
No account linked to committer's email address
1 změnil soubory, kde provedl 41 přidání a 62 odebrání
  1. 41
    62
      Marlin/src/module/temperature.cpp

+ 41
- 62
Marlin/src/module/temperature.cpp Zobrazit soubor

@@ -1804,76 +1804,55 @@ void Temperature::init() {
1804 1804
         temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
1805 1805
     }while(0)
1806 1806
 
1807
-    #if THERMISTOR_HEATER_0
1808
-      #ifdef HEATER_0_MINTEMP
1807
+    #define _MINMAX_TEST(N,M) (HOTENDS > N && THERMISTOR_HEATER_##N && THERMISTOR_HEATER_##N != 998 && THERMISTOR_HEATER_##N != 999 && defined(HEATER_##N##_##M##TEMP))
1808
+  
1809
+    #if _MINMAX_TEST(0, MIN)
1809 1810
       _TEMP_MIN_E(0);
1810
-      #endif
1811
-      #ifdef HEATER_0_MAXTEMP
1812
-        _TEMP_MAX_E(0);
1813
-      #endif
1814 1811
     #endif
1815
-
1816
-    #if HAS_MULTI_HOTEND && THERMISTOR_HEATER_1
1817
-      #ifdef HEATER_1_MINTEMP
1818
-        _TEMP_MIN_E(1);
1819
-      #endif
1820
-      #ifdef HEATER_1_MAXTEMP
1821
-        _TEMP_MAX_E(1);
1822
-      #endif
1812
+    #if _MINMAX_TEST(0, MAX)
1813
+      _TEMP_MAX_E(0); 
1823 1814
     #endif
1824
-
1825
-    #if HOTENDS > 2 && THERMISTOR_HEATER_2
1826
-      #ifdef HEATER_2_MINTEMP
1827
-        _TEMP_MIN_E(2);
1828
-      #endif
1829
-      #ifdef HEATER_2_MAXTEMP
1830
-        _TEMP_MAX_E(2);
1831
-      #endif
1815
+    #if _MINMAX_TEST(1, MIN)
1816
+      _TEMP_MIN_E(1);
1832 1817
     #endif
1833
-
1834
-    #if HOTENDS > 3 && THERMISTOR_HEATER_3
1835
-      #ifdef HEATER_3_MINTEMP
1836
-        _TEMP_MIN_E(3);
1837
-      #endif
1838
-      #ifdef HEATER_3_MAXTEMP
1839
-        _TEMP_MAX_E(3);
1840
-      #endif
1818
+    #if _MINMAX_TEST(1, MAX)
1819
+      _TEMP_MAX_E(1);
1841 1820
     #endif
1842
-
1843
-    #if HOTENDS > 4 && THERMISTOR_HEATER_4
1844
-      #ifdef HEATER_4_MINTEMP
1845
-        _TEMP_MIN_E(4);
1846
-      #endif
1847
-      #ifdef HEATER_4_MAXTEMP
1848
-        _TEMP_MAX_E(4);
1849
-      #endif
1821
+    #if _MINMAX_TEST(2, MIN)
1822
+      _TEMP_MIN_E(2);
1850 1823
     #endif
1851
-
1852
-    #if HOTENDS > 5 && THERMISTOR_HEATER_5
1853
-      #ifdef HEATER_5_MINTEMP
1854
-        _TEMP_MIN_E(5);
1855
-      #endif
1856
-      #ifdef HEATER_5_MAXTEMP
1857
-        _TEMP_MAX_E(5);
1858
-      #endif
1824
+    #if _MINMAX_TEST(2, MAX)
1825
+      _TEMP_MAX_E(2);
1859 1826
     #endif
1860
-
1861
-    #if HOTENDS > 6 && THERMISTOR_HEATER_6
1862
-      #ifdef HEATER_6_MINTEMP
1863
-        _TEMP_MIN_E(6);
1864
-      #endif
1865
-      #ifdef HEATER_6_MAXTEMP
1866
-        _TEMP_MAX_E(6);
1867
-      #endif
1827
+    #if _MINMAX_TEST(3, MIN)
1828
+      _TEMP_MIN_E(3);
1868 1829
     #endif
1869
-
1870
-    #if HOTENDS > 7 && THERMISTOR_HEATER_7
1871
-      #ifdef HEATER_7_MINTEMP
1872
-        _TEMP_MIN_E(7);
1873
-      #endif
1874
-      #ifdef HEATER_7_MAXTEMP
1875
-        _TEMP_MAX_E(7);
1876
-      #endif
1830
+    #if _MINMAX_TEST(3, MAX)
1831
+      _TEMP_MAX_E(3);
1832
+    #endif
1833
+    #if _MINMAX_TEST(4, MIN)
1834
+      _TEMP_MIN_E(4);
1835
+    #endif
1836
+    #if _MINMAX_TEST(4, MAX)
1837
+      _TEMP_MAX_E(4);
1838
+    #endif
1839
+    #if _MINMAX_TEST(5, MIN)
1840
+      _TEMP_MIN_E(5);
1841
+    #endif
1842
+    #if _MINMAX_TEST(5, MAX)
1843
+      _TEMP_MAX_E(5);
1844
+    #endif
1845
+    #if _MINMAX_TEST(6, MIN)
1846
+      _TEMP_MIN_E(6);
1847
+    #endif
1848
+    #if _MINMAX_TEST(6, MAX)
1849
+      _TEMP_MAX_E(6);
1850
+    #endif
1851
+    #if _MINMAX_TEST(7, MIN)
1852
+      _TEMP_MIN_E(7);
1853
+    #endif
1854
+    #if _MINMAX_TEST(7, MAX)
1855
+      _TEMP_MAX_E(7);
1877 1856
     #endif
1878 1857
 
1879 1858
   #endif // HAS_HOTEND

Loading…
Zrušit
Uložit