bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move inline laser state to fix EEPROM error

Browse Source
This commit is contained in:
Scott Lahteine
2020-05-12 00:09:18 -05:00
parent a06a0c5b88
commit 181739d0d1
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ public:
#if ENABLED(LASER_POWER_INLINE)
// Force disengage planner power control
static inline void inline_disable() { planner.settings.laser.status = 0; planner.settings.laser.power = 0; isOn = false;}
static inline void inline_disable() { planner.laser.status = 0; planner.laser.power = 0; isOn = false;}
// Inline modes of all other functions; all enable planner inline power control
static inline void inline_enabled(const bool enable) { enable ? inline_power(SPEED_POWER_STARTUP) : inline_ocr_power(0); }
@ -146,8 +146,8 @@ public:
#if ENABLED(SPINDLE_LASER_PWM)
inline_ocr_power(translate_power(pwr));
#else
planner.settings.laser.status = enabled(pwr) ? 0x03 : 0x01;
planner.settings.laser.power = pwr;
planner.laser.status = enabled(pwr) ? 0x03 : 0x01;
planner.laser.power = pwr;
#endif
}
@ -155,8 +155,8 @@ public:
#if ENABLED(SPINDLE_LASER_PWM)
static inline void inline_ocr_power(const uint8_t pwr) {
planner.settings.laser.status = pwr ? 0x03 : 0x01;
planner.settings.laser.power = pwr;
planner.laser.status = pwr ? 0x03 : 0x01;
planner.laser.power = pwr;
}
#endif
#endif