FaSTTUBe/dashboard
51
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed LEDs to work with new changes in CAN-message

Browse Source
This commit is contained in:
Janek Herm
2025-06-24 18:50:06 +02:00
parent bf4e1cda68
commit 09afab4ef6
6 changed files with 5245 additions and 5283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Software/Core/Src/main.c
View File

@ -63,7 +63,6 @@ static void MX_CAN_Init(void);
extern dash_tx_t dash_tx;
extern rx_acc acc_status;
uint8_t sdc_closed;
uint8_t blink_state;
uint8_t r2d_progress;
uint32_t blink_tick_tson;
uint32_t blink_tick_r2d;
@ -104,7 +103,6 @@ int main(void)
/* USER CODE BEGIN 2 */
can_init(&hcan);
blink_state = 0;
sdc_closed = 0;
blink_tick_tson = HAL_GetTick();
blink_tick_r2d = HAL_GetTick();
@ -127,8 +125,8 @@ int main(void)
// Inverted in hardware
if ((HAL_GetTick() - ams_last_tick) < 350) { //master sendet aller 100ms, fürs testen erstmal auf 150ms gesetzt -> kann später wieder runter
HAL_GPIO_WritePin(IMD_LED_GPIO_Port, IMD_LED_Pin, acc_status.led_status.imd_error);
HAL_GPIO_WritePin(AMS_LED_GPIO_Port, AMS_LED_Pin, acc_status.led_status.ams_error);
HAL_GPIO_WritePin(IMD_LED_GPIO_Port, IMD_LED_Pin, !acc_status.led_status.imd_error);
HAL_GPIO_WritePin(AMS_LED_GPIO_Port, AMS_LED_Pin, !acc_status.led_status.ams_error);
HAL_GPIO_WritePin(TSOFF_LED_GPIO_Port, TSOFF_LED_Pin,acc_status.led_status.ts_green);
} else {
// Safe state: Error LEDs on, TSOFF off
@ -154,7 +152,7 @@ int main(void)
br = bb = 1;
}
if(acc_status.ams_status.ts_state == TS_ERROR){
r = 1;
br = 1;
}
}
else{
@ -165,10 +163,10 @@ int main(void)
HAL_GPIO_WritePin(TSON_G_GPIO_Port, TSON_G_Pin, g);
HAL_GPIO_WritePin(TSON_B_GPIO_Port, TSON_B_Pin, b);
if ((br || bg || bb) && ((HAL_GetTick() - blink_tick_tson) > 10u)) {
HAL_GPIO_WritePin(TSON_R_GPIO_Port, TSON_R_Pin, br && blink_state);
HAL_GPIO_WritePin(TSON_G_GPIO_Port, TSON_G_Pin, bg && blink_state);
HAL_GPIO_WritePin(TSON_B_GPIO_Port, TSON_B_Pin, bb && blink_state);
if ((br || bg || bb) && ((HAL_GetTick() - blink_tick_tson) > 1000u)) {
if (br) { HAL_GPIO_TogglePin(TSON_R_GPIO_Port, TSON_R_Pin); }
if (bg) { HAL_GPIO_TogglePin(TSON_G_GPIO_Port, TSON_G_Pin); }
if (bb) { HAL_GPIO_TogglePin(TSON_B_GPIO_Port, TSON_B_Pin); }
blink_tick_tson = HAL_GetTick();
}
@ -194,15 +192,13 @@ int main(void)
HAL_GPIO_WritePin(R2D_B_GPIO_Port, R2D_B_Pin, b);
if ((br || bg || bb) && ((HAL_GetTick() - blink_tick_r2d) > 10u)) {
HAL_GPIO_WritePin(R2D_R_GPIO_Port, R2D_R_Pin, br && blink_state);
HAL_GPIO_WritePin(R2D_G_GPIO_Port, R2D_G_Pin, bg && blink_state);
HAL_GPIO_WritePin(R2D_B_GPIO_Port, R2D_B_Pin, bb && blink_state);
if ((br || bg || bb) && ((HAL_GetTick() - blink_tick_r2d) > 1000u)) {
if (br) { HAL_GPIO_TogglePin(R2D_R_GPIO_Port, R2D_R_Pin); }
if (bg) { HAL_GPIO_TogglePin(R2D_G_GPIO_Port, R2D_G_Pin); }
if (bb) { HAL_GPIO_TogglePin(R2D_B_GPIO_Port, R2D_B_Pin); }
blink_tick_r2d = HAL_GetTick();
}
blink_state = !blink_state;
if ((HAL_GetTick() - can_send_tick) > 50u){
can_send();
can_send_tick = HAL_GetTick();