Closer to intention

MarlinFirmware · Dec 2, 2020 · 1ab193f · 1ab193f · descipher · Dec 2, 2020
1 parent f9ba37f
commit 1ab193f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
@@ -37,7 +37,6 @@
 SpindleLaser cutter;
 uint8_t SpindleLaser::power;
 bool SpindleLaser::isReady;                                           // Ready to apply power setting from the UI to OCR
-bool SpindleLaser::state;                                             // Cutter/Laser on/off state 
 cutter_power_t SpindleLaser::menuPower,                               // Power set via LCD menu in PWM, PERCENT, or RPM
                SpindleLaser::unitPower;                               // LCD status power in PWM, PERCENT, or RPM
 

diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
@@ -91,7 +91,6 @@ class SpindleLaser {
   static const cutter_power_t mpower_max() { return cpwr_to_upwr(SPEED_POWER_MAX); }
 
   static bool isReady;                    // Ready to apply power setting from the UI to OCR
-  static bool state;                      // Cutter/Laser on/off state 
   static uint8_t power;
 
   #if ENABLED(MARLIN_DEV_MODE)

diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -46,9 +46,15 @@
     #endif
 
     if (is_enabled)
-      EDIT_ITEM(bool, MSG_CUTTER(STATE), &cutter.state, cutter.disable);
-    else
-      EDIT_ITEM(bool, MSG_CUTTER(STATE), &cutter.state, TERN(SPINDLE_CHANGE_DIR, cutter.enable_reverse, cutter.enable_forward));
+      ACTION_ITEM(MSG_CUTTER(STATE), cutter.disable);
+    else {
+      #if ENABLED(SPINDLE_CHANGE_DIR)
+        ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable_forward);
+        ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable_reverse);
+      #else
+        ACTION_ITEM(MSG_CUTTER(STATE), cutter.enable);
+      #endif
+    }
 
     #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
       EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 50000, cutter.refresh_frequency);