|
@@ -41,7 +41,7 @@ void SpindleLaser::init() {
|
41
|
41
|
#endif
|
42
|
42
|
#if ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
|
43
|
43
|
SET_PWM(SPINDLE_LASER_PWM_PIN);
|
44
|
|
- analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // set to lowest speed
|
|
44
|
+ analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_INVERT ? 255 : 0); // set to lowest speed
|
45
|
45
|
#endif
|
46
|
46
|
}
|
47
|
47
|
|
|
@@ -55,7 +55,7 @@ void SpindleLaser::init() {
|
55
|
55
|
void SpindleLaser::set_ocr(const uint8_t ocr) {
|
56
|
56
|
WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ACTIVE_HIGH); // turn spindle on (active low)
|
57
|
57
|
#if ENABLED(SPINDLE_LASER_PWM)
|
58
|
|
- analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
|
|
58
|
+ analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
|
59
|
59
|
#endif
|
60
|
60
|
}
|
61
|
61
|
|
|
@@ -75,8 +75,8 @@ void SpindleLaser::update_output() {
|
75
|
75
|
set_ocr(ocr_val & 0xFF); // ...limited to Atmel PWM max
|
76
|
76
|
}
|
77
|
77
|
else { // Convert RPM to PWM duty cycle
|
78
|
|
- WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH); // Turn spindle off (active low)
|
79
|
|
- analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // Only write low byte
|
|
78
|
+ WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH); // Turn spindle off (active low)
|
|
79
|
+ analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_INVERT ? 255 : 0); // Only write low byte
|
80
|
80
|
}
|
81
|
81
|
#else
|
82
|
82
|
WRITE(SPINDLE_LASER_ENA_PIN, ena ? SPINDLE_LASER_ACTIVE_HIGH : !SPINDLE_LASER_ACTIVE_HIGH);
|