Skip to content

Commit 7f99231

Browse files
committed
the other macro
1 parent 96d352d commit 7f99231

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Marlin/src/feature/spindle_laser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void SpindleLaser::init() {
108108
void SpindleLaser::_set_ocr(const uint8_t unscaledOcr) {
109109

110110
// Apply spindle override
111-
const uint16_t scaled = MUL_TERN(static_cast<uint16_t>(unscaledOcr), spindle_override);
111+
const uint16_t scaled = MUL_TERN1(static_cast<uint16_t>(unscaledOcr), spindle_override);
112112
#if ENABLED(SPINDLE_FEATURE)
113113
const uint8_t ocr = scaled > 25500 ? 255 : scaled / 100;
114114
#else

Marlin/src/module/motion.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2903,10 +2903,10 @@ void set_axis_is_at_home(const AxisEnum axis) {
29032903

29042904
if (!stepper.is_awake()) stepper.wake_up();
29052905

2906-
if ( TERN1(HAS_X_AXIS, stepper.axis_is_moving(X_AXIS))
2907-
|| TERN1(HAS_Y_AXIS, stepper.axis_is_moving(Y_AXIS))
2908-
|| TERN1(HAS_Z_AXIS, stepper.axis_is_moving(Z_AXIS))
2909-
|| TERN1(HAS_EXTRUDERS, stepper.axis_is_moving(E_AXIS))
2906+
if ( TERN0(HAS_X_AXIS, stepper.axis_is_moving(X_AXIS))
2907+
|| TERN0(HAS_Y_AXIS, stepper.axis_is_moving(Y_AXIS))
2908+
|| TERN0(HAS_Z_AXIS, stepper.axis_is_moving(Z_AXIS))
2909+
|| TERN0(HAS_EXTRUDERS, stepper.axis_is_moving(E_AXIS))
29102910
) {
29112911
set_and_report_grblstate(M_RUNNING);
29122912
}

0 commit comments

Comments
 (0)