diff --git a/motor.h b/motor.h index 32bbb41b7b97621d9fef35fd21eac7693d121e04..b00f7c2fe63991bc9189093b41377deabe35962b 100644 --- a/motor.h +++ b/motor.h @@ -59,17 +59,17 @@ public: { _steps_per_revolution = steps_per_revolution; set_mm_per_rev(mm_per_revolution); - set_forward_clockwise(forward_clockwise); + set_clockwise_equals_forward(forward_clockwise); } - void set_forward_clockwise (bool forward_clockwise) + void set_clockwise_equals_forward (bool forward_clockwise) { - _forward_clockwise = forward_clockwise; + _clockwise_equals_forward = forward_clockwise; } - bool get_forward_clockwise () + bool get_clockwise_equals_forward () { - return _forward_clockwise; + return _clockwise_equals_forward; } void set_speed_mm_per_sec (float mm_per_sec) @@ -114,7 +114,7 @@ public: #if CORE_MOCK return 0; #else - return stepper.currentPosition() * (_forward_clockwise? 1: -1); + return stepper.currentPosition() * (_clockwise_equals_forward? 1: -1); #endif } @@ -132,7 +132,7 @@ public: cli(); 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); + stepper.moveTo(_clockwise_equals_forward? step: -step); sei(); #endif Serial.printf("# move to: %d step %g mm\n", step, step_to_mm(step)); @@ -190,7 +190,7 @@ protected: int _steps_per_revolution = -1; float _mm_per_revolution = -1; float _acceleration_mm_per_sec_per_sec = -1; - bool _forward_clockwise; + bool _clockwise_equals_forward; MotorHardware_t& stepper; };