From ec6a398631e04e5e49a3374f6ed5e977782cd30b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 27 May 2022 01:46:51 +0200 Subject: [PATCH] updating RTEMS example --- .gitignore | 1 + CMakeLists.txt | 3 ++- README.md | 2 +- cmake/scripts/{make-debug-cfg.sh => stm32h7-make-debug.sh} | 2 +- example_common | 2 +- fsfw | 2 +- tmtc/common_tmtc | 2 +- tmtc/tmtccmd | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) rename cmake/scripts/{make-debug-cfg.sh => stm32h7-make-debug.sh} (96%) diff --git a/.gitignore b/.gitignore index f9ba00e..c42fa63 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ venv # Build folders /build* +/cmake-build* Makefile* !**/make/Makefile* diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b16bd5..7e2bc69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ set(RTEMS_CMAKE_PATH "${CMAKE_SCRIPT_PATH}/rtems-cmake") set(FSFW_OSAL rtems CACHE STRING "OS for the FSFW") SET(STM32_ADD_NETWORKING_CODE ON) +set(OBSW_MAX_SCHEDULED_TCS 200) set(FSFW_HAL_ADD_STM32H7 ON) # Set TGT_BSP to correct target for pre-project configuration @@ -32,7 +33,7 @@ project(fsfw-example-stm32h7-rtems ASM C CXX) ################################################################################ # Specify the C++ standard -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) # Set names and variables diff --git a/README.md b/README.md index 8e374a3..dd6b8f2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # FSFW Example Application diff --git a/cmake/scripts/make-debug-cfg.sh b/cmake/scripts/stm32h7-make-debug.sh similarity index 96% rename from cmake/scripts/make-debug-cfg.sh rename to cmake/scripts/stm32h7-make-debug.sh index 3733c83..5f8c36a 100755 --- a/cmake/scripts/make-debug-cfg.sh +++ b/cmake/scripts/stm32h7-make-debug.sh @@ -17,7 +17,7 @@ fi build_generator="make" os_fsfw="rtems" -builddir="build-Debug" +builddir="cmake-build-debug" build_type="debug" if [ "${OS}" = "Windows_NT" ]; then python="py" diff --git a/example_common b/example_common index a0d775e..d34effb 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit a0d775e086c9fa0506ad656c5e2d863f8f8e7f9b +Subproject commit d34effb278c645fb6532db56521dd4d08eb0f4a6 diff --git a/fsfw b/fsfw index 992784d..c7cf8e7 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 992784d7aed08ced219d0decb8f66beab451b907 +Subproject commit c7cf8e710db2fbf99b37f263f064aabdddf379b5 diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc index 22ea3ee..3cca54f 160000 --- a/tmtc/common_tmtc +++ b/tmtc/common_tmtc @@ -1 +1 @@ -Subproject commit 22ea3eea9278c3f73c0f804dc3618ea004fe224b +Subproject commit 3cca54f66fe72f292787499e1e9bf2497a2cfdbf diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd index 8f2289c..e24faa1 160000 --- a/tmtc/tmtccmd +++ b/tmtc/tmtccmd @@ -1 +1 @@ -Subproject commit 8f2289ceef004334401127e8a756cb2d49b1ad0c +Subproject commit e24faa1500d96a8afa7f7aed32fcb020eb2e1335