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

🩹 Fix non-PWM cutter compile (#23169)

Browse Source
This commit is contained in:
Mike La Spina 2021-12-06 15:52:18 -06:00 committed by Scott Lahteine
parent 7123b15801
commit c3b8b3e7e6
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,18 +41,10 @@
#define PCT_TO_PWM(X) ((X) * 255 / 100) #define PCT_TO_PWM(X) ((X) * 255 / 100)
#define PCT_TO_SERVO(X) ((X) * 180 / 100) #define PCT_TO_SERVO(X) ((X) * 180 / 100)
#ifndef SPEED_POWER_INTERCEPT
#define SPEED_POWER_INTERCEPT 0
#endif
// #define _MAP(N,S1,S2,D1,D2) ((N)*_MAX((D2)-(D1),0)/_MAX((S2)-(S1),1)+(D1)) // #define _MAP(N,S1,S2,D1,D2) ((N)*_MAX((D2)-(D1),0)/_MAX((S2)-(S1),1)+(D1))
class SpindleLaser { class SpindleLaser {
public: public:
static constexpr float
min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
static const inline uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); } static const inline uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); }
// cpower = configured values (e.g., SPEED_POWER_MAX) // cpower = configured values (e.g., SPEED_POWER_MAX)
@ -158,6 +150,9 @@ public:
} }
static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) { static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
static constexpr float
min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
if (pwr <= 0) return 0; if (pwr <= 0) return 0;
cutter_power_t upwr; cutter_power_t upwr;
switch (pwrUnit) { switch (pwrUnit) {
@ -186,6 +181,7 @@ public:
} }
return upwr; return upwr;
} }
#endif // SPINDLE_LASER_USE_PWM #endif // SPINDLE_LASER_USE_PWM
/** /**

24
Marlin/src/feature/spindle_laser_types.h
View File

@ -28,12 +28,34 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
#define MSG_CUTTER(M) _MSG_CUTTER(M)
#ifndef SPEED_POWER_INTERCEPT
#define SPEED_POWER_INTERCEPT 0
#endif
#if ENABLED(SPINDLE_FEATURE) #if ENABLED(SPINDLE_FEATURE)
#define _MSG_CUTTER(M) MSG_SPINDLE_##M #define _MSG_CUTTER(M) MSG_SPINDLE_##M
#ifndef SPEED_POWER_MIN
#define SPEED_POWER_MIN 5000
#endif
#ifndef SPEED_POWER_MAX
#define SPEED_POWER_MAX 30000
#endif
#ifndef SPEED_POWER_STARTUP
#define SPEED_POWER_STARTUP 25000
#endif
#else #else
#define _MSG_CUTTER(M) MSG_LASER_##M #define _MSG_CUTTER(M) MSG_LASER_##M
#ifndef SPEED_POWER_MIN
#define SPEED_POWER_MIN 0
#endif
#ifndef SPEED_POWER_MAX
#define SPEED_POWER_MAX 255
#endif
#ifndef SPEED_POWER_STARTUP
#define SPEED_POWER_STARTUP 255
#endif
#endif #endif
#define MSG_CUTTER(M) _MSG_CUTTER(M)
typedef IF<(SPEED_POWER_MAX > 255), uint16_t, uint8_t>::type cutter_cpower_t; typedef IF<(SPEED_POWER_MAX > 255), uint16_t, uint8_t>::type cutter_cpower_t;

32
Marlin/src/gcode/control/M3-M5.cpp
View File

@ -66,21 +66,23 @@
* PWM duty cycle goes from 0 (off) to 255 (always on). * PWM duty cycle goes from 0 (off) to 255 (always on).
*/ */
void GcodeSuite::M3_M4(const bool is_M4) { void GcodeSuite::M3_M4(const bool is_M4) {
auto get_s_power = [] { #if EITHER(SPINDLE_LASER_USE_PWM, SPINDLE_SERVO)
if (parser.seenval('S')) { auto get_s_power = [] {
const float spwr = parser.value_float(); if (parser.seenval('S')) {
#if ENABLED(SPINDLE_SERVO) const float spwr = parser.value_float();
cutter.unitPower = spwr; #if ENABLED(SPINDLE_SERVO)
#else cutter.unitPower = spwr;
cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM, #else
cutter.power_to_range(cutter_power_t(round(spwr))), cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
spwr > 0 ? 255 : 0); cutter.power_to_range(cutter_power_t(round(spwr))),
#endif spwr > 0 ? 255 : 0);
} #endif
else }
cutter.unitPower = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP); else
return cutter.unitPower; cutter.unitPower = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP);
}; return cutter.unitPower;
};
#endif
#if ENABLED(LASER_POWER_INLINE) #if ENABLED(LASER_POWER_INLINE)
if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) { if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {

6
buildroot/tests/mega1280
View File

@ -27,6 +27,12 @@ opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
EXTERNAL_CLOSED_LOOP_CONTROLLER POWER_MONITOR_CURRENT POWER_MONITOR_VOLTAGE EXTERNAL_CLOSED_LOOP_CONTROLLER POWER_MONITOR_CURRENT POWER_MONITOR_VOLTAGE
exec_test $1 $2 "Spindle, MESH_BED_LEVELING, closed loop, Power Monitor, and LCD" "$3" exec_test $1 $2 "Spindle, MESH_BED_LEVELING, closed loop, Power Monitor, and LCD" "$3"
#
# ...and without PWM
#
opt_disable SPINDLE_LASER_USE_PWM
exec_test $1 $2 "(No PWM)" "$3"
# #
# Test DUAL_X_CARRIAGE # Test DUAL_X_CARRIAGE
# #