From 700a15bd8080b42492b70e50b886611f26499bbe Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 27 Oct 2021 17:09:41 +0200 Subject: [PATCH] updated STM32 FreeRTOS example --- CMakeLists.txt | 1 + bsp_stm32h7_freertos/boardtest/CMakeLists.txt | 1 + bsp_stm32h7_freertos/boardtest/SpiTest.cpp | 4 ++++ bsp_stm32h7_freertos/boardtest/SpiTest.h | 12 ++++++++++++ bsp_stm32h7_freertos/core/InitMission.cpp | 4 ++-- bsp_stm32h7_freertos/core/ObjectFactory.cpp | 4 ++-- bsp_stm32h7_freertos/main.cpp | 2 +- example_common | 2 +- fsfw | 2 +- misc/eclipse/fsfw-stm32h7-freertos-debug.launch | 3 +++ tmtc/common_tmtc | 2 +- tmtc/tmtccmd | 2 +- 12 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 bsp_stm32h7_freertos/boardtest/SpiTest.cpp create mode 100644 bsp_stm32h7_freertos/boardtest/SpiTest.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d188520..8fa66ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED True) +set(FSFW_OSAL "freertos") set(TGT_BSP "arm/stm32h743zi-nucleo") set(FREERTOS_NAMESPACE FreeRTOS::STM32::H7::M7) diff --git a/bsp_stm32h7_freertos/boardtest/CMakeLists.txt b/bsp_stm32h7_freertos/boardtest/CMakeLists.txt index ac3c2a0..5be2fa1 100644 --- a/bsp_stm32h7_freertos/boardtest/CMakeLists.txt +++ b/bsp_stm32h7_freertos/boardtest/CMakeLists.txt @@ -1,3 +1,4 @@ target_sources(${TARGET_NAME} PRIVATE + SpiTest.cpp ) diff --git a/bsp_stm32h7_freertos/boardtest/SpiTest.cpp b/bsp_stm32h7_freertos/boardtest/SpiTest.cpp new file mode 100644 index 0000000..af9def1 --- /dev/null +++ b/bsp_stm32h7_freertos/boardtest/SpiTest.cpp @@ -0,0 +1,4 @@ +#include "SpiTest.h" + +SpiTest::SpiTest(SpiComIF &spiComIF) { +} diff --git a/bsp_stm32h7_freertos/boardtest/SpiTest.h b/bsp_stm32h7_freertos/boardtest/SpiTest.h new file mode 100644 index 0000000..dbac307 --- /dev/null +++ b/bsp_stm32h7_freertos/boardtest/SpiTest.h @@ -0,0 +1,12 @@ +#ifndef BSP_STM32H7_FREERTOS_BOARDTEST_SPITEST_H_ +#define BSP_STM32H7_FREERTOS_BOARDTEST_SPITEST_H_ + +#include "fsfw_hal/stm32h7/spi/SpiComIF.h" + +class SpiTest { +public: + SpiTest(SpiComIF& spiComIF); +private: +}; + +#endif /* BSP_STM32H7_FREERTOS_BOARDTEST_SPITEST_H_ */ diff --git a/bsp_stm32h7_freertos/core/InitMission.cpp b/bsp_stm32h7_freertos/core/InitMission.cpp index b06a720..6d0fc16 100644 --- a/bsp_stm32h7_freertos/core/InitMission.cpp +++ b/bsp_stm32h7_freertos/core/InitMission.cpp @@ -3,8 +3,8 @@ #include "objects/systemObjectList.h" #include "pollingsequence/pollingSequenceFactory.h" -#include "mission/utility/TaskCreation.h" -#include "mission/assemblies/TestAssembly.h" +#include "example/utility/TaskCreation.h" +#include "fsfw_tests/integration/assemblies/TestAssembly.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/serviceinterface/ServiceInterface.h" diff --git a/bsp_stm32h7_freertos/core/ObjectFactory.cpp b/bsp_stm32h7_freertos/core/ObjectFactory.cpp index cfdce0b..1335143 100644 --- a/bsp_stm32h7_freertos/core/ObjectFactory.cpp +++ b/bsp_stm32h7_freertos/core/ObjectFactory.cpp @@ -4,8 +4,8 @@ #include "objects/systemObjectList.h" #include "hardware_init.h" -#include "mission/utility/TmFunnel.h" -#include "mission/core/GenericFactory.h" +#include "example/utility/TmFunnel.h" +#include "example/core/GenericFactory.h" #include "example_common/stm32h7/networking/UdpTcLwIpPollingTask.h" #include "example_common/stm32h7/networking/TmTcLwIpUdpBridge.h" diff --git a/bsp_stm32h7_freertos/main.cpp b/bsp_stm32h7_freertos/main.cpp index d464d4b..35682a1 100644 --- a/bsp_stm32h7_freertos/main.cpp +++ b/bsp_stm32h7_freertos/main.cpp @@ -10,7 +10,7 @@ #include "core/InitMission.h" #include "core/ObjectFactory.h" -#include "example_common/utility/utility.h" +#include "example/utility/utility.h" #include #include diff --git a/example_common b/example_common index a0d775e..473461a 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit a0d775e086c9fa0506ad656c5e2d863f8f8e7f9b +Subproject commit 473461a61d7636f76607217396551de4c4c5e2dd diff --git a/fsfw b/fsfw index 992784d..105d59a 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 992784d7aed08ced219d0decb8f66beab451b907 +Subproject commit 105d59a1f5801629f9882f7c5cb25d0a9d36a5c2 diff --git a/misc/eclipse/fsfw-stm32h7-freertos-debug.launch b/misc/eclipse/fsfw-stm32h7-freertos-debug.launch index 1520abb..673b121 100644 --- a/misc/eclipse/fsfw-stm32h7-freertos-debug.launch +++ b/misc/eclipse/fsfw-stm32h7-freertos-debug.launch @@ -56,6 +56,9 @@ + + + diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc index 117213a..99ca187 160000 --- a/tmtc/common_tmtc +++ b/tmtc/common_tmtc @@ -1 +1 @@ -Subproject commit 117213a922e71f6a058998305c01d98c878cb856 +Subproject commit 99ca187b50ad9cd6ee1ba4bcbf9db981bed653ae diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd index 8f2289c..4d71822 160000 --- a/tmtc/tmtccmd +++ b/tmtc/tmtccmd @@ -1 +1 @@ -Subproject commit 8f2289ceef004334401127e8a756cb2d49b1ad0c +Subproject commit 4d71822fa1f1cfc16ccd4d0fb750eb2900a263b2