|
@@ -68,7 +68,7 @@ void SpindleLaser::init() {
|
68
|
68
|
SET_PWM(SPINDLE_LASER_PWM_PIN);
|
69
|
69
|
set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
|
70
|
70
|
#endif
|
71
|
|
- #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
|
|
71
|
+ #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
|
72
|
72
|
set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
|
73
|
73
|
TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
|
74
|
74
|
#endif
|
|
@@ -78,9 +78,7 @@ void SpindleLaser::init() {
|
78
|
78
|
#if ENABLED(AIR_ASSIST)
|
79
|
79
|
OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE); // Init Air Assist OFF
|
80
|
80
|
#endif
|
81
|
|
- #if ENABLED(I2C_AMMETER)
|
82
|
|
- ammeter.init(); // Init I2C Ammeter
|
83
|
|
- #endif
|
|
81
|
+ TERN_(I2C_AMMETER, ammeter.init()); // Init I2C Ammeter
|
84
|
82
|
}
|
85
|
83
|
|
86
|
84
|
#if ENABLED(SPINDLE_LASER_USE_PWM)
|
|
@@ -90,7 +88,7 @@ void SpindleLaser::init() {
|
90
|
88
|
* @param ocr Power value
|
91
|
89
|
*/
|
92
|
90
|
void SpindleLaser::_set_ocr(const uint8_t ocr) {
|
93
|
|
- #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
|
|
91
|
+ #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
|
94
|
92
|
set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
|
95
|
93
|
#endif
|
96
|
94
|
set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
|