FaSTTUBe/steering-wheel
56
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated CAN interface

Browse Source
This commit is contained in:
jvblanck 2021-06-30 21:36:51 +02:00
parent 4d62419d72
commit beff90a10a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/FT18e_STW_INIT/FT18e_STW_INIT.h
View File

@ -77,19 +77,19 @@ struct InverterData
typedef struct typedef struct
{ {
uint8_t e_thro; // E-Drossel uint16_t u_cell_min; // Minimale Zellspannung
int16_t revol; // Drehzahl uint16_t u_batt; // Batteriespannung (pre-AIR-voltage)
int16_t t_mot_l; // Motor-Wasser-Temperatur Links int16_t t_mot_l; // Motor-Wasser-Temperatur Links
int16_t t_mot_r; // Motor-Wasser-Temperatur Rechts int16_t t_mot_r; // Motor-Wasser-Temperatur Rechts
int16_t t_cell_max; // Maximale Zelltemperatur int16_t t_cell_max; // Maximale Zelltemperatur
uint16_t u_cell_min; // Minimale Zellspannung int16_t t_inv;
uint16_t u_batt; // Batteriespannung (pre-AIR-voltage)
bool rev_lim; // Drehzahllimit Bit
int16_t p_wat;
int16_t t_wat; int16_t t_wat;
int16_t p_wat;
uint8_t speed; uint8_t speed;
InverterData inverter; InverterData inverter;
int16_t t_inv; bool rev_lim; // Drehzahllimit Bit
int16_t revol; // Drehzahl
int16_t wheel_speed;
} vehicle_data_type; } vehicle_data_type;
extern volatile stw_data_type Stw_data; extern volatile stw_data_type Stw_data;

8
lib/FT_2018e_STW_CAN/FT_2018e_STW_CAN.cpp
View File

@ -106,8 +106,7 @@ void process_inverter_stats(CAN_FRAME *frame)
Vehicle_data.inverter.ts_active = status & CAN_INVERTER_STATS_TS_ACTIVE; Vehicle_data.inverter.ts_active = status & CAN_INVERTER_STATS_TS_ACTIVE;
Vehicle_data.t_inv = data->temp; Vehicle_data.t_inv = data->temp;
Vehicle_data.revol = data->velocity; Vehicle_data.revol = data->velocity;
Serial.print("invVelocity: "); Vehicle_data.wheel_speed = data->wheel_speed;
Serial.println(data->velocity);
} }
void update_LED() void update_LED()
@ -116,15 +115,16 @@ void update_LED()
bool t_inv = Vehicle_data.t_inv > LED_THRESH_T_INV; bool t_inv = Vehicle_data.t_inv > LED_THRESH_T_INV;
bool t_bat = Vehicle_data.t_cell_max > LED_THRESH_T_BAT; bool t_bat = Vehicle_data.t_cell_max > LED_THRESH_T_BAT;
bool u_batt = Vehicle_data.u_cell_min < LED_THRESH_U_BATT;
bool precharge_active = !Vehicle_data.inverter.precharge; bool precharge_active = !Vehicle_data.inverter.precharge;
bool derating = Vehicle_data.inverter.derating;
bool u_batt = Vehicle_data.u_cell_min < LED_THRESH_U_BATT;
digitalWrite(led11, t_mot); // rot, links, oben digitalWrite(led11, t_mot); // rot, links, oben
digitalWrite(led12, t_inv); // rot, links, mitte digitalWrite(led12, t_inv); // rot, links, mitte
digitalWrite(led13, t_bat); // rot, links, unten digitalWrite(led13, t_bat); // rot, links, unten
digitalWrite(led14, precharge_active); // rot, rechts, oben digitalWrite(led14, precharge_active); // rot, rechts, oben
digitalWrite(led15, LOW); // rot rechts, mitte digitalWrite(led15, derating); // rot rechts, mitte
digitalWrite(led16, u_batt); // blau rechts, unten digitalWrite(led16, u_batt); // blau rechts, unten
bool rev_lim = Vehicle_data.rev_lim; bool rev_lim = Vehicle_data.rev_lim;

2
lib/FT_2018e_STW_CAN/FT_2018e_STW_CAN.h
View File

@ -61,5 +61,5 @@ struct InverterStats
uint8_t _reserved; uint8_t _reserved;
uint16_t temp; uint16_t temp;
int16_t velocity; int16_t velocity;
uint16_t error; int16_t wheel_speed;
}; };