Browse Source

Followup to Laser Flow Meter (#21498)

Mike La Spina 3 years ago
parent
commit
235ba92602
No account linked to committer's email address

+ 3
- 3
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp View File

46
   #include "../../gcode/parser.h"
46
   #include "../../gcode/parser.h"
47
 #endif
47
 #endif
48
 
48
 
49
-#if HAS_COOLER || HAS_FLOWMETER
49
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
50
   #include "../../feature/cooler.h"
50
   #include "../../feature/cooler.h"
51
 #endif
51
 #endif
52
 
52
 
584
 }
584
 }
585
 #endif
585
 #endif
586
 
586
 
587
-#if HAS_FLOWMETER
587
+#if ENABLED(LASER_COOLANT_FLOW_METER)
588
   FORCE_INLINE void _draw_flowmeter_status() {
588
   FORCE_INLINE void _draw_flowmeter_status() {
589
     lcd_put_u8str("~ ");
589
     lcd_put_u8str("~ ");
590
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
590
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
827
       #if HAS_COOLER
827
       #if HAS_COOLER
828
         _draw_cooler_status('*', blink);
828
         _draw_cooler_status('*', blink);
829
       #endif
829
       #endif
830
-      #if HAS_FLOWMETER
830
+      #if ENABLED(LASER_COOLANT_FLOW_METER)
831
         _draw_flowmeter_status();
831
         _draw_flowmeter_status();
832
       #endif
832
       #endif
833
 
833
 

+ 3
- 3
Marlin/src/lcd/dogm/dogm_Statusscreen.h View File

97
 //
97
 //
98
 // Laser Flowmeter
98
 // Laser Flowmeter
99
 //
99
 //
100
-#if !STATUS_FLOWMETER_WIDTH && HAS_FLOWMETER
100
+#if !STATUS_FLOWMETER_WIDTH && ENABLED(LASER_COOLANT_FLOW_METER)
101
   #include "status/cooler.h"
101
   #include "status/cooler.h"
102
 #endif
102
 #endif
103
 #ifndef STATUS_FLOWMETER_WIDTH
103
 #ifndef STATUS_FLOWMETER_WIDTH
567
 //
567
 //
568
 //  Flowmeter Bitmap Properties
568
 //  Flowmeter Bitmap Properties
569
 //
569
 //
570
-#if HAS_FLOWMETER
570
+#if ENABLED(LASER_COOLANT_FLOW_METER)
571
   #if STATUS_FLOWMETER_WIDTH
571
   #if STATUS_FLOWMETER_WIDTH
572
 
572
 
573
     #ifndef STATUS_FLOWMETER_X
573
     #ifndef STATUS_FLOWMETER_X
689
 #if HAS_COOLER
689
 #if HAS_COOLER
690
   #define DO_DRAW_COOLER 1
690
   #define DO_DRAW_COOLER 1
691
 #endif
691
 #endif
692
-#if HAS_FLOWMETER
692
+#if ENABLED(LASER_COOLANT_FLOW_METER)
693
   #define DO_DRAW_FLOWMETER 1
693
   #define DO_DRAW_FLOWMETER 1
694
 #endif
694
 #endif
695
 
695
 

+ 1
- 1
Marlin/src/lcd/dogm/status/cooler.h View File

64
   };
64
   };
65
 #endif
65
 #endif
66
 
66
 
67
-#if HAS_FLOWMETER
67
+#if ENABLED(LASER_COOLANT_FLOW_METER)
68
   #define STATUS_FLOWMETER_WIDTH 24
68
   #define STATUS_FLOWMETER_WIDTH 24
69
   const unsigned char status_flowmeter_bmp2[] PROGMEM = {
69
   const unsigned char status_flowmeter_bmp2[] PROGMEM = {
70
     B00000001,B11111000,B00000000,
70
     B00000001,B11111000,B00000000,

+ 1
- 1
Marlin/src/lcd/dogm/status_screen_DOGM.cpp View File

53
   #include "../../feature/spindle_laser.h"
53
   #include "../../feature/spindle_laser.h"
54
 #endif
54
 #endif
55
 
55
 
56
-#if HAS_COOLER || HAS_FLOWMETER
56
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
57
   #include "../../feature/cooler.h"
57
   #include "../../feature/cooler.h"
58
 #endif
58
 #endif
59
 
59
 

+ 1
- 1
Marlin/src/lcd/menu/menu_temperature.cpp View File

35
   #include "../../module/motion.h"
35
   #include "../../module/motion.h"
36
 #endif
36
 #endif
37
 
37
 
38
-#if HAS_COOLER || HAS_FLOWMETER
38
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
39
   #include "../../feature/cooler.h"
39
   #include "../../feature/cooler.h"
40
 #endif
40
 #endif
41
 
41
 

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

35
 #include "endstops.h"
35
 #include "endstops.h"
36
 #include "planner.h"
36
 #include "planner.h"
37
 
37
 
38
-#if HAS_COOLER || HAS_FLOWMETER
38
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
39
   #include "../feature/cooler.h"
39
   #include "../feature/cooler.h"
40
   #include "../feature/spindle_laser.h"
40
   #include "../feature/spindle_laser.h"
41
 #endif
41
 #endif
1549
 
1549
 
1550
   #endif // HAS_COOLER
1550
   #endif // HAS_COOLER
1551
 
1551
 
1552
-  #if HAS_FLOWMETER
1552
+  #if ENABLED(LASER_COOLANT_FLOW_METER)
1553
     cooler.flowmeter_task(ms);
1553
     cooler.flowmeter_task(ms);
1554
     #if ENABLED(FLOWMETER_SAFETY)
1554
     #if ENABLED(FLOWMETER_SAFETY)
1555
       if (cutter.enabled() && cooler.check_flow_too_low()) {
1555
       if (cutter.enabled() && cooler.check_flow_too_low()) {

Loading…
Cancel
Save