Followup to Laser Flow Meter (#21498)

MarlinFirmware · Apr 2, 2021 · 235ba92 · 235ba92
1 parent 6747d35
commit 235ba92
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -46,7 +46,7 @@
   #include "../../gcode/parser.h"
 #endif
 
-#if HAS_COOLER || HAS_FLOWMETER
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
   #include "../../feature/cooler.h"
 #endif
 
@@ -584,7 +584,7 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
 }
 #endif
 
-#if HAS_FLOWMETER
+#if ENABLED(LASER_COOLANT_FLOW_METER)
   FORCE_INLINE void _draw_flowmeter_status() {
     lcd_put_u8str("~ ");
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
@@ -827,7 +827,7 @@ void MarlinUI::draw_status_screen() {
       #if HAS_COOLER
         _draw_cooler_status('*', blink);
       #endif
-      #if HAS_FLOWMETER
+      #if ENABLED(LASER_COOLANT_FLOW_METER)
         _draw_flowmeter_status();
       #endif
 

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -97,7 +97,7 @@
 //
 // Laser Flowmeter
 //
-#if !STATUS_FLOWMETER_WIDTH && HAS_FLOWMETER
+#if !STATUS_FLOWMETER_WIDTH && ENABLED(LASER_COOLANT_FLOW_METER)
   #include "status/cooler.h"
 #endif
 #ifndef STATUS_FLOWMETER_WIDTH
@@ -567,7 +567,7 @@
 //
 //  Flowmeter Bitmap Properties
 //
-#if HAS_FLOWMETER
+#if ENABLED(LASER_COOLANT_FLOW_METER)
   #if STATUS_FLOWMETER_WIDTH
 
     #ifndef STATUS_FLOWMETER_X
@@ -689,7 +689,7 @@
 #if HAS_COOLER
   #define DO_DRAW_COOLER 1
 #endif
-#if HAS_FLOWMETER
+#if ENABLED(LASER_COOLANT_FLOW_METER)
   #define DO_DRAW_FLOWMETER 1
 #endif
 

diff --git a/Marlin/src/lcd/dogm/status/cooler.h b/Marlin/src/lcd/dogm/status/cooler.h
@@ -64,7 +64,7 @@
   };
 #endif
 
-#if HAS_FLOWMETER
+#if ENABLED(LASER_COOLANT_FLOW_METER)
   #define STATUS_FLOWMETER_WIDTH 24
   const unsigned char status_flowmeter_bmp2[] PROGMEM = {
     B00000001,B11111000,B00000000,

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -53,7 +53,7 @@
   #include "../../feature/spindle_laser.h"
 #endif
 
-#if HAS_COOLER || HAS_FLOWMETER
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
   #include "../../feature/cooler.h"
 #endif
 

diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -35,7 +35,7 @@
   #include "../../module/motion.h"
 #endif
 
-#if HAS_COOLER || HAS_FLOWMETER
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
   #include "../../feature/cooler.h"
 #endif
 

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
@@ -35,7 +35,7 @@
 #include "endstops.h"
 #include "planner.h"
 
-#if HAS_COOLER || HAS_FLOWMETER
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
   #include "../feature/cooler.h"
   #include "../feature/spindle_laser.h"
 #endif
@@ -1549,7 +1549,7 @@ void Temperature::manage_heater() {
 
   #endif // HAS_COOLER
 
-  #if HAS_FLOWMETER
+  #if ENABLED(LASER_COOLANT_FLOW_METER)
     cooler.flowmeter_task(ms);
     #if ENABLED(FLOWMETER_SAFETY)
       if (cutter.enabled() && cooler.check_flow_too_low()) {