Browse Source

Fix dummy thermistors for Bed, Chamber, Probe (#20247)

Jason Smith 4 years ago
parent
commit
58eaad703a
No account linked to committer's email address

+ 11
- 4
Marlin/src/inc/Conditionals_post.h View File

1774
   #define HAS_TEMP_ADC_CHAMBER 1
1774
   #define HAS_TEMP_ADC_CHAMBER 1
1775
 #endif
1775
 #endif
1776
 
1776
 
1777
-#if HAS_HOTEND && ANY(HAS_TEMP_ADC_0, HEATER_0_USES_MAX6675, HEATER_0_DUMMY_THERMISTOR)
1777
+#define HAS_TEMP(N) ANY(HAS_TEMP_ADC_##N, HEATER_##N##_USES_MAX6675, HEATER_##N##_DUMMY_THERMISTOR)
1778
+#if HAS_HOTEND && HAS_TEMP(0)
1778
   #define HAS_TEMP_HOTEND 1
1779
   #define HAS_TEMP_HOTEND 1
1779
 #endif
1780
 #endif
1780
-#define HAS_TEMP_BED        HAS_TEMP_ADC_BED
1781
-#define HAS_TEMP_PROBE      HAS_TEMP_ADC_PROBE
1782
-#define HAS_TEMP_CHAMBER    HAS_TEMP_ADC_CHAMBER
1781
+#if HAS_TEMP(BED)
1782
+  #define HAS_TEMP_BED 1
1783
+#endif
1784
+#if HAS_TEMP(PROBE)
1785
+  #define HAS_TEMP_PROBE 1
1786
+#endif
1787
+#if HAS_TEMP(CHAMBER)
1788
+  #define HAS_TEMP_CHAMBER 1
1789
+#endif
1783
 
1790
 
1784
 #if ENABLED(JOYSTICK)
1791
 #if ENABLED(JOYSTICK)
1785
   #if PIN_EXISTS(JOY_X)
1792
   #if PIN_EXISTS(JOY_X)

+ 9
- 9
Marlin/src/module/temperature.cpp View File

1839
   #if HAS_JOY_ADC_EN
1839
   #if HAS_JOY_ADC_EN
1840
     SET_INPUT_PULLUP(JOY_EN_PIN);
1840
     SET_INPUT_PULLUP(JOY_EN_PIN);
1841
   #endif
1841
   #endif
1842
-  #if HAS_HEATED_BED
1842
+  #if HAS_TEMP_ADC_BED
1843
     HAL_ANALOG_SELECT(TEMP_BED_PIN);
1843
     HAL_ANALOG_SELECT(TEMP_BED_PIN);
1844
   #endif
1844
   #endif
1845
-  #if HAS_TEMP_CHAMBER
1845
+  #if HAS_TEMP_ADC_CHAMBER
1846
     HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
1846
     HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
1847
   #endif
1847
   #endif
1848
-  #if HAS_TEMP_PROBE
1848
+  #if HAS_TEMP_ADC_PROBE
1849
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
1849
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
1850
   #endif
1850
   #endif
1851
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
1851
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
2355
   TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update());
2355
   TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update());
2356
   TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update());
2356
   TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update());
2357
   TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update());
2357
   TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update());
2358
-  TERN_(HAS_HEATED_BED, temp_bed.update());
2359
-  TERN_(HAS_TEMP_CHAMBER, temp_chamber.update());
2360
-  TERN_(HAS_TEMP_PROBE, temp_probe.update());
2358
+  TERN_(HAS_TEMP_ADC_BED, temp_bed.update());
2359
+  TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
2360
+  TERN_(HAS_TEMP_ADC_PROBE, temp_probe.update());
2361
 
2361
 
2362
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
2362
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
2363
   TERN_(HAS_JOY_ADC_Y, joystick.y.update());
2363
   TERN_(HAS_JOY_ADC_Y, joystick.y.update());
2822
       case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
2822
       case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
2823
     #endif
2823
     #endif
2824
 
2824
 
2825
-    #if HAS_HEATED_BED
2825
+    #if HAS_TEMP_ADC_BED
2826
       case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
2826
       case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
2827
       case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
2827
       case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
2828
     #endif
2828
     #endif
2829
 
2829
 
2830
-    #if HAS_TEMP_CHAMBER
2830
+    #if HAS_TEMP_ADC_CHAMBER
2831
       case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
2831
       case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
2832
       case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
2832
       case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
2833
     #endif
2833
     #endif
2834
 
2834
 
2835
-    #if HAS_TEMP_PROBE
2835
+    #if HAS_TEMP_ADC_PROBE
2836
       case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
2836
       case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
2837
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
2837
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
2838
     #endif
2838
     #endif

+ 3
- 3
Marlin/src/module/temperature.h View File

89
   #if HAS_TEMP_ADC_0
89
   #if HAS_TEMP_ADC_0
90
     PrepareTemp_0, MeasureTemp_0,
90
     PrepareTemp_0, MeasureTemp_0,
91
   #endif
91
   #endif
92
-  #if HAS_HEATED_BED
92
+  #if HAS_TEMP_ADC_BED
93
     PrepareTemp_BED, MeasureTemp_BED,
93
     PrepareTemp_BED, MeasureTemp_BED,
94
   #endif
94
   #endif
95
-  #if HAS_TEMP_CHAMBER
95
+  #if HAS_TEMP_ADC_CHAMBER
96
     PrepareTemp_CHAMBER, MeasureTemp_CHAMBER,
96
     PrepareTemp_CHAMBER, MeasureTemp_CHAMBER,
97
   #endif
97
   #endif
98
-  #if HAS_TEMP_PROBE
98
+  #if HAS_TEMP_ADC_PROBE
99
     PrepareTemp_PROBE, MeasureTemp_PROBE,
99
     PrepareTemp_PROBE, MeasureTemp_PROBE,
100
   #endif
100
   #endif
101
   #if HAS_TEMP_ADC_1
101
   #if HAS_TEMP_ADC_1

Loading…
Cancel
Save