Skip to content

Commit ef580d7

Browse files
committed
Prevent double constants
1 parent 76f0d56 commit ef580d7

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

src/common/base_classes/Sensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void Sensor::update() {
1919
/** get current angular velocity (rad/s) */
2020
float Sensor::getVelocity() {
2121
// calculate sample time
22-
float Ts = (angle_prev_ts - vel_angle_prev_ts)*1e-6;
22+
float Ts = (angle_prev_ts - vel_angle_prev_ts)*1e-6f;
2323
if (Ts < 0.0f) { // handle micros() overflow - we need to reset vel_angle_prev_ts
2424
vel_angle_prev = angle_prev;
2525
vel_full_rotations = full_rotations;

src/common/foc_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __attribute__((weak)) float _sin(float a){
99
// 16 bit precision on sine value, 8 bit fractional value for interpolation, 6bit LUT size
1010
// resulting precision compared to stdlib sine is 0.00006480 (RMS difference in range -PI,PI for 3217 steps)
1111
static uint16_t sine_array[65] = {0,804,1608,2411,3212,4011,4808,5602,6393,7180,7962,8740,9512,10279,11039,11793,12540,13279,14010,14733,15447,16151,16846,17531,18205,18868,19520,20160,20788,21403,22006,22595,23170,23732,24279,24812,25330,25833,26320,26791,27246,27684,28106,28511,28899,29269,29622,29957,30274,30572,30853,31114,31357,31581,31786,31972,32138,32286,32413,32522,32610,32679,32729,32758,32768};
12-
unsigned int i = (unsigned int)(a * (64*4*256.0 /_2PI));
12+
unsigned int i = (unsigned int)(a * (64*4*256 /_2PI));
1313
int t1, t2, frac = i & 0xff;
1414
i = (i >> 8) & 0xff;
1515
if (i < 64) {

src/current_sense/InlineCurrentSense.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ int InlineCurrentSense::driverAlign(float voltage){
156156
// read the current 50 times
157157
for (int i = 0; i < 100; i++) {
158158
PhaseCurrent_s c1 = getPhaseCurrents();
159-
c.a = c.a*0.6 + 0.4f*c1.a;
160-
c.b = c.b*0.6 + 0.4f*c1.b;
161-
c.c = c.c*0.6 + 0.4f*c1.c;
159+
c.a = c.a*0.6f + 0.4f*c1.a;
160+
c.b = c.b*0.6f + 0.4f*c1.b;
161+
c.c = c.c*0.6f + 0.4f*c1.c;
162162
_delay(3);
163163
}
164164
driver->setPwm(0, 0, 0);
@@ -203,9 +203,9 @@ int InlineCurrentSense::driverAlign(float voltage){
203203
// read the adc voltage 500 times ( arbitrary number )
204204
for (int i = 0; i < 100; i++) {
205205
PhaseCurrent_s c1 = getPhaseCurrents();
206-
c.a = c.a*0.6 + 0.4f*c1.a;
207-
c.b = c.b*0.6 + 0.4f*c1.b;
208-
c.c = c.c*0.6 + 0.4f*c1.c;
206+
c.a = c.a*0.6f + 0.4f*c1.a;
207+
c.b = c.b*0.6f + 0.4f*c1.b;
208+
c.c = c.c*0.6f + 0.4f*c1.c;
209209
_delay(3);
210210
}
211211
driver->setPwm(0, 0, 0);

src/current_sense/LowsideCurrentSense.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ int LowsideCurrentSense::driverAlign(float voltage){
157157
// read the current 50 times
158158
for (int i = 0; i < 100; i++) {
159159
PhaseCurrent_s c1 = getPhaseCurrents();
160-
c.a = c.a*0.6 + 0.4f*c1.a;
161-
c.b = c.b*0.6 + 0.4f*c1.b;
162-
c.c = c.c*0.6 + 0.4f*c1.c;
160+
c.a = c.a*0.6f + 0.4f*c1.a;
161+
c.b = c.b*0.6f + 0.4f*c1.b;
162+
c.c = c.c*0.6f + 0.4f*c1.c;
163163
_delay(3);
164164
}
165165
driver->setPwm(0, 0, 0);
@@ -204,9 +204,9 @@ int LowsideCurrentSense::driverAlign(float voltage){
204204
// read the adc voltage 500 times ( arbitrary number )
205205
for (int i = 0; i < 100; i++) {
206206
PhaseCurrent_s c1 = getPhaseCurrents();
207-
c.a = c.a*0.6 + 0.4f*c1.a;
208-
c.b = c.b*0.6 + 0.4f*c1.b;
209-
c.c = c.c*0.6 + 0.4f*c1.c;
207+
c.a = c.a*0.6f + 0.4f*c1.a;
208+
c.b = c.b*0.6f + 0.4f*c1.b;
209+
c.c = c.c*0.6f + 0.4f*c1.c;
210210
_delay(3);
211211
}
212212
driver->setPwm(0, 0, 0);

0 commit comments

Comments
 (0)