From de577322c040c77a3376c079ed38a57740ee312c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 1 Dec 2020 23:05:22 -0600 Subject: [PATCH] Bool items are wanted? --- Marlin/src/lcd/language/language_en.h | 7 ++++--- Marlin/src/lcd/menu/menu_spindle_laser.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index e18b6ff592ae..32a7870e4983 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -110,11 +110,12 @@ namespace Language_en { PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequency"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Laser Control"); - PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Laser Power"); - PROGMEM Language_Str MSG_LASER_STATE = _UxGT("Laser State"); - PROGMEM Language_Str MSG_SPINDLE_STATE = _UxGT("Spindle State"); PROGMEM Language_Str MSG_SPINDLE_MENU = _UxGT("Spindle Control"); + PROGMEM Language_Str MSG_LASER_POWER = _UxGT("Laser Power"); PROGMEM Language_Str MSG_SPINDLE_POWER = _UxGT("Spindle Power"); + PROGMEM Language_Str MSG_LASER_TOGGLE = _UxGT("Toggle Laser"); + PROGMEM Language_Str MSG_SPINDLE_TOGGLE = _UxGT("Toggle Spindle"); + PROGMEM Language_Str MSG_SPINDLE_FORWARD = _UxGT("Spindle Forward"); PROGMEM Language_Str MSG_SPINDLE_REVERSE = _UxGT("Spindle Reverse"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Switch Power On"); diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp index c2e963167a7d..eacb295f71d7 100644 --- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp +++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp @@ -33,7 +33,7 @@ #include "../../feature/spindle_laser.h" void menu_spindle_laser() { - const bool is_enabled = cutter.enabled() && cutter.isReady; + bool is_enabled = cutter.enabled() && cutter.isReady; START_MENU(); BACK_ITEM(MSG_MAIN); @@ -46,13 +46,13 @@ #endif if (is_enabled) - ACTION_ITEM(MSG_CUTTER(STATE), cutter.disable); + EDIT_ITEM(bool, MSG_CUTTER(SWITCH), &is_enabled, cutter.disable); else { #if ENABLED(SPINDLE_CHANGE_DIR) - ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable_forward); - ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable_reverse); + EDIT_ITEM(bool, MSG_CUTTER(FORWARD), &is_enabled, cutter.enable_forward); + EDIT_ITEM(bool, MSG_CUTTER(REVERSE), &is_enabled, cutter.enable_reverse); #else - ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable); + EDIT_ITEM(bool, MSG_CUTTER(SWITCH), &is_enabled, cutter.enable); #endif }