Skip to content

Commit e660a4f

Browse files
author
Bjoern Schmidt
committed
FOC control experimenting, EXPERIMENTAL COMMIT!
1 parent 9093249 commit e660a4f

File tree

7 files changed

+213
-227
lines changed

7 files changed

+213
-227
lines changed

ACAcontrollerState.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ uint32_t ui32_erps_filtered = 0; //filtered value of erps
6969
uint16_t ui16_virtual_erps_speed = 0;
7070
uint16_t ui16_BatteryCurrent = 0; //Battery Current read from ADC8
7171
uint8_t ui8_position_correction_value = 127; // in 360/256 degrees
72-
uint8_t ui8_ADC_iq_current_target = 127; // advance angle testing
72+
uint8_t ui8_correction_at_angle = 127; // advance angle testing
7373
uint16_t ui16_ADC_iq_current = 0;
7474
uint16_t ui16_ADC_iq_current_filtered = 0;
7575
uint8_t ui8_control_state = 0;
@@ -171,8 +171,8 @@ void controllerstate_init(void) {
171171
if (eepromVal > 0) ui16_s_ramp_start = eepromVal << 6;
172172
eepromVal = eeprom_read(OFFSET_MOTOR_ANGLE);
173173
if (eepromVal > 0) ui8_s_motor_angle = eepromVal;
174-
eepromVal = eeprom_read(OFFSET_CORRECTION_ADC_CURRENT_TARGET);
175-
if (eepromVal > 0) ui8_ADC_iq_current_target = eepromVal;
174+
eepromVal = eeprom_read(OFFSET_CORRECTION_AT_ANGLE);
175+
if (eepromVal > 0) ui8_correction_at_angle = eepromVal;
176176

177177
for (di = 0; di < 6; di++) {
178178
uint8_t_hall_order[di] = 0;

ACAcontrollerState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern uint16_t ui16_virtual_erps_speed;
5252
extern uint32_t ui32_erps_filtered; //filtered value of erps
5353
extern uint16_t ui16_BatteryCurrent;
5454
extern uint8_t ui8_position_correction_value;
55-
extern uint8_t ui8_ADC_iq_current_target;
55+
extern uint8_t ui8_correction_at_angle;
5656
extern uint16_t ui16_ADC_iq_current;
5757
extern uint16_t ui16_ADC_iq_current_filtered;
5858
extern uint8_t ui8_speedlimit_kph;

ACAeeprom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ typedef enum {
5050
OFFSET_ACA_FLAGS = ((uint8_t) 0x13),
5151

5252
OFFSET_TQ_CALIB = ((uint8_t) 0x14),
53-
OFFSET_CORRECTION_ADC_CURRENT_TARGET = ((uint8_t) 0x15)
53+
OFFSET_CORRECTION_AT_ANGLE = ((uint8_t) 0x15)
5454

5555
} BO_EEPROM_OFFSETS;
5656

BOdisplay.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void addConfigStateInfos(void) {
135135
addPayload(CODE_RAMP_START, ui16_s_ramp_start >> 6);
136136
addPayload(CODE_MAX_BAT_CURRENT_HIGH_BYTE, ui16_battery_current_max_value >> 8);
137137
addPayload(CODE_MAX_BAT_CURRENT, ui16_battery_current_max_value);
138-
addPayload(CODE_CORRECTION_ADC_CURRENT_TARGET, ui8_ADC_iq_current_target);
138+
addPayload(CODE_CORRECTION_AT_ANGLE, ui8_correction_at_angle);
139139
// 1 more elements left/avail (max24)
140140

141141
}
@@ -308,12 +308,12 @@ void digestConfigRequest(uint8_t configAddress, uint8_t requestedCodeLowByte, ui
308308
}
309309
addPayload(requestedCodeLowByte, ui8_s_motor_angle);
310310
break;
311-
case CODE_CORRECTION_ADC_CURRENT_TARGET:
312-
ui8_ADC_iq_current_target = requestedValue;
311+
case CODE_CORRECTION_AT_ANGLE:
312+
ui8_correction_at_angle = requestedValue;
313313
if (configAddress == EEPROM_ADDRESS) {
314-
eeprom_write(OFFSET_CORRECTION_ADC_CURRENT_TARGET, requestedValue);
314+
eeprom_write(OFFSET_CORRECTION_AT_ANGLE, requestedValue);
315315
}
316-
addPayload(requestedCodeLowByte, ui8_ADC_iq_current_target);
316+
addPayload(requestedCodeLowByte, ui8_correction_at_angle);
317317
break;
318318

319319
case CODE_PAS_TRESHOLD:

BOdisplay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ typedef enum {
117117
CODE_ACA_FLAGS_HIGH_BYTE = ((uint8_t) 0x97),
118118
CODE_ACA_FLAGS = ((uint8_t) 0x98),
119119

120-
CODE_CORRECTION_ADC_CURRENT_TARGET = ((uint8_t) 0x99),
120+
CODE_CORRECTION_AT_ANGLE = ((uint8_t) 0x99),
121121

122122
CODE_HALL_ORDER_BASE = ((uint8_t) 0x10),
123123
CODE_CURRENT_AT_HALL_POSITION_BASE = ((uint8_t) 0x00)

config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
#define TQS_CALIB 0.0
4646
#define ACA 670
4747
#define EEPROM_NOINIT // eeprom will not be cleared
48-
#define EEPROM_INIT_MAGIC_BYTE 249 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
48+
#define EEPROM_INIT_MAGIC_BYTE 7 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
4949

5050
#endif /* CONFIG_H_ */

0 commit comments

Comments
 (0)