diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index c660af1b759d09c0490fd1bb36493407e0adea21..38852e8975cdd4496e36f965293a27bcdfb38140 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -213,23 +213,23 @@ } }, { - "name": "stm32f429zi_parafoil", + "name": "stm32f429zi_skyward_parafoil", "cStandard": "c11", "cppStandard": "c++11", "compilerPath": "/opt/arm-miosix-eabi/bin/arm-miosix-eabi-g++", "defines": [ "DEBUG", "_ARCH_CORTEXM4_STM32F4", - "_BOARD_STM32F429ZI_PARAFOIL", - "_MIOSIX_BOARDNAME=stm32f429zi_parafoil", + "_BOARD_STM32F429ZI_SKYWARD_PARAFOIL", + "_MIOSIX_BOARDNAME=stm32f429zi_skyward_parafoil", "HSE_VALUE=8000000", "SYSCLK_FREQ_168MHz=168000000", "_MIOSIX", "__cplusplus=201103L" ], "includePath": [ - "${workspaceFolder}/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_parafoil", - "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_parafoil", + "${workspaceFolder}/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_skyward_parafoil", + "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_parafoil", "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/common", "${workspaceFolder}/libs/miosix-kernel/miosix/arch/common", "${workspaceFolder}/libs/miosix-kernel/miosix", @@ -243,8 +243,8 @@ ], "browse": { "path": [ - "${workspaceFolder}/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_parafoil", - "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_parafoil", + "${workspaceFolder}/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_skyward_parafoil", + "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_parafoil", "${workspaceFolder}/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/common", "${workspaceFolder}/libs/miosix-kernel/miosix/stdlib_integration", "${workspaceFolder}/libs/miosix-kernel/miosix/arch/common", @@ -373,4 +373,4 @@ } ], "version": 4 -} \ No newline at end of file +} diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c74ae2dea01fdf9b725f65b7dcb8e1f3feb510..f7a55228cdd5d6724a274cd40f0c6d7947d04f0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ add_executable(config-dsgamma src/entrypoints/config-dsgamma.cpp) sbs_target(config-dsgamma stm32f429zi_stm32f4discovery) add_executable(imu-calibration src/entrypoints/imu-calibration.cpp) -sbs_target(imu-calibration stm32f429zi_parafoil) +sbs_target(imu-calibration stm32f429zi_skyward_parafoil) add_executable(mxgui-helloworld src/entrypoints/examples/mxgui-helloworld.cpp) sbs_target(mxgui-helloworld stm32f429zi_stm32f4discovery) @@ -133,13 +133,13 @@ add_executable(test-kalman-benchmark src/tests/algorithms/Kalman/test-kalman-ben sbs_target(test-kalman-benchmark stm32f429zi_stm32f4discovery) add_executable(test-attitude-parafoil src/tests/algorithms/NAS/test-attitude-parafoil.cpp) -sbs_target(test-attitude-parafoil stm32f429zi_parafoil) +sbs_target(test-attitude-parafoil stm32f429zi_skyward_parafoil) add_executable(test-attitude-stack src/tests/algorithms/NAS/test-attitude-stack.cpp) sbs_target(test-attitude-stack stm32f429zi_skyward_death_stack_x) add_executable(test-nas-parafoil src/tests/algorithms/NAS/test-nas-parafoil.cpp) -sbs_target(test-nas-parafoil stm32f429zi_parafoil) +sbs_target(test-nas-parafoil stm32f429zi_skyward_parafoil) add_executable(test-nas-stack src/tests/algorithms/NAS/test-nas-stack.cpp) sbs_target(test-nas-stack stm32f429zi_skyward_death_stack_x) @@ -151,7 +151,7 @@ add_executable(test-triad src/tests/algorithms/NAS/test-triad.cpp) sbs_target(test-triad stm32f429zi_skyward_death_stack_x) add_executable(test-triad-parafoil src/tests/algorithms/NAS/test-triad-parafoil.cpp) -sbs_target(test-triad-parafoil stm32f429zi_parafoil) +sbs_target(test-triad-parafoil stm32f429zi_skyward_parafoil) add_executable(test-ada src/tests/algorithms/ADA/test-ada.cpp) sbs_target(test-ada stm32f429zi_skyward_death_stack_v3) @@ -349,7 +349,7 @@ add_executable(test-max31855 src/tests/sensors/test-max31855.cpp) sbs_target(test-max31855 stm32f429zi_stm32f4discovery) add_executable(test-mpu9250 src/tests/sensors/test-mpu9250.cpp) -sbs_target(test-mpu9250 stm32f429zi_parafoil) +sbs_target(test-mpu9250 stm32f429zi_skyward_parafoil) add_executable(test-ms5803 src/tests/sensors/test-ms5803.cpp) sbs_target(test-ms5803 stm32f429zi_skyward_death_stack_x) diff --git a/libs/miosix-kernel b/libs/miosix-kernel index 80ae230d328892074ef362c46f8ed72ec07a3141..2ddb024b1fb009ac9e4da75140cea4020a88c921 160000 --- a/libs/miosix-kernel +++ b/libs/miosix-kernel @@ -1 +1 @@ -Subproject commit 80ae230d328892074ef362c46f8ed72ec07a3141 +Subproject commit 2ddb024b1fb009ac9e4da75140cea4020a88c921 diff --git a/libs/mxgui b/libs/mxgui index 3ce4e0588633ead6328e65b1e711ea39375a805e..4416880780cbf6f3aa4792d4260a15554c89fa6b 160000 --- a/libs/mxgui +++ b/libs/mxgui @@ -1 +1 @@ -Subproject commit 3ce4e0588633ead6328e65b1e711ea39375a805e +Subproject commit 4416880780cbf6f3aa4792d4260a15554c89fa6b