From f6b13546bc468989875cc8f159d995465d77584a Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 11:33:48 +0100 Subject: [PATCH 1/8] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index bd5cc7ae..58c5b021 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit bd5cc7ae3ea53040cc832b5d756846d21613d91a +Subproject commit 58c5b02113ade67ae3c9140398d87f1aae03b4d0 From 88959f2208927f6ad0972dbd253444fe2921b3b3 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 11:37:32 +0100 Subject: [PATCH 2/8] implemented api change --- mission/devices/GPSHandler.cpp | 2 +- mission/devices/GPSHandler.h | 2 +- mission/devices/GyroL3GD20Handler.cpp | 2 +- mission/devices/GyroL3GD20Handler.h | 2 +- mission/devices/MGMHandlerLIS3MDL.cpp | 2 +- mission/devices/MGMHandlerLIS3MDL.h | 2 +- mission/devices/MGMHandlerRM3100.cpp | 2 +- mission/devices/MGMHandlerRM3100.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mission/devices/GPSHandler.cpp b/mission/devices/GPSHandler.cpp index fb549eb7..e53ce347 100644 --- a/mission/devices/GPSHandler.cpp +++ b/mission/devices/GPSHandler.cpp @@ -44,7 +44,7 @@ uint32_t GPSHandler::getTransitionDelayMs(Mode_t from, Mode_t to) { } ReturnValue_t GPSHandler::initializeLocalDataPool( - LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { + localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { return HasReturnvaluesIF::RETURN_OK; } diff --git a/mission/devices/GPSHandler.h b/mission/devices/GPSHandler.h index 52ac25be..01a13591 100644 --- a/mission/devices/GPSHandler.h +++ b/mission/devices/GPSHandler.h @@ -29,7 +29,7 @@ protected: void fillCommandAndReplyMap() override; void modeChanged() override; uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override; - ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap, + ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) override; private: diff --git a/mission/devices/GyroL3GD20Handler.cpp b/mission/devices/GyroL3GD20Handler.cpp index 38016531..a984d4a5 100644 --- a/mission/devices/GyroL3GD20Handler.cpp +++ b/mission/devices/GyroL3GD20Handler.cpp @@ -194,7 +194,7 @@ uint32_t GyroHandler::getTransitionDelayMs(Mode_t from, Mode_t to) { } ReturnValue_t GyroHandler::initializeLocalDataPool( - LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { + localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { localDataPoolMap.emplace(L3GD20H::ANG_VELOC_X, new PoolEntry({0.0})); localDataPoolMap.emplace(L3GD20H::ANG_VELOC_Y, diff --git a/mission/devices/GyroL3GD20Handler.h b/mission/devices/GyroL3GD20Handler.h index 5905b26a..20396315 100644 --- a/mission/devices/GyroL3GD20Handler.h +++ b/mission/devices/GyroL3GD20Handler.h @@ -37,7 +37,7 @@ protected: void fillCommandAndReplyMap() override; void modeChanged() override; uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override; - ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap, + ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) override; private: diff --git a/mission/devices/MGMHandlerLIS3MDL.cpp b/mission/devices/MGMHandlerLIS3MDL.cpp index 58740d7d..2445620d 100644 --- a/mission/devices/MGMHandlerLIS3MDL.cpp +++ b/mission/devices/MGMHandlerLIS3MDL.cpp @@ -423,7 +423,7 @@ void MGMHandlerLIS3MDL::modeChanged(void) { } ReturnValue_t MGMHandlerLIS3MDL::initializeLocalDataPool( - LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { + localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { localDataPoolMap.emplace(MGMLIS3MDL::FIELD_STRENGTH_X, new PoolEntry({0.0})); localDataPoolMap.emplace(MGMLIS3MDL::FIELD_STRENGTH_Y, diff --git a/mission/devices/MGMHandlerLIS3MDL.h b/mission/devices/MGMHandlerLIS3MDL.h index 414731db..4a62ba31 100644 --- a/mission/devices/MGMHandlerLIS3MDL.h +++ b/mission/devices/MGMHandlerLIS3MDL.h @@ -52,7 +52,7 @@ protected: const uint8_t *packet) override; void fillCommandAndReplyMap() override; void modeChanged(void) override; - ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap, + ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) override; private: diff --git a/mission/devices/MGMHandlerRM3100.cpp b/mission/devices/MGMHandlerRM3100.cpp index 0fda5fba..62db06a7 100644 --- a/mission/devices/MGMHandlerRM3100.cpp +++ b/mission/devices/MGMHandlerRM3100.cpp @@ -304,7 +304,7 @@ void MGMHandlerRM3100::modeChanged(void) { } ReturnValue_t MGMHandlerRM3100::initializeLocalDataPool( - LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { + localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { localDataPoolMap.emplace(RM3100::FIELD_STRENGTH_X, new PoolEntry({0.0})); localDataPoolMap.emplace(RM3100::FIELD_STRENGTH_Y, diff --git a/mission/devices/MGMHandlerRM3100.h b/mission/devices/MGMHandlerRM3100.h index d735ca45..4af6b627 100644 --- a/mission/devices/MGMHandlerRM3100.h +++ b/mission/devices/MGMHandlerRM3100.h @@ -55,7 +55,7 @@ protected: void fillCommandAndReplyMap() override; void modeChanged(void) override; uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override; - ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap, + ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) override; private: From f965b783f983f220a8bc728f054060d8c5603084 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:03:01 +0100 Subject: [PATCH 3/8] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 58c5b021..d8423be9 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 58c5b02113ade67ae3c9140398d87f1aae03b4d0 +Subproject commit d8423be98cd9b17fced53627d99d2c7252fd6b3c From 7d32303f297632b13d73cde74b687895b9d5d25a Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:05:49 +0100 Subject: [PATCH 4/8] updated cproject f ile --- misc/eclipse/.cproject | 66 +++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index e0ac2c75..7d08be5e 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -795,69 +795,51 @@ - + - - + - - - - - - - + + + + make + -j16 + clean + true + true + true + + + make + -j16 + hardclean + true + true + true + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From 5f59a2792fe0f5ddc9e53686857c44dd0ec8d55a Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:07:11 +0100 Subject: [PATCH 5/8] updated fsfwconfig files --- bsp_hosted/fsfwconfig/FSFWConfig.h | 15 +++++++-------- fsfwconfig/FSFWConfig.h | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h index 261e3d6d..e3def8fe 100644 --- a/bsp_hosted/fsfwconfig/FSFWConfig.h +++ b/bsp_hosted/fsfwconfig/FSFWConfig.h @@ -7,19 +7,18 @@ //! Used to determine whether C++ ostreams are used which can increase //! the binary size significantly. If this is disabled, //! the C stdio functions can be used alternatively -#define FSFW_CPP_OSTREAM_ENABLED 1 +#define FSFW_CPP_OSTREAM_ENABLED 1 -//! More FSFW related printouts. -//! Be careful, this also turns off most diagnostic prinouts! -#define FSFW_ENHANCED_PRINTOUT 0 +//! More FSFW related printouts depending on level. Useful for development. +#define FSFW_VERBOSE_LEVEL 1 //! Can be used to completely disable printouts, even the C stdio ones. -#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0 - #define FSFW_DISABLE_PRINTOUT 0 +#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0 + #define FSFW_DISABLE_PRINTOUT 0 #endif -//! Can be used to enable additional debugging printouts for developing the FSFW -#define FSFW_PRINT_VERBOSITY_LEVEL 0 +//! Can be used to disable the ANSI color sequences for C stdio. +#define FSFW_COLORED_OUTPUT 1 //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1 diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h index 261e3d6d..e3def8fe 100644 --- a/fsfwconfig/FSFWConfig.h +++ b/fsfwconfig/FSFWConfig.h @@ -7,19 +7,18 @@ //! Used to determine whether C++ ostreams are used which can increase //! the binary size significantly. If this is disabled, //! the C stdio functions can be used alternatively -#define FSFW_CPP_OSTREAM_ENABLED 1 +#define FSFW_CPP_OSTREAM_ENABLED 1 -//! More FSFW related printouts. -//! Be careful, this also turns off most diagnostic prinouts! -#define FSFW_ENHANCED_PRINTOUT 0 +//! More FSFW related printouts depending on level. Useful for development. +#define FSFW_VERBOSE_LEVEL 1 //! Can be used to completely disable printouts, even the C stdio ones. -#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0 - #define FSFW_DISABLE_PRINTOUT 0 +#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0 + #define FSFW_DISABLE_PRINTOUT 0 #endif -//! Can be used to enable additional debugging printouts for developing the FSFW -#define FSFW_PRINT_VERBOSITY_LEVEL 0 +//! Can be used to disable the ANSI color sequences for C stdio. +#define FSFW_COLORED_OUTPUT 1 //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1 From 84c802baec6963e0ed96ab5b04cc2cb28ec858d3 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:17:05 +0100 Subject: [PATCH 6/8] important fsfw bugfix --- fsfw | 2 +- mission/devices/GyroL3GD20Handler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index d8423be9..f6c88886 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit d8423be98cd9b17fced53627d99d2c7252fd6b3c +Subproject commit f6c88886b830f114fd519cd4aa003a67e0bf964a diff --git a/mission/devices/GyroL3GD20Handler.cpp b/mission/devices/GyroL3GD20Handler.cpp index a984d4a5..9c7bfc4a 100644 --- a/mission/devices/GyroL3GD20Handler.cpp +++ b/mission/devices/GyroL3GD20Handler.cpp @@ -1,4 +1,5 @@ #include +#include GyroHandler::GyroHandler(object_id_t objectId, object_id_t deviceCommunication, CookieIF *comCookie): @@ -171,14 +172,13 @@ ReturnValue_t GyroHandler::interpretDeviceReply(DeviceCommandId_t id, int8_t temperaturOffset = (-1) * packet[L3GD20H::TEMPERATURE_IDX]; float temperature = 25.0 + temperaturOffset; - result = dataset.read(); + PoolReadHelper readSet(&dataset); if(result == HasReturnvaluesIF::RETURN_OK) { dataset.angVelocX = angVelocX; dataset.angVelocY = angVelocY; dataset.angVelocZ = angVelocZ; dataset.temperature = temperature; dataset.setValidity(true, true); - result = dataset.commit(); } break; } From fa4e442eacd5a0ab83a7802145084e95d6ce7e3d Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:23:31 +0100 Subject: [PATCH 7/8] updated fsfw, moved file --- fsfw | 2 +- mission/devices/GyroL3GD20Handler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index f6c88886..4cf15e9e 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f6c88886b830f114fd519cd4aa003a67e0bf964a +Subproject commit 4cf15e9ec6e98304749afaac8b8ded5b83fe2348 diff --git a/mission/devices/GyroL3GD20Handler.cpp b/mission/devices/GyroL3GD20Handler.cpp index 9c7bfc4a..f1aa6d53 100644 --- a/mission/devices/GyroL3GD20Handler.cpp +++ b/mission/devices/GyroL3GD20Handler.cpp @@ -1,5 +1,5 @@ #include -#include +#include GyroHandler::GyroHandler(object_id_t objectId, object_id_t deviceCommunication, CookieIF *comCookie): From d66ac9e4a6650b1c89fa327f124b81328db6f200 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 14 Jan 2021 12:26:12 +0100 Subject: [PATCH 8/8] bugfix --- mission/devices/GyroL3GD20Handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/GyroL3GD20Handler.cpp b/mission/devices/GyroL3GD20Handler.cpp index f1aa6d53..28cbdbed 100644 --- a/mission/devices/GyroL3GD20Handler.cpp +++ b/mission/devices/GyroL3GD20Handler.cpp @@ -173,7 +173,7 @@ ReturnValue_t GyroHandler::interpretDeviceReply(DeviceCommandId_t id, float temperature = 25.0 + temperaturOffset; PoolReadHelper readSet(&dataset); - if(result == HasReturnvaluesIF::RETURN_OK) { + if(readSet.getReadResult() == HasReturnvaluesIF::RETURN_OK) { dataset.angVelocX = angVelocX; dataset.angVelocY = angVelocY; dataset.angVelocZ = angVelocZ;