From 0fa345f98f7223f2546a9a6808d5c67039fb3aab Mon Sep 17 00:00:00 2001
From: Luu Lac <45380455+shitcreek@users.noreply.github.com>
Date: Mon, 8 Jun 2020 19:53:39 -0500
Subject: [PATCH] Laser updates followup (#18237)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/src/feature/spindle_laser.h | 34 ++++++++++++++++++------------
Marlin/src/module/planner.cpp | 1 +
Marlin/src/module/stepper.h | 4 ++--
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index e3aa4023c0..4abed6cb9b 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -91,8 +91,8 @@ public:
static cutter_frequency_t frequency; // Set PWM frequency; range: 2K-50K
#endif
- static cutter_power_t menuPower; // Power as set via LCD menu in PWM, Percentage or RPM
- static cutter_power_t unitPower; // Power as displayed status in PWM, Percentage or RPM
+ static cutter_power_t menuPower, // Power as set via LCD menu in PWM, Percentage or RPM
+ unitPower; // Power as displayed status in PWM, Percentage or RPM
static void init();
@@ -225,32 +225,37 @@ public:
static inline void inline_disable() {
isReady = false;
unitPower = 0;
- planner.laser_inline.status = 0;
+ planner.laser_inline.status.isPlanned = false;
+ planner.laser_inline.status.isEnabled = false;
planner.laser_inline.power = 0;
}
// Inline modes of all other functions; all enable planner inline power control
static inline void set_inline_enabled(const bool enable) {
- if (enable) { inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP)); }
- else { unitPower = 0; isReady = false; menuPower = 0; TERN(SPINDLE_LASER_PWM, inline_ocr_power, inline_power)(0);}
+ if (enable)
+ inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP));
+ else {
+ isReady = false;
+ unitPower = menuPower = 0;
+ planner.laser_inline.status.isPlanned = false;
+ TERN(SPINDLE_LASER_PWM, inline_ocr_power, inline_power)(0);
+ }
}
// Set the power for subsequent movement blocks
static void inline_power(const cutter_power_t upwr) {
- unitPower = upwr;
- menuPower = unitPower;
+ unitPower = menuPower = upwr;
#if ENABLED(SPINDLE_LASER_PWM)
- isReady = true;
#if ENABLED(SPEED_POWER_RELATIVE) && !CUTTER_UNIT_IS(RPM) // relative mode does not turn laser off at 0, except for RPM
- planner.laser_inline.status = 0x03;
+ planner.laser_inline.status.isEnabled = true;
planner.laser_inline.power = upower_to_ocr(upwr);
+ isReady = true;
#else
- if (upwr > 0)
- inline_ocr_power(upower_to_ocr(upwr));
+ inline_ocr_power(upower_to_ocr(upwr));
#endif
#else
- planner.laser_inline.status = enabled(pwr) ? 0x03 : 0x01;
- planner.laser_inline.power = pwr;
+ planner.laser_inline.status.isEnabled = enabled(upwr);
+ planner.laser_inline.power = upwr;
isReady = enabled(upwr);
#endif
}
@@ -259,7 +264,8 @@ public:
#if ENABLED(SPINDLE_LASER_PWM)
static inline void inline_ocr_power(const uint8_t ocrpwr) {
- planner.laser_inline.status = ocrpwr ? 0x03 : 0x01;
+ isReady = ocrpwr > 0;
+ planner.laser_inline.status.isEnabled = ocrpwr > 0;
planner.laser_inline.power = ocrpwr;
}
#endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index cd425ef174..f6a0909034 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1826,6 +1826,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Update block laser power
#if ENABLED(LASER_POWER_INLINE)
+ laser_inline.status.isPlanned = true;
block->laser.status = laser_inline.status;
block->laser.power = laser_inline.power;
#endif
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index bc35f55ff2..90ca092ace 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -355,7 +355,7 @@ class Stepper {
#if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
typedef struct {
- bool trap_en; // Trapezoid needed flag (i.e., laser on, planner in control)
+ bool enabled; // Trapezoid needed flag (i.e., laser on, planner in control)
uint8_t cur_power; // Current laser power
bool cruise_set; // Power set up for cruising?
@@ -367,7 +367,7 @@ class Stepper {
#endif
} stepper_laser_t;
- static stepper_laser_t laser;
+ static stepper_laser_t laser_trap;
#endif
--
GitLab