|
@@ -225,7 +225,7 @@ class Stepper {
|
225
|
225
|
// SCARA AB axes are in degrees, not mm
|
226
|
226
|
//
|
227
|
227
|
#if IS_SCARA
|
228
|
|
- static FORCE_INLINE float get_axis_position_degrees(AxisEnum axis) { return get_axis_position_mm(axis); }
|
|
228
|
+ FORCE_INLINE static float get_axis_position_degrees(AxisEnum axis) { return get_axis_position_mm(axis); }
|
229
|
229
|
#endif
|
230
|
230
|
|
231
|
231
|
//
|
|
@@ -247,7 +247,7 @@ class Stepper {
|
247
|
247
|
//
|
248
|
248
|
// The direction of a single motor
|
249
|
249
|
//
|
250
|
|
- static FORCE_INLINE bool motor_direction(AxisEnum axis) { return TEST(last_direction_bits, axis); }
|
|
250
|
+ FORCE_INLINE static bool motor_direction(AxisEnum axis) { return TEST(last_direction_bits, axis); }
|
251
|
251
|
|
252
|
252
|
#if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM
|
253
|
253
|
static void digitalPotWrite(const int16_t address, const int16_t value);
|
|
@@ -261,19 +261,19 @@ class Stepper {
|
261
|
261
|
#endif
|
262
|
262
|
|
263
|
263
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
264
|
|
- static FORCE_INLINE void set_homing_flag_x(const bool state) { performing_homing = state; }
|
265
|
|
- static FORCE_INLINE void set_x_lock(const bool state) { locked_x_motor = state; }
|
266
|
|
- static FORCE_INLINE void set_x2_lock(const bool state) { locked_x2_motor = state; }
|
|
264
|
+ FORCE_INLINE static void set_homing_flag_x(const bool state) { performing_homing = state; }
|
|
265
|
+ FORCE_INLINE static void set_x_lock(const bool state) { locked_x_motor = state; }
|
|
266
|
+ FORCE_INLINE static void set_x2_lock(const bool state) { locked_x2_motor = state; }
|
267
|
267
|
#endif
|
268
|
268
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
269
|
|
- static FORCE_INLINE void set_homing_flag_y(const bool state) { performing_homing = state; }
|
270
|
|
- static FORCE_INLINE void set_y_lock(const bool state) { locked_y_motor = state; }
|
271
|
|
- static FORCE_INLINE void set_y2_lock(const bool state) { locked_y2_motor = state; }
|
|
269
|
+ FORCE_INLINE static void set_homing_flag_y(const bool state) { performing_homing = state; }
|
|
270
|
+ FORCE_INLINE static void set_y_lock(const bool state) { locked_y_motor = state; }
|
|
271
|
+ FORCE_INLINE static void set_y2_lock(const bool state) { locked_y2_motor = state; }
|
272
|
272
|
#endif
|
273
|
273
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
274
|
|
- static FORCE_INLINE void set_homing_flag_z(const bool state) { performing_homing = state; }
|
275
|
|
- static FORCE_INLINE void set_z_lock(const bool state) { locked_z_motor = state; }
|
276
|
|
- static FORCE_INLINE void set_z2_lock(const bool state) { locked_z2_motor = state; }
|
|
274
|
+ FORCE_INLINE static void set_homing_flag_z(const bool state) { performing_homing = state; }
|
|
275
|
+ FORCE_INLINE static void set_z_lock(const bool state) { locked_z_motor = state; }
|
|
276
|
+ FORCE_INLINE static void set_z2_lock(const bool state) { locked_z2_motor = state; }
|
277
|
277
|
#endif
|
278
|
278
|
|
279
|
279
|
#if ENABLED(BABYSTEPPING)
|
|
@@ -292,7 +292,7 @@ class Stepper {
|
292
|
292
|
//
|
293
|
293
|
// Triggered position of an axis in mm (not core-savvy)
|
294
|
294
|
//
|
295
|
|
- static FORCE_INLINE float triggered_position_mm(AxisEnum axis) {
|
|
295
|
+ FORCE_INLINE static float triggered_position_mm(AxisEnum axis) {
|
296
|
296
|
return endstops_trigsteps[axis] * planner.steps_to_mm[axis];
|
297
|
297
|
}
|
298
|
298
|
|
|
@@ -302,7 +302,7 @@ class Stepper {
|
302
|
302
|
|
303
|
303
|
private:
|
304
|
304
|
|
305
|
|
- static FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
|
|
305
|
+ FORCE_INLINE static unsigned short calc_timer(unsigned short step_rate) {
|
306
|
306
|
unsigned short timer;
|
307
|
307
|
|
308
|
308
|
NOMORE(step_rate, MAX_STEP_FREQUENCY);
|
|
@@ -344,7 +344,7 @@ class Stepper {
|
344
|
344
|
|
345
|
345
|
// Initialize the trapezoid generator from the current block.
|
346
|
346
|
// Called whenever a new block begins.
|
347
|
|
- static FORCE_INLINE void trapezoid_generator_reset() {
|
|
347
|
+ FORCE_INLINE static void trapezoid_generator_reset() {
|
348
|
348
|
|
349
|
349
|
static int8_t last_extruder = -1;
|
350
|
350
|
|