MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🐛 Fix laser menu enable_state (#24557)

Browse Source
This commit is contained in:
Mike La Spina 2022-08-01 01:03:45 -05:00 committed by Scott Lahteine
parent c0cb7e35af
commit c3f2586445
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Marlin/src/feature/spindle_laser.h
View File

@ -197,7 +197,7 @@ public:
* - For CUTTER_MODE_ERROR set the output enable_state flag directly and set power to 0 for any mode. * - For CUTTER_MODE_ERROR set the output enable_state flag directly and set power to 0 for any mode.
* This mode allows a global power shutdown action to occur. * This mode allows a global power shutdown action to occur.
*/ */
static void set_enabled(const bool enable) { static void set_enabled(bool enable) {
switch (cutter_mode) { switch (cutter_mode) {
case CUTTER_MODE_STANDARD: case CUTTER_MODE_STANDARD:
apply_power(enable ? TERN(SPINDLE_LASER_USE_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0); apply_power(enable ? TERN(SPINDLE_LASER_USE_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0);
@ -209,7 +209,7 @@ public:
TERN_(LASER_FEATURE, set_inline_enabled(enable)); TERN_(LASER_FEATURE, set_inline_enabled(enable));
break; break;
case CUTTER_MODE_ERROR: // Error mode, no enable and kill power. case CUTTER_MODE_ERROR: // Error mode, no enable and kill power.
enable_state = false; enable = false;
apply_power(0); apply_power(0);
} }
#if SPINDLE_LASER_ENA_PIN #if SPINDLE_LASER_ENA_PIN
@ -279,13 +279,14 @@ public:
#if ENABLED(LASER_FEATURE) #if ENABLED(LASER_FEATURE)
// Toggle the laser on/off with menuPower. Apply SPEED_POWER_STARTUP if it was 0 on entry. // Toggle the laser on/off with menuPower. Apply SPEED_POWER_STARTUP if it was 0 on entry.
static void laser_menu_toggle(const bool state) { static void menu_set_enabled(const bool state) {
set_enabled(state); set_enabled(state);
if (state) { if (state) {
if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP); if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
power = upower_to_ocr(menuPower); power = upower_to_ocr(menuPower);
apply_power(power); apply_power(power);
} } else
apply_power(0);
} }
/** /**
@ -295,10 +296,10 @@ public:
*/ */
static void test_fire_pulse() { static void test_fire_pulse() {
BUZZ(30, 3000); BUZZ(30, 3000);
cutter_mode = CUTTER_MODE_STANDARD;// Menu needs standard mode. cutter_mode = CUTTER_MODE_STANDARD; // Menu needs standard mode.
laser_menu_toggle(true); // Laser On menu_set_enabled(true); // Laser On
delay(testPulse); // Delay for time set by user in pulse ms menu screen. delay(testPulse); // Delay for time set by user in pulse ms menu screen.
laser_menu_toggle(false); // Laser Off menu_set_enabled(false); // Laser Off
} }
#endif // LASER_FEATURE #endif // LASER_FEATURE
@ -308,14 +309,14 @@ public:
// Dynamic mode rate calculation // Dynamic mode rate calculation
static uint8_t calc_dynamic_power() { static uint8_t calc_dynamic_power() {
if (feedrate_mm_m > 65535) return 255; // Too fast, go always on if (feedrate_mm_m > 65535) return 255; // Too fast, go always on
uint16_t rate = uint16_t(feedrate_mm_m); // 16 bits from the G-code parser float input uint16_t rate = uint16_t(feedrate_mm_m); // 16 bits from the G-code parser float input
rate >>= 8; // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255 rate >>= 8; // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255
return uint8_t(rate); return uint8_t(rate);
} }
// Inline modes of all other functions; all enable planner inline power control // Inline modes of all other functions; all enable planner inline power control
static void set_inline_enabled(const bool enable) { planner.laser_inline.status.isEnabled = enable;} static void set_inline_enabled(const bool enable) { planner.laser_inline.status.isEnabled = enable; }
// Set the power for subsequent movement blocks // Set the power for subsequent movement blocks
static void inline_power(const cutter_power_t cpwr) { static void inline_power(const cutter_power_t cpwr) {

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

@ -48,12 +48,12 @@
cutter.mpower_min(), cutter.mpower_max(), cutter.update_from_mpower); cutter.mpower_min(), cutter.mpower_max(), cutter.update_from_mpower);
#endif #endif
editable.state = is_enabled; editable.state = is_enabled; // State before toggle
EDIT_ITEM(bool, MSG_CUTTER(TOGGLE), &is_enabled, []{ EDIT_ITEM(bool, MSG_CUTTER(TOGGLE), &is_enabled, []{
#if ENABLED(SPINDLE_FEATURE) #if ENABLED(SPINDLE_FEATURE)
if (editable.state) cutter.disable(); else cutter.enable_same_dir(); if (editable.state) cutter.disable(); else cutter.enable_same_dir();
#else #else
cutter.laser_menu_toggle(!editable.state); cutter.menu_set_enabled(!editable.state);
#endif #endif
}); });