diff --git a/.gitignore b/.gitignore index 5286999..7da4202 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ TouchGFX/build /TouchGFX/*_backup.touchgfx /steering-wheel.ioc_bkp /STM32Make.make +/.stm32env diff --git a/.stm32env b/.stm32env deleted file mode 100644 index 95fcabf..0000000 --- a/.stm32env +++ /dev/null @@ -1,7 +0,0 @@ -# environment variable file used by stm32-for-vscode and the STM32Make.make makefile -# Other environment variables can be added here. If wanting to use the generated makefile in CI/CD context please -# configure the following variables: GCC_PATH, OPENOCD - -ARM_GCC_PATH = /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin -OPENOCD = /opt/homebrew/bin/openocd - \ No newline at end of file diff --git a/Makefile b/Makefile index d5665e9..8d9c65e 100644 --- a/Makefile +++ b/Makefile @@ -242,16 +242,16 @@ TouchGFX/App/app_touchgfx.c # ASM sources ASM_SOURCES = \ startup_stm32h7a3xx.s \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_misra.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_context_restore.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_context_save.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_control.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_disable.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_restore.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_schedule.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_stack_build.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_system_return.S \ -Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_timer_interrupt.S +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_misra.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_context_restore.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_context_save.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_control.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_disable.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_interrupt_restore.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_schedule.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_stack_build.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_thread_system_return.s \ +Middlewares/ST/threadx/ports/cortex_m7/gnu/src/tx_timer_interrupt.s ####################################### diff --git a/STM32-for-VSCode.config.yaml b/STM32-for-VSCode.config.yaml index 487831c..9ab6481 100644 --- a/STM32-for-VSCode.config.yaml +++ b/STM32-for-VSCode.config.yaml @@ -117,7 +117,7 @@ includeDirectories: # these should be escaped with a: \ or the name should be in double quotes e.g. "HARDWARE_DRIVER*.c" sourceFiles: - startup_stm32h7a3xx.s - - Middlewares/ST/threadx/ports/cortex_m7/gnu/src/*.S + - Middlewares/ST/threadx/ports/cortex_m7/gnu/src/*.s - Core/Src/main.c - Core/Src/stm32h7xx_it.c - Core/Src/stm32h7xx_hal_msp.c diff --git a/TouchGFX/vehicle_state.c b/TouchGFX/vehicle_state.c index 1cb7758..f835291 120000 --- a/TouchGFX/vehicle_state.c +++ b/TouchGFX/vehicle_state.c @@ -1 +1 @@ -C:/Users/julia/FT/steering-wheel/Core/Src/vehicle_state.c \ No newline at end of file +../Core/Src/vehicle_state.c \ No newline at end of file