More changes

lhr-solar · Oct 7, 2023 · 68590d1 · 68590d1
1 parent 3214028
commit 68590d1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 146 deletions.
diff --git a/.vscode/LHR.code-workspace b/.vscode/LHR.code-workspace
@@ -20,16 +20,6 @@
                 "args": ["-i"]
             },   
         },
-        "files.associations": {
-            "Test_Runner.h": "c",
-            "tasks.h": "c",
-            "stm32f4xx.h": "c",
-            "os.h": "c",
-            "bsp.h": "c",
-            "bsp_gpio.h": "c",
-            "uart.h": "c",
-            "fifo.h": "c"
-        }
     },
     "tasks": {
         "version": "2.0.0",
@@ -41,7 +31,6 @@
                 "args": [
                     "${input:target}",
                     "TEST=${input:test}",
-                    "USE_TEST_RUNNER=${input:use_test_runner}",
                     "DEBUG=${input:debug}"
                 ],
                 "presentation": {

diff --git a/Apps/Inc/Tasks.h b/Apps/Inc/Tasks.h
@@ -18,16 +18,16 @@
 /**
  * Priority Definitions
  */
- #define TASK_FAULT_STATE_PRIO               1
- #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_UPDATE_DISPLAY_PRIO            6
- #define TASK_SEND_CAR_CAN_PRIO              8
- #define TASK_TELEMETRY_PRIO                 9
- #define TASK_DEBUG_DUMP_PRIO                10
- #define TASK_COMMAND_LINE_PRIO              11
+#define TASK_FAULT_STATE_PRIO               1
+#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_UPDATE_DISPLAY_PRIO            6
+#define TASK_SEND_CAR_CAN_PRIO              8
+#define TASK_TELEMETRY_PRIO                 9
+#define TASK_DEBUG_DUMP_PRIO                10
+#define TASK_COMMAND_LINE_PRIO              11
 
 /**
  * Stack Sizes

diff --git a/BSP/STM32F413/Makefile b/BSP/STM32F413/Makefile
@@ -41,16 +41,6 @@ C_SOURCES += \
 $(filter-out ../../Apps/Src/main.c, $(wildcard ../../Apps/Src/*.c))	\
 ../../$(TEST)
 
-# This line adds the test runner if necessary. MotorSim and CarSim currently use nothing from the test runner.
-# TODO: Remove once all of our tests have been integrated with the new test framework
-ifeq ($(USE_TEST_RUNNER), 1)
-ifeq (,$(findstring MotorSim/, $(C_SOURCES)))
-ifeq (,$(findstring CarSim/, $(C_SOURCES)))
-	C_SOURCES += ../../Tests/Leader/Test_Runner.c
-endif
-endif
-endif
-
 # ASM sources
 ASM_SOURCES =  \
 ../../BSP/STM32F413/Src/startup_stm32f413xx.s \

diff --git a/Renode/startup.resc b/Renode/startup.resc
@@ -4,13 +4,13 @@ $motor_bin?=$ORIGIN/../Objects/motor-sim.elf
 $platform=$ORIGIN/stm32f413.repl
 
 EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.DMA.STM32DMA"
-Execute Command          include @${CURDIR}/STM32DMA_Fix.cs
+include $ORIGIN/STM32DMA_Fix.cs
 
 EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.Analog.STM32_ADC"
-Execute Command          include @${CURDIR}/STM32_ADC_Fix.cs
+include $ORIGIN/STM32_ADC_Fix.cs
 
 EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.UART.STM32_UART"
-Execute Command          include @${CURDIR}/STM32_UART_Fix.cs
+include $ORIGIN/STM32_UART_Fix.cs
 
 macro reset
 """

diff --git a/Tests/CarSim/Test_CarSim.c b/Tests/CarSim/Test_CarSim.c
@@ -2,7 +2,6 @@
 #include <stdio.h>
 
 #define TEST_USE_RTOS 0
-#include "Test_Runner.h"
 
 // Handlers
 static void RX_Handler(){

diff --git a/Tests/Leader/Test_Runner.c b/Tests/Leader/Test_Runner.c