Resolved errors (uppercase)

lhr-solar · Oct 12, 2024 · 0b38faf · 0b38faf
1 parent 6bde669
commit 0b38faf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 36 deletions.
diff --git a/Apps/Src/DebugDump.c b/Apps/Src/DebugDump.c
@@ -15,12 +15,12 @@ static const char *MINIONPIN_STRING[] = {
     FOREACH_PIN(GENERATE_STRING)
 };
 
-static const char *CONTACTOR_STRING[] = {
-    FOREACH_contactor(GENERATE_STRING)
+static const char *GEAR_STRING[] = {
+    FOREACH_GEAR(GENERATE_STRING)
 };
 
-static const char *GEAR_STRING[] = {
-    FOREACH_Gear(GENERATE_STRING)
+static const char *CONTACTOR_STRING[] = {
+    FOREACH_contactor(GENERATE_STRING)
 };
 
 // Need to keep this in sync with Task.h
@@ -54,10 +54,10 @@ void Task_DebugDump(void* p_arg) {
         } 
 
         // Send Tritium variables
-        printf("Pedal Brake Percent: %d\n\r", get_brakePedalPercent());
-        printf("Pedal Accel Percent: %d\n\r", get_accelPedalPercent());
-        printf("Current Gear: %s\n\r", GEAR_STRING[get_gear()]);
-        print_float("Current Setpoint: ", get_currentSetpoint());
+        printf("Pedal Brake Percent: %d\n\r", GetBrakePedalPercent());
+        printf("Pedal Accel Percent: %d\n\r", GetAccelPedalPercent());
+        printf("Current Gear: %s\n\r", GEAR_STRING[GetGear()]);
+        print_float("Current Setpoint: ", GetCurrentSetpoint());
 
         printf("\n\r");
 

diff --git a/Apps/Src/SendTritium.c b/Apps/Src/SendTritium.c
@@ -18,13 +18,13 @@
 
 #include "SendTritium.h"
 
-#include "CanBus.h"
-#include "CanConfig.h"
+#include "CANbus.h"
+#include "CANConfig.h"
 #include "Minions.h"
 #include "Pedals.h"
-#include "ReadCarCan.h"
+#include "ReadCarCAN.h"
 #include "ReadTritium.h"
-#include "SendCarCan.h"
+#include "SendCarCAN.h"
 #include "UpdateDisplay.h"
 #include "common.h"
 

diff --git a/Tests/Test_App_FaultState.c b/Tests/Test_App_FaultState.c
@@ -22,30 +22,6 @@ void Task1(void* arg){
 int main(){
     OS_ERR err;
     OSInit(&err);
-    OSSemCreate( //create fault sem4
-        &FaultState_Sem4,
-        "Fault State Semaphore",
-        0,
-        &err
-    );
-    assertOSError(err); 
-
-    OSTaskCreate( //create fault task
-        (OS_TCB*)&FaultState_TCB,
-        (CPU_CHAR*)"Fault State",
-        (OS_TASK_PTR)&Task_FaultState,
-        (void*)NULL,
-        (OS_PRIO)1,
-        (CPU_STK*)FaultState_Stk,
-        (CPU_STK_SIZE)128/10,
-        (CPU_STK_SIZE)128,
-        (OS_MSG_QTY)0,
-        (OS_TICK)NULL,
-        (void*)NULL,
-        (OS_OPT)(OS_OPT_TASK_STK_CLR),
-        (OS_ERR*)&err
-    );
-    assertOSError(err);
 
     //create tester thread
      OSTaskCreate(