Skip to content

Commit

Permalink
Temp testing fixes for display issues
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenmadaffri committed Mar 23, 2024
1 parent 39b0ae5 commit c8508a7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Apps/Inc/Tasks.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
* Priority Definitions
*/
#define TASK_INIT_PRIO 2
#define TASK_READ_TRITIUM_PRIO 3
#define TASK_SEND_TRITIUM_PRIO 4
#define TASK_READ_CAR_CAN_PRIO 5
#define TASK_SEND_CAR_CAN_PRIO 6
#define TASK_PUT_IOSTATE_PRIO 7
#define TASK_UPDATE_DISPLAY_PRIO 8
#define TASK_READ_TRITIUM_PRIO 4
#define TASK_SEND_TRITIUM_PRIO 5
#define TASK_READ_CAR_CAN_PRIO 6
#define TASK_SEND_CAR_CAN_PRIO 7
#define TASK_PUT_IOSTATE_PRIO 8
#define TASK_UPDATE_DISPLAY_PRIO 3
#define TASK_DEBUG_DUMP_PRIO 9
#define TASK_COMMAND_LINE_PRIO 10

Expand Down
5 changes: 3 additions & 2 deletions Apps/Src/ReadCarCAN.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ bool ChargeEnable_Get(void){
* @param p_arg pointer to the argument passed by timer
*/
static void callbackCANWatchdog(void *p_tmr, void *p_arg){
assertReadCarCANError(READCARCAN_ERR_MISSED_MSG);
//assertReadCarCANError(READCARCAN_ERR_MISSED_MSG);
return;
}

/**
Expand Down Expand Up @@ -340,7 +341,7 @@ void Task_ReadCarCAN(void *p_arg){

while(1){

updatePrechargeContactors(); // Sets array and motor controller PBC if all conditions (PBC Status, Threshold, Precharge Complete) permit
// updatePrechargeContactors(); // Sets array and motor controller PBC if all conditions (PBC Status, Threshold, Precharge Complete) permit

// BPS sent a message
ErrorStatus status = CANbus_Read(&dataBuf, true, CARCAN);
Expand Down
2 changes: 1 addition & 1 deletion Apps/Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void Task_Init(void *p_arg){
);
assertOSError(err);

// Initialize ReadCarCAN
//Initialize ReadCarCAN
OSTaskCreate(
(OS_TCB*)&ReadCarCAN_TCB,
(CPU_CHAR*)"ReadCarCAN",
Expand Down

0 comments on commit c8508a7

Please sign in to comment.