Skip to content

Commit 2fcc55d

Browse files
Merge pull request #271 from runger1101001/dev
Small improvements and bug fixes
2 parents 510527a + 55debc4 commit 2fcc55d

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/common/base_classes/Sensor.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ void Sensor::update() {
1818
float Sensor::getVelocity() {
1919
// calculate sample time
2020
float Ts = (angle_prev_ts - vel_angle_prev_ts)*1e-6;
21-
// TODO handle overflow - we do need to reset vel_angle_prev_ts
21+
if (Ts < 0.0f) { // handle micros() overflow - we need to reset vel_angle_prev_ts
22+
vel_angle_prev = angle_prev;
23+
vel_full_rotations = full_rotations;
24+
vel_angle_prev_ts = angle_prev_ts;
25+
return velocity;
26+
}
2227
if (Ts < min_elapsed_time) return velocity; // don't update velocity if deltaT is too small
2328

2429
velocity = ( (float)(full_rotations - vel_full_rotations)*_2PI + (angle_prev - vel_angle_prev) ) / Ts;

src/common/foc_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define _PI_6 0.52359877559f
2929
#define _RPM_TO_RADS 0.10471975512f
3030

31-
#define NOT_SET -12345.0
31+
#define NOT_SET -12345.0f
3232
#define _HIGH_IMPEDANCE 0
3333
#define _HIGH_Z _HIGH_IMPEDANCE
3434
#define _ACTIVE 1

src/communication/StepDirListener.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "../common/foc_utils.h"
66

77

8-
#if defined(_STM32_DEF_) || defined(ESP_H) || defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_SAM_DUE) || defined(CORE_TEENSY) || defined(NRF52_SERIES)
8+
#if !defined(TARGET_RP2040) && !defined(_SAMD21_) && !defined(_SAMD51_) && !defined(_SAME51_)
99
#define PinStatus int
1010
#endif
1111

src/current_sense/hardware_specific/rp2040/rp2040_mcu.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "hardware/dma.h"
1111
#include "hardware/irq.h"
1212
#include "hardware/pwm.h"
13+
#include "hardware/adc.h"
1314

1415

1516
/* Singleton instance of the ADC engine */

0 commit comments

Comments
 (0)