From 6c7b1a9e14ca0df2e7126106a8ad5c390146c1c1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Jun 2021 15:58:56 +0200 Subject: [PATCH 01/39] slight adaptions --- cmake/scripts/Q7S/simple/simple_make_debug_cfg.sh | 2 +- cmake/scripts/Q7S/simple/simple_ninja_debug_cfg.sh | 2 +- cmake/scripts/cmake_build_config.py | 0 3 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 cmake/scripts/cmake_build_config.py diff --git a/cmake/scripts/Q7S/simple/simple_make_debug_cfg.sh b/cmake/scripts/Q7S/simple/simple_make_debug_cfg.sh index b692184a..8a6c7b3f 100755 --- a/cmake/scripts/Q7S/simple/simple_make_debug_cfg.sh +++ b/cmake/scripts/Q7S/simple/simple_make_debug_cfg.sh @@ -31,5 +31,5 @@ fi echo "Running command (without the leading +):" set -x # Print command ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ - -l"${build_dir}" -d "${definitions}" + -l "${build_dir}" -d "${definitions}" # set +x diff --git a/cmake/scripts/Q7S/simple/simple_ninja_debug_cfg.sh b/cmake/scripts/Q7S/simple/simple_ninja_debug_cfg.sh index a3a55521..965aae45 100755 --- a/cmake/scripts/Q7S/simple/simple_ninja_debug_cfg.sh +++ b/cmake/scripts/Q7S/simple/simple_ninja_debug_cfg.sh @@ -29,6 +29,6 @@ fi echo "Running command (without the leading +):" set -x # Print command ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ - -l"${build_dir}" -d "${definitions}" + -l "${build_dir}" -d "${definitions}" # set +x diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py old mode 100644 new mode 100755 From 3895eea24b6c6c4af38752682ee6dac43368d9d9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Jun 2021 16:15:46 +0200 Subject: [PATCH 02/39] added file system test --- bsp_q7s/CMakeLists.txt | 3 ++- bsp_q7s/boardconfig/q7sConfig.h.in | 2 ++ bsp_q7s/boardtest/CMakeLists.txt | 1 + bsp_q7s/boardtest/FileSystemTest.cpp | 14 ++++++++++++++ bsp_q7s/boardtest/FileSystemTest.h | 18 ++++++++++++++++++ bsp_q7s/simple/simple.cpp | 11 +++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 bsp_q7s/boardtest/FileSystemTest.cpp create mode 100644 bsp_q7s/boardtest/FileSystemTest.h diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt index bc027af0..d0ee0800 100644 --- a/bsp_q7s/CMakeLists.txt +++ b/bsp_q7s/CMakeLists.txt @@ -2,12 +2,13 @@ target_sources(${TARGET_NAME} PUBLIC main.cpp ) +add_subdirectory(boardtest) + if(Q7S_SIMPLE_MODE) add_subdirectory(simple) else() add_subdirectory(boardconfig) add_subdirectory(comIF) - add_subdirectory(boardtest) add_subdirectory(gpio) add_subdirectory(core) endif() diff --git a/bsp_q7s/boardconfig/q7sConfig.h.in b/bsp_q7s/boardconfig/q7sConfig.h.in index 6ee84821..bf509f0d 100644 --- a/bsp_q7s/boardconfig/q7sConfig.h.in +++ b/bsp_q7s/boardconfig/q7sConfig.h.in @@ -11,4 +11,6 @@ #define Q7S_ADD_SPI_TEST 0 #endif +#define Q7S_SIMPLE_ADD_FILE_SYSTEM_TEST 0 + #endif /* BSP_Q7S_BOARDCONFIG_Q7S_CONFIG_H_ */ diff --git a/bsp_q7s/boardtest/CMakeLists.txt b/bsp_q7s/boardtest/CMakeLists.txt index 0599b73f..9a5c0a0a 100644 --- a/bsp_q7s/boardtest/CMakeLists.txt +++ b/bsp_q7s/boardtest/CMakeLists.txt @@ -1,4 +1,5 @@ target_sources(${TARGET_NAME} PRIVATE + FileSystemTest.cpp ) diff --git a/bsp_q7s/boardtest/FileSystemTest.cpp b/bsp_q7s/boardtest/FileSystemTest.cpp new file mode 100644 index 00000000..fa504b0c --- /dev/null +++ b/bsp_q7s/boardtest/FileSystemTest.cpp @@ -0,0 +1,14 @@ +#include "FileSystemTest.h" + +#include +#include + +FileSystemTest::FileSystemTest() { + using namespace std; + SdCard sdCard = SdCard::SDC0; + cout << "SD Card Test for SD card " << static_cast(sdCard) << std::endl; + //std::system("echo Hello World"); +} + +FileSystemTest::~FileSystemTest() { +} diff --git a/bsp_q7s/boardtest/FileSystemTest.h b/bsp_q7s/boardtest/FileSystemTest.h new file mode 100644 index 00000000..907c86ca --- /dev/null +++ b/bsp_q7s/boardtest/FileSystemTest.h @@ -0,0 +1,18 @@ +#ifndef BSP_Q7S_BOARDTEST_FILESYSTEMTEST_H_ +#define BSP_Q7S_BOARDTEST_FILESYSTEMTEST_H_ + +enum SdCard { + SDC0, + SDC1 +}; + +class FileSystemTest { +public: + FileSystemTest(); + virtual~ FileSystemTest(); +private: +}; + + + +#endif /* BSP_Q7S_BOARDTEST_FILESYSTEMTEST_H_ */ diff --git a/bsp_q7s/simple/simple.cpp b/bsp_q7s/simple/simple.cpp index 6261bfe3..cc85c04f 100644 --- a/bsp_q7s/simple/simple.cpp +++ b/bsp_q7s/simple/simple.cpp @@ -1,5 +1,16 @@ #include "simple.h" +#include "q7sConfig.h" + +#if Q7S_SIMPLE_ADD_FILE_SYSTEM_TEST == 1 +#include "../boardtest/FileSystemTest.h" +#endif int simple::simple() { +#if Q7S_SIMPLE_ADD_FILE_SYSTEM_TEST == 1 + { + FileSystemTest fileSystemTest; + } +#endif return 0; } + From 5fc18f444eafb081320d5a89b6dd281c1d97b9f0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 1 Jul 2021 14:53:00 +0200 Subject: [PATCH 03/39] updated tmtc --- bsp_q7s/boardtest/FileSystemTest.cpp | 4 ++-- tmtc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/boardtest/FileSystemTest.cpp b/bsp_q7s/boardtest/FileSystemTest.cpp index fa504b0c..449d559c 100644 --- a/bsp_q7s/boardtest/FileSystemTest.cpp +++ b/bsp_q7s/boardtest/FileSystemTest.cpp @@ -6,8 +6,8 @@ FileSystemTest::FileSystemTest() { using namespace std; SdCard sdCard = SdCard::SDC0; - cout << "SD Card Test for SD card " << static_cast(sdCard) << std::endl; - //std::system("echo Hello World"); + cout << "SD Card Test for SD card qg" << static_cast(sdCard) << std::endl; + std::system("echo Hello World"); } FileSystemTest::~FileSystemTest() { diff --git a/tmtc b/tmtc index 9d98eb6b..941f4640 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 9d98eb6b606b40fa26aad12786894d1a99cb726c +Subproject commit 941f46401e13fb6ee5fc653875eebff8496133ec From 8862e0c3cb9d3669238a216cbd909888fbdf138a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 5 Jul 2021 10:14:32 +0200 Subject: [PATCH 04/39] updated project file --- misc/eclipse/.cproject | 196 ++++------------------------------------- 1 file changed, 19 insertions(+), 177 deletions(-) diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index a562e7b2..fc222429 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -19,25 +19,25 @@ - + - @@ -77,19 +77,23 @@ - @@ -327,7 +331,7 @@