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

fixed LEDs

Browse Source
This commit is contained in:
Janek Herm
2025-06-18 19:39:13 +02:00
parent cdd7163db1
commit bf4e1cda68
8 changed files with 5178 additions and 5190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Software/Core/Inc/can.h
View File

@ -16,13 +16,13 @@
typedef union {
struct {
uint8_t ts_inactive : 1;
uint8_t ts_active : 1;
uint8_t ts_precharge : 1;
uint8_t ts_discharge : 1;
uint8_t ts_error : 1;
uint8_t ts_state : 1;
uint8_t NC1 : 1;
uint8_t NC2 : 1;
uint8_t NC3 : 1;
uint8_t NC4 : 1;
uint8_t NC5 : 1;
uint8_t NC6 : 1;
uint8_t sdc_closed : 1;
};
uint8_t ams_rx;

6
Software/Core/Inc/main.h
View File

@ -55,6 +55,12 @@ extern "C" {
#define R2D_INIT_STAGE1 0x06
#define R2D_INIT_STAGE2 0x07
#define R2D_INIT_SUCCESS 0x0F
#define TS_INACTIVE 0x00
#define TS_ACTIVE 0x01
#define TS_PRECHARGE 0x02
#define TS_DISCHARGE 0x03
#define TS_ERROR 0x04
/* USER CODE END EM */
/* Exported functions prototypes ---------------------------------------------*/

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

@ -141,18 +141,21 @@ int main(void)
int br = 0, bg = 0, bb = 0;
if(acc_status.ams_status.sdc_closed == 1){
if(acc_status.ams_status.ts_inactive){
if(acc_status.ams_status.ts_state == TS_INACTIVE){
r = g = 1;
}
if(acc_status.ams_status.ts_precharge){
if(acc_status.ams_status.ts_state == TS_PRECHARGE){
br = bg = 1;
}
if(acc_status.ams_status.ts_active){
if(acc_status.ams_status.ts_state == TS_ACTIVE){
g = 1;
}
if(acc_status.ams_status.ts_discharge){
if(acc_status.ams_status.ts_state == TS_DISCHARGE){
br = bb = 1;
}
if(acc_status.ams_status.ts_state == TS_ERROR){
r = 1;
}
}
else{
b = r = 1;
@ -162,7 +165,7 @@ 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) > 100u)) {
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);
@ -172,7 +175,7 @@ int main(void)
r = g = b = 0;
br = bg = bb = 0;
if (acc_status.ams_status.ts_active) {
if (acc_status.ams_status.ts_state == TS_ACTIVE) {
if((r2d_progress == R2D_TS_ACTIVE) || (r2d_progress == R2D_TSMS) || (r2d_progress == R2D_NONE)){
r = g = 1;
}
@ -191,7 +194,7 @@ int main(void)
HAL_GPIO_WritePin(R2D_B_GPIO_Port, R2D_B_Pin, b);
if ((br || bg || bb) && ((HAL_GetTick() - blink_tick_r2d) > 100u)) {
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);