Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

laser.flowmeter #21498

Merged
merged 15 commits into from
Apr 2, 2021
Merged

laser.flowmeter #21498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ec50d3d
Laser percent power
thinkyhead Dec 9, 2020
98799b5
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Dec 14, 2020
74367bc
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Dec 29, 2020
4a2dab7
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Jan 25, 2021
aa713a1
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Feb 1, 2021
2cc4d48
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Feb 2, 2021
8db0a77
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 3, 2021
9dbc82f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 5, 2021
329e211
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 12, 2021
80c48b0
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 16, 2021
a9a8bf5
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 24, 2021
245ffde
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 31, 2021
152b63c
HAS_FLOWMETER condition missing
descipher Apr 1, 2021
e5c848f
Update Configuration_adv.h
descipher Apr 1, 2021
8ca8fe3
Use the option
thinkyhead Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/lcd/dogm/dogm_Statusscreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -567,7 +567,7 @@
//
// Flowmeter Bitmap Properties
//
#if HAS_FLOWMETER
#if ENABLED(LASER_COOLANT_FLOW_METER)
#if STATUS_FLOWMETER_WIDTH

#ifndef STATUS_FLOWMETER_X
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/status/cooler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/menu/menu_temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()) {
Expand Down