t.korjakow
/
ft24_control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into galactic-adjustments

This commit is contained in:
Your Name 2023-07-11 15:13:46 +02:00
parent 1c04b8a156 95b9decbb6
commit fd298c87b9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dcaitirobot/embedded/lib/MotorWheel/MotorWheel.cpp
View File

@ -1,10 +1,5 @@
#include<MotorWheel.h>
inline int modulo(int a, int b) {
const int result = a % b;
return result >= 0 ? result : result + b;
}
Motor::Motor(unsigned char _pinPWM,unsigned char _pinDir,
unsigned char _pinIRQ,unsigned char _pinIRQB,
struct ISRVars* _isr)
@ -328,7 +323,7 @@ float GearedMotor::setGearedSpeedRPM(float gearedSpeedRPM) {
float GearedMotor::getPosition() {
debug();
int ticks_per_rev = getRatio() * CPR;
return ((float)modulo(Motor::getCurrPulse(), ticks_per_rev))/ticks_per_rev;
return ((float)getCurrPulse())/ticks_per_rev;
}
MotorWheel::MotorWheel(unsigned char _pinPWM,unsigned char _pinDir,