diff --git a/motor.h b/motor.h index 7bcec1d99745287e22515b34d99b2f26df3a6d5a..11b4d8ef0ca802d4cff0dbf3202587b11a26dd52 100644 --- a/motor.h +++ b/motor.h @@ -88,7 +88,7 @@ public: { if (mm_per_sec_per_sec == 0) mm_per_sec_per_sec = 1000; - _retain_accel = mm_per_sec_per_sec; + _acceleration_mm_per_sec_per_sec = mm_per_sec_per_sec; #if !CORE_MOCK stepper.setAcceleration(mm_to_step(mm_per_sec_per_sec)); #endif @@ -96,7 +96,7 @@ public: float get_accel_mm_per_sec_per_sec () const { - return _retain_accel; + return _acceleration_mm_per_sec_per_sec; } float mm_to_step (float mm) const @@ -130,7 +130,7 @@ public: { #if !CORE_MOCK cli(); - set_accel_mm_per_sec_per_sec(_retain_accel); + set_accel_mm_per_sec_per_sec(_acceleration_mm_per_sec_per_sec); if (_mm_per_revolution > 0 && _steps_per_revolution > 0) stepper.moveTo(_forward_clockwise? step: -step); sei(); @@ -163,7 +163,7 @@ public: cli(); stepper.setAcceleration(1e20); stepper.moveTo(stepper.currentPosition()); // change target to here - set_accel_mm_per_sec_per_sec(_retain_accel); + set_accel_mm_per_sec_per_sec(_acceleration_mm_per_sec_per_sec); sei(); #endif } @@ -189,7 +189,7 @@ protected: int _steps_per_revolution = -1; float _mm_per_revolution = -1; - float _retain_accel = -1; + float _acceleration_mm_per_sec_per_sec = -1; bool _forward_clockwise; MotorHardware_t& stepper;