From cb913d5d034155ab8ff3136b6868621908d48df3 Mon Sep 17 00:00:00 2001
From: OscarPortillo37 <oscarportillo0831@gmail.com>
Date: Sat, 7 Dec 2024 10:19:44 -0600
Subject: [PATCH] Some edits to ensure the display worked correctly for array,
 motor, off switches

---
 Apps/Src/ReadCarCAN.c  | 8 +++++---
 Apps/Src/SendTritium.c | 1 +
 Embedded-Sharepoint    | 2 +-
 RTOS/uCOS-III-STM32F4  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Apps/Src/ReadCarCAN.c b/Apps/Src/ReadCarCAN.c
index 2d792555a..aab7349b0 100644
--- a/Apps/Src/ReadCarCAN.c
+++ b/Apps/Src/ReadCarCAN.c
@@ -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);
     }
 }
 
@@ -387,8 +389,8 @@ static void handler_ReadCarCAN_contactorsDisable(void)
     }
     else
     {
-        UpdateDisplay_SetArray(true);
-        UpdateDisplay_SetMotor(true);
+        UpdateDisplay_SetArray(false);
+        UpdateDisplay_SetMotor(false);
     }
 }
 
diff --git a/Apps/Src/SendTritium.c b/Apps/Src/SendTritium.c
index e016c0021..fa6c64554 100644
--- a/Apps/Src/SendTritium.c
+++ b/Apps/Src/SendTritium.c
@@ -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 = {
diff --git a/Embedded-Sharepoint b/Embedded-Sharepoint
index 7584311df..0d80b95ab 160000
--- a/Embedded-Sharepoint
+++ b/Embedded-Sharepoint
@@ -1 +1 @@
-Subproject commit 7584311df293c27ac40d60bcb29cb662496a792e
+Subproject commit 0d80b95ab47648b09034cc27a8b755bd89a4589b
diff --git a/RTOS/uCOS-III-STM32F4 b/RTOS/uCOS-III-STM32F4
index 450bb7ba9..288ecf06e 160000
--- a/RTOS/uCOS-III-STM32F4
+++ b/RTOS/uCOS-III-STM32F4
@@ -1 +1 @@
-Subproject commit 450bb7ba978f6d5bf31aa8f0108ddc52317e276f
+Subproject commit 288ecf06ee65774646ff4005e1c7f06b545b3d2c