kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

bug fix static in motor und speed

Browse Source
This commit is contained in:
kleiax
2022-01-29 12:25:06 +01:00
parent 1265cfda5c
commit 9c4c82f8b3
18 changed files with 197 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Speedometer/speedometer.cpp
+8 -8
View File
@@ -29,24 +29,24 @@ void Speedometer::init(uint8_t pinA, uint8_t pinB, double diameter, uint16_t ste
this->isInit = true;
}
void Speedometer::loop() {
static uint32_t last_millis = 0;
uint16_t Speedometer::loop() {
uint32_t time = millis();
uint16_t elapsed_time = time - this->last_millis_loop;
//Cancel if delay is not reached
if (time - last_millis < delay) {
return;
if (elapsed_time < delay) {
return elapsed_time;
}
runSpeedometer();
last_millis = time;
this->last_millis_loop = time;
return elapsed_time;
}
void Speedometer::runSpeedometer() {
static uint32_t last_millis = 0;
uint32_t time = millis();
uint16_t elapsed_time = time - last_millis;
last_millis = time;
uint16_t elapsed_time = time - last_millis_calc;
last_millis_calc = time;
int16_t count = encoder.getCount();
this->addValToBuf(count);