|
@@ -15,9 +15,11 @@ Atm_stepper& Atm_stepper::begin(int stepPin, int dirPin) {
|
|
};
|
|
};
|
|
// clang-format on
|
|
// clang-format on
|
|
Machine::begin( state_table, ELSE );
|
|
Machine::begin( state_table, ELSE );
|
|
- _motor = new AccelStepper(1, stepPin, dirPin);
|
|
|
|
- _motor->setMaxSpeed(2000);
|
|
|
|
- _motor->setAcceleration(2000);
|
|
|
|
|
|
+ AccelStepper _motor (1, stepPin, dirPin);
|
|
|
|
+ // Stepper _motor(stepPin, dirPin );
|
|
|
|
+ // StepControl _controller;
|
|
|
|
+ // _motor.setMaxSpeed(20000);
|
|
|
|
+ // _motor.setAcceleration(1000);
|
|
//_controller = new StepControl;
|
|
//_controller = new StepControl;
|
|
pinMode(0, OUTPUT);
|
|
pinMode(0, OUTPUT);
|
|
digitalWrite(0, HIGH);
|
|
digitalWrite(0, HIGH);
|
|
@@ -33,7 +35,8 @@ int Atm_stepper::event( int id ) {
|
|
case EVT_IDLE_TIMER:
|
|
case EVT_IDLE_TIMER:
|
|
return 0;
|
|
return 0;
|
|
case EVT_ON_TARGET:
|
|
case EVT_ON_TARGET:
|
|
- return 0;
|
|
|
|
|
|
+
|
|
|
|
+ return _motor.distanceToGo()== 0 ;
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -55,11 +58,12 @@ void Atm_stepper::action( int id ) {
|
|
return;
|
|
return;
|
|
case ENT_RUNNING:
|
|
case ENT_RUNNING:
|
|
digitalWrite(0, HIGH);
|
|
digitalWrite(0, HIGH);
|
|
|
|
+ // _controller.moveAsync(*_motor);
|
|
return;
|
|
return;
|
|
case LP_RUNNING:
|
|
case LP_RUNNING:
|
|
- _motor->run();
|
|
|
|
- // _controller.moveAsync(_motor);
|
|
|
|
- Serial.println(_motor->distanceToGo());
|
|
|
|
|
|
+ _motor.run();
|
|
|
|
+
|
|
|
|
+ Serial.println(_motor.currentPosition());
|
|
return;
|
|
return;
|
|
case ENT_STOPPING:
|
|
case ENT_STOPPING:
|
|
return;
|
|
return;
|
|
@@ -94,7 +98,13 @@ int Atm_stepper::state( void ) {
|
|
*/
|
|
*/
|
|
|
|
|
|
Atm_stepper& Atm_stepper::gotoStep(long int targetStep ) {
|
|
Atm_stepper& Atm_stepper::gotoStep(long int targetStep ) {
|
|
- _motor->moveTo(targetStep);
|
|
|
|
|
|
+ // _motor->setTargetRel(targetStep);
|
|
|
|
+
|
|
|
|
+ _motor.move(targetStep);
|
|
|
|
+ _motor.run();
|
|
|
|
+ Serial.println(_motor.distanceToGo());
|
|
|
|
+ _motor.setMaxSpeed(5000);
|
|
|
|
+ _motor.setAcceleration(6000);
|
|
trigger( EVT_GOTO );
|
|
trigger( EVT_GOTO );
|
|
return *this;
|
|
return *this;
|
|
}
|
|
}
|