thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Streamline menu item logic (#17664)

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-27 23:52:11 -05:00
committed by GitHub
parent f709c565a1
commit 4f003fc7a7
17 changed files with 303 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/lcd/menu/menu_spindle_laser.cpp
View File

@@ -34,18 +34,19 @@
void menu_spindle_laser() {
const bool can_disable = cutter.enabled() && cutter.isOn;
START_MENU();
BACK_ITEM(MSG_MAIN);
#if ENABLED(SPINDLE_LASER_PWM)
EDIT_ITEM_FAST(CUTTER_MENU_POWER_TYPE, MSG_CUTTER(POWER), &cutter.setPower, cutter.interpret_power(SPEED_POWER_MIN), cutter.interpret_power(SPEED_POWER_MAX),
[]{
if (cutter.isOn) {
cutter.power = cutter.setPower;
}
});
EDIT_ITEM_FAST( CUTTER_MENU_POWER_TYPE, MSG_CUTTER(POWER), &cutter.setPower
, cutter.interpret_power(SPEED_POWER_MIN), cutter.interpret_power(SPEED_POWER_MAX)
, []{ if (cutter.isOn) cutter.power = cutter.setPower; }
);
#endif
if (cutter.enabled() && cutter.isOn)
if (can_disable)
ACTION_ITEM(MSG_CUTTER(OFF), cutter.disable);
else {
ACTION_ITEM(MSG_CUTTER(ON), cutter.enable_forward);