From f64d707f4c42daea95f9f2fa315f9dc6479e985c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 14 Feb 2021 14:55:33 +0100 Subject: [PATCH] moved stuff to linux folder --- CMakeLists.txt | 7 ++----- bsp_q7s/comIF/CMakeLists.txt | 4 ---- linux/CMakeLists.txt | 2 ++ linux/csp/CMakeLists.txt | 8 ++++++++ {bsp_q7s/comIF => linux/csp}/CspComIF.cpp | 3 +-- {bsp_q7s/comIF => linux/csp}/CspComIF.h | 0 {bsp_q7s/comIF/cookies => linux/csp}/CspCookie.cpp | 0 {bsp_q7s/comIF/cookies => linux/csp}/CspCookie.h | 0 linux/i2c/CMakeLists.txt | 8 ++++++++ {bsp_q7s/comIF => linux/i2c}/I2cComIF.cpp | 5 +++-- {bsp_q7s/comIF => linux/i2c}/I2cComIF.h | 2 +- {bsp_q7s/comIF/cookies => linux/i2c}/I2cCookie.cpp | 2 +- {bsp_q7s/comIF/cookies => linux/i2c}/I2cCookie.h | 0 13 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 linux/csp/CMakeLists.txt rename {bsp_q7s/comIF => linux/csp}/CspComIF.cpp (99%) rename {bsp_q7s/comIF => linux/csp}/CspComIF.h (100%) rename {bsp_q7s/comIF/cookies => linux/csp}/CspCookie.cpp (100%) rename {bsp_q7s/comIF/cookies => linux/csp}/CspCookie.h (100%) create mode 100644 linux/i2c/CMakeLists.txt rename {bsp_q7s/comIF => linux/i2c}/I2cComIF.cpp (98%) rename {bsp_q7s/comIF => linux/i2c}/I2cComIF.h (97%) rename {bsp_q7s/comIF/cookies => linux/i2c}/I2cCookie.cpp (90%) rename {bsp_q7s/comIF/cookies => linux/i2c}/I2cCookie.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c726931..36a531d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,12 +58,9 @@ if(TGT_BSP) if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi") set(ROOT_CONFIG_FOLDER TRUE) set(FSFW_CONFIG_PATH "fsfwconfig") + set(ADD_LINUX_FILES TRUE) + set(ADD_CSP_LIB TRUE) endif() - - if(${TGT_BSP} MATCHES "arm/q7s") - set(ADD_CSP_LIB TRUE) - endif() - set(ADD_LINUX_FILES TRUE) else() # Required by FSFW library set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") diff --git a/bsp_q7s/comIF/CMakeLists.txt b/bsp_q7s/comIF/CMakeLists.txt index a2236937..0599b73f 100644 --- a/bsp_q7s/comIF/CMakeLists.txt +++ b/bsp_q7s/comIF/CMakeLists.txt @@ -1,8 +1,4 @@ target_sources(${TARGET_NAME} PRIVATE - cookies/CspCookie.cpp - cookies/I2cCookie.cpp - CspComIF.cpp - I2cComIF.cpp ) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index c102da2f..b8aa76cf 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,2 +1,4 @@ add_subdirectory(gpio) +add_subdirectory(i2c) +add_subdirectory(csp) diff --git a/linux/csp/CMakeLists.txt b/linux/csp/CMakeLists.txt new file mode 100644 index 00000000..b5b2768e --- /dev/null +++ b/linux/csp/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(${TARGET_NAME} PUBLIC + CspComIF.cpp + CspCookie.cpp +) + + + + diff --git a/bsp_q7s/comIF/CspComIF.cpp b/linux/csp/CspComIF.cpp similarity index 99% rename from bsp_q7s/comIF/CspComIF.cpp rename to linux/csp/CspComIF.cpp index 9d7543c3..64808eff 100644 --- a/bsp_q7s/comIF/CspComIF.cpp +++ b/linux/csp/CspComIF.cpp @@ -1,5 +1,5 @@ #include "CspComIF.h" -#include "cookies/CspCookie.h" +#include "CspCookie.h" #include #include @@ -7,7 +7,6 @@ CspComIF::CspComIF(object_id_t objectId) : SystemObject(objectId) { - } CspComIF::~CspComIF() { diff --git a/bsp_q7s/comIF/CspComIF.h b/linux/csp/CspComIF.h similarity index 100% rename from bsp_q7s/comIF/CspComIF.h rename to linux/csp/CspComIF.h diff --git a/bsp_q7s/comIF/cookies/CspCookie.cpp b/linux/csp/CspCookie.cpp similarity index 100% rename from bsp_q7s/comIF/cookies/CspCookie.cpp rename to linux/csp/CspCookie.cpp diff --git a/bsp_q7s/comIF/cookies/CspCookie.h b/linux/csp/CspCookie.h similarity index 100% rename from bsp_q7s/comIF/cookies/CspCookie.h rename to linux/csp/CspCookie.h diff --git a/linux/i2c/CMakeLists.txt b/linux/i2c/CMakeLists.txt new file mode 100644 index 00000000..179abd06 --- /dev/null +++ b/linux/i2c/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(${TARGET_NAME} PUBLIC + I2cComIF.cpp + I2cCookie.cpp +) + + + + diff --git a/bsp_q7s/comIF/I2cComIF.cpp b/linux/i2c/I2cComIF.cpp similarity index 98% rename from bsp_q7s/comIF/I2cComIF.cpp rename to linux/i2c/I2cComIF.cpp index 8cbd45b3..2f1d710a 100644 --- a/bsp_q7s/comIF/I2cComIF.cpp +++ b/linux/i2c/I2cComIF.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "I2cComIF.h" +#include + #include #include #include diff --git a/bsp_q7s/comIF/I2cComIF.h b/linux/i2c/I2cComIF.h similarity index 97% rename from bsp_q7s/comIF/I2cComIF.h rename to linux/i2c/I2cComIF.h index 7bf339ad..5e75a280 100644 --- a/bsp_q7s/comIF/I2cComIF.h +++ b/linux/i2c/I2cComIF.h @@ -1,9 +1,9 @@ #ifndef BSP_Q7S_COMIF_I2COMIF_H_ #define BSP_Q7S_COMIF_I2COMIF_H_ +#include "I2cCookie.h" #include #include -#include #include #include diff --git a/bsp_q7s/comIF/cookies/I2cCookie.cpp b/linux/i2c/I2cCookie.cpp similarity index 90% rename from bsp_q7s/comIF/cookies/I2cCookie.cpp rename to linux/i2c/I2cCookie.cpp index 1b2ee675..7f86bdc3 100644 --- a/bsp_q7s/comIF/cookies/I2cCookie.cpp +++ b/linux/i2c/I2cCookie.cpp @@ -1,4 +1,4 @@ -#include +#include "I2cCookie.h" I2cCookie::I2cCookie(address_t i2cAddress_, size_t maxReplyLen_, std::string deviceFile_) : diff --git a/bsp_q7s/comIF/cookies/I2cCookie.h b/linux/i2c/I2cCookie.h similarity index 100% rename from bsp_q7s/comIF/cookies/I2cCookie.h rename to linux/i2c/I2cCookie.h