diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index b73c7ffe70c2cdd88ec7e4ac336204f949f62211..2d11c2e94d71bb6b12320eb71f40b641e2d12d57 100755 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -186,6 +186,70 @@ }, "configurationProvider": "ms-vscode.cmake-tools" }, + { + "name": "stm32f429zi_skyward_death_stack_x_maker_faire", + "cStandard": "c11", + "cppStandard": "c++11", + "compilerPath": "/opt/arm-miosix-eabi/bin/arm-miosix-eabi-g++", + "defines": [ + "DEBUG", + "HILSimulation", + "_ARCH_CORTEXM4_STM32F4", + "_BOARD_STM32F429ZI_SKYWARD_DEATH_STACK_X_MAKER_FAIRE", + "_MIOSIX_BOARDNAME=stm32f429zi_skyward_death_stack_x_maker_faire", + "HSE_VALUE=8000000", + "SYSCLK_FREQ_168MHz=168000000", + "_MIOSIX", + "__cplusplus=201103L" + ], + "includePath": [ + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/common", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/common", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix", + "${workspaceFolder}/skyward-boardcore/libs/Catch2/single_include", + "${workspaceFolder}/skyward-boardcore/libs/mavlink-skyward-lib", + "${workspaceFolder}/skyward-boardcore/libs/fmt/include", + "${workspaceFolder}/skyward-boardcore/libs/eigen", + "${workspaceFolder}/skyward-boardcore/libs/tscpp", + "${workspaceFolder}/skyward-boardcore/libs", + "${workspaceFolder}/skyward-boardcore/src/shared", + "${workspaceFolder}/skyward-boardcore/src/tests", + "${workspaceFolder}/src/hardware_in_the_loop", + "${workspaceFolder}/src/boards", + "${workspaceFolder}/src/tests", + "${workspaceFolder}/src" + ], + "browse": { + "path": [ + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/config/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/cortexM4_stm32f4/common", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/stdlib_integration", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/arch/common", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/interfaces", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/filesystem", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/kernel", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/util", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/e20", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix/*", + "${workspaceFolder}/skyward-boardcore/libs/miosix-kernel/miosix", + "${workspaceFolder}/skyward-boardcore/libs/mavlink-skyward-lib", + "${workspaceFolder}/skyward-boardcore/libs/eigen", + "${workspaceFolder}/skyward-boardcore/libs/tscpp", + "${workspaceFolder}/skyward-boardcore/libs/mxgui", + "${workspaceFolder}/skyward-boardcore/libs/fmt", + "${workspaceFolder}/skyward-boardcore/src/shared", + "${workspaceFolder}/skyward-boardcore/src/tests", + "${workspaceFolder}/src/hardware_in_the_loop", + "${workspaceFolder}/src/boards", + "${workspaceFolder}/src/tests" + ], + "limitSymbolsToIncludedHeaders": true + }, + "configurationProvider": "ms-vscode.cmake-tools" + }, { "name": "stm32f429zi_skyward_death_stack_v3", "cStandard": "c11", @@ -686,4 +750,4 @@ } ], "version": 4 -} +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index a84844c4883b1d5bc27f7482a036c694fc8be3f3..23dec24430f1f9626f9c8c3ac7e9b620b634067c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,18 +54,24 @@ sbs_target(main-entry-milano stm32f429zi_skyward_death_stack_v3) add_executable(main-entry-hil-euroc src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER} ${HIL}) target_include_directories(main-entry-hil-euroc PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(main-entry-hil-euroc PRIVATE HILSimulation EUROC BUZZER_LOW) -sbs_target(main-entry-hil-euroc stm32f429zi_skyward_death_stack_v3) +target_compile_definitions(main-entry-hil-euroc PRIVATE HILSimulation EUROC BUZZER_LOW USE_SERIAL_TRANSCEIVER INTERP) +sbs_target(main-entry-hil-euroc stm32f429zi_stm32f4discovery) add_executable(main-entry-hil-roccaraso src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER} ${HIL}) target_include_directories(main-entry-hil-roccaraso PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(main-entry-hil-roccaraso PRIVATE HILSimulation ROCCARASO BUZZER_LOW) -sbs_target(main-entry-hil-roccaraso stm32f429zi_skyward_death_stack_v3) +target_compile_definitions(main-entry-hil-roccaraso PRIVATE HILSimulation ROCCARASO BUZZER_LOW USE_SERIAL_TRANSCEIVER INTERP) +sbs_target(main-entry-hil-roccaraso stm32f429zi_stm32f4discovery) add_executable(main-entry-hil-milano src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER} ${HIL}) target_include_directories(main-entry-hil-milano PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(main-entry-hil-milano PRIVATE HILSimulation MILANO BUZZER_LOW) -sbs_target(main-entry-hil-milano stm32f429zi_skyward_death_stack_v3) +target_compile_definitions(main-entry-hil-milano PRIVATE HILSimulation MILANO BUZZER_LOW USE_SERIAL_TRANSCEIVER) +sbs_target(main-entry-hil-milano stm32f429zi_stm32f4discovery) + +add_executable(main-entry-hil-maker-faire src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER} ${HIL}) +target_include_directories(main-entry-hil-maker-faire PRIVATE ${OBSW_INCLUDE_DIRS}) +target_compile_definitions(main-entry-hil-maker-faire PRIVATE HILSimulation EUROC BUZZER_LOW USE_SERIAL_TRANSCEIVER INTERP) +sbs_target(main-entry-hil-maker-faire stm32f429zi_skyward_death_stack_x_maker_faire) +# sbs_target(main-entry-hil-maker-faire stm32f429zi_stm32f4discovery) add_executable(payload-entry src/entrypoints/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER}) target_include_directories(payload-entry PRIVATE ${OBSW_INCLUDE_DIRS}) diff --git a/skyward-boardcore b/skyward-boardcore index 1a1b05292f84eb41563c0321024be338080d5a57..e69670394bf3a76b37c4fcebdb617886e6847aaf 160000 --- a/skyward-boardcore +++ b/skyward-boardcore @@ -1 +1 @@ -Subproject commit 1a1b05292f84eb41563c0321024be338080d5a57 +Subproject commit e69670394bf3a76b37c4fcebdb617886e6847aaf diff --git a/src/boards/Main/Configs/SensorsConfig.h b/src/boards/Main/Configs/SensorsConfig.h index 05ad0d27c22b287fe8a6964098680fb31ff187f7..e2c9b27459c7bdf5790c10e8a6b5c0defeb81476 100644 --- a/src/boards/Main/Configs/SensorsConfig.h +++ b/src/boards/Main/Configs/SensorsConfig.h @@ -24,7 +24,6 @@ #include <drivers/adc/InternalADC.h> #include <drivers/usart/USART.h> -#include <interfaces-impl/hwmapping.h> #include <sensors/ADS131M04/ADS131M04.h> #include <sensors/BMX160/BMX160Config.h> #include <sensors/LIS3MDL/LIS3MDL.h>