Skip to content

Commit

Permalink
Some edits to ensure the display worked correctly for array, motor, o…
Browse files Browse the repository at this point in the history
…ff switches
  • Loading branch information
OscarPortillo37 committed Dec 7, 2024
1 parent 88d9ca8 commit cb913d5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
8 changes: 5 additions & 3 deletions Apps/Src/ReadCarCAN.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,14 @@ static void handler_ReadCarCAN_chargeDisable(void)
bool ret = (bool)Contactors_Get(ARRAY_PRECHARGE_BYPASS_CONTACTOR);

if (ret)
{ // Contactor failed to turn off; display the evac screen and infinite loop
{ // Contactor failed to turn off; display the evac screen and infinite l
Display_Evac(SOC, SBPV);
while (1)
{
;
}
}else{
UpdateDisplay_SetArray(false);
}
}

Expand Down Expand Up @@ -387,8 +389,8 @@ static void handler_ReadCarCAN_contactorsDisable(void)
}
else
{
UpdateDisplay_SetArray(true);
UpdateDisplay_SetMotor(true);
UpdateDisplay_SetArray(false);
UpdateDisplay_SetMotor(false);
}
}

Expand Down
1 change: 1 addition & 0 deletions Apps/Src/SendTritium.c
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ void Task_SendTritium(void *p_arg)
// Initialize current state to FORWARD_DRIVE
state = FSM[NEUTRAL_DRIVE];
prevState = FSM[NEUTRAL_DRIVE];
UpdateDisplay_SetGear(DISP_NEUTRAL);

#ifndef SENDTRITIUM_EXPOSE_VARS
CANDATA_t driveCmd = {
Expand Down
2 changes: 1 addition & 1 deletion Embedded-Sharepoint
2 changes: 1 addition & 1 deletion RTOS/uCOS-III-STM32F4

0 comments on commit cb913d5

Please sign in to comment.