File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments