j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use an event flag group for GUI updates

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-03-20 15:36:59 +01:00
parent 41dbfa73ee
commit f0254b92ee
12 changed files with 28 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Inc/main.h
View File

@ -43,8 +43,10 @@ extern "C" {
/* USER CODE BEGIN EC */
extern volatile int ltdc_cb_triggered;
extern TX_QUEUE gui_button_queue;
extern TX_QUEUE vehicle_update_queue;
extern TX_EVENT_FLAGS_GROUP gui_update_events;
extern FDCAN_HandleTypeDef hfdcan1;
#define GUI_UPDATE_VEHICLE_STATE (1 << 0)
/* USER CODE END EC */
/* Exported macro ------------------------------------------------------------*/

9
Core/Inc/vehicle.h
View File

@ -102,15 +102,6 @@ typedef struct {
extern VehicleState vehicle_state;
typedef enum {
VEH_UPD_AMS,
VEH_UPD_MISSION,
VEH_UPD_STATUS,
VEH_UPD_TS_CURRENT,
VEH_UPD_TS_VOLTAGE_VEH,
VEH_UPD_TS_VOLTAGE_BAT
} VehicleUpdate;
void vehicle_thread_entry(ULONG hfdcan_addr);
void vehicle_select_mission(Mission mission);

9
Core/Src/vehicle.c
View File

@ -45,7 +45,6 @@ void vehicle_select_mission(Mission mission) {
}
void ftcan_msg_received_cb(uint16_t id, size_t datalen, const uint8_t *data) {
VehicleUpdate msg;
switch (id) {
case CAN_ID_AMS_STATUS:
vehicle_state.ts_state = data[0] & 0x7F;
@ -55,11 +54,9 @@ void ftcan_msg_received_cb(uint16_t id, size_t datalen, const uint8_t *data) {
ftcan_unmarshal_unsigned(&ptr, 2) * CAN_AMS_STATUS_VOLTAGE_FACTOR;
vehicle_state.max_cell_temp =
ftcan_unmarshal_signed(&ptr, 2) * CAN_AMS_STATUS_TEMP_FACTOR;
msg = VEH_UPD_AMS;
break;
case CAN_ID_AS_MISSION_FB:
vehicle_state.active_mission = data[0] & 0b111;
msg = VEH_UPD_MISSION;
break;
case CAN_ID_STW_STATUS:
vehicle_state.as_state = data[0] & 0b111;
@ -85,20 +82,16 @@ void ftcan_msg_received_cb(uint16_t id, size_t datalen, const uint8_t *data) {
vehicle_state.errors.err_res = (data[5] >> 2) & 1;
vehicle_state.errors.err_invl = (data[5] >> 3) & 1;
vehicle_state.errors.err_invr = (data[5] >> 4) & 1;
msg = VEH_UPD_STATUS;
break;
case CAN_ID_SHUNT_CURRENT:
vehicle_state.ts_current = ftcan_unmarshal_signed(&data, 6) * 1e-3;
msg = VEH_UPD_TS_CURRENT;
break;
case CAN_ID_SHUNT_VOLTAGE2:
vehicle_state.ts_voltage_veh = ftcan_unmarshal_signed(&data, 6) * 1e-3;
msg = VEH_UPD_TS_VOLTAGE_VEH;
break;
case CAN_ID_SHUNT_VOLTAGE3:
vehicle_state.ts_voltage_bat = ftcan_unmarshal_signed(&data, 6) * 1e-3;
msg = VEH_UPD_TS_VOLTAGE_BAT;
break;
}
tx_queue_send(&vehicle_update_queue, &msg, TX_NO_WAIT);
tx_event_flags_set(&gui_update_events, GUI_UPDATE_VEHICLE_STATE, TX_OR);
}