diff --git a/stm32/include/KJ2016Tempo.h b/stm32/include/KJ2016Tempo.h index f30d62be20cb3d4fb2f5d745341a099dd4b350e8..55d3222ee469ee3f4762ff11c3ec50beb3f1c753 100644 --- a/stm32/include/KJ2016Tempo.h +++ b/stm32/include/KJ2016Tempo.h @@ -28,8 +28,6 @@ class KJ2016Tempo void move(int distance); - void wasteTime(unsigned int time); - KJ2016Tempo(unsigned int leftServoID, unsigned int rightServoID); }; diff --git a/stm32/src/KJ2016Tempo.cpp b/stm32/src/KJ2016Tempo.cpp index c23cb8db313d8d493a46f845dd675d0cd6ddf918..75504fb664858ef714f7f1125665e82ab1c0e83f 100644 --- a/stm32/src/KJ2016Tempo.cpp +++ b/stm32/src/KJ2016Tempo.cpp @@ -3,6 +3,8 @@ #include "interfaceServosNumeriques.h" #include "actionneurs/fishingNet.h" +#include "clock.h" + KJ2016Tempo::KJ2016Tempo(unsigned int leftServoID, unsigned int rightServoID): LEFT_SERVO_ID(leftServoID), RIGHT_SERVO_ID(rightServoID) {} @@ -70,7 +72,7 @@ void KJ2016Tempo::turn90(bool toLeft) ServosNumeriques::moveAtSpeed(0x0400 - speed, servoOne); ServosNumeriques::moveAtSpeed(0x0400 + speed, servoTwo); - wasteTime(static_cast( 1/((float)speed) * correctionFactor)); + Clock::delay(static_cast( 1/((float)speed) * correctionFactor)); enginesStop(); } @@ -88,11 +90,6 @@ void KJ2016Tempo::move(int distance) ServosNumeriques::moveAtSpeed(0x0400 + speed, LEFT_SERVO_ID); ServosNumeriques::moveAtSpeed(0x0400 + speed, RIGHT_SERVO_ID); - wasteTime(static_cast((float)distance / (float)speed * correctionFactor)); + Clock::delay(static_cast((float)distance / (float)speed * correctionFactor)); enginesStop(); } - -void KJ2016Tempo::wasteTime(unsigned int time) -{ - for(unsigned int i=0; i