From 4c5febe71f87e124fa31741b3dfd7f64f62229b4 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 16:45:37 +0100 Subject: [PATCH 1/7] fsfwconfig fix --- fsfw | 2 +- fsfwconfig/FSFWConfig.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fsfw b/fsfw index 086cbe1e..dcc111e4 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 086cbe1e3950cf6c904609352408a7fa48cc83ef +Subproject commit dcc111e4facf39137fe52d8234361b7d99bdde06 diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h index fe97ee6e..5df83705 100644 --- a/fsfwconfig/FSFWConfig.h +++ b/fsfwconfig/FSFWConfig.h @@ -1,7 +1,6 @@ #ifndef FSFWCONFIG_FSFWCONFIG_H_ #define FSFWCONFIG_FSFWCONFIG_H_ -#include #include //! Used to determine whether C++ ostreams are used From 2f91a1e88153033ffeb0e26abd80d929f6ebba45 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 16:46:01 +0100 Subject: [PATCH 2/7] another fix --- fsfwconfig/objects/systemObjectList.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fsfwconfig/objects/systemObjectList.h b/fsfwconfig/objects/systemObjectList.h index 3b5717fb..05ed2c52 100644 --- a/fsfwconfig/objects/systemObjectList.h +++ b/fsfwconfig/objects/systemObjectList.h @@ -19,7 +19,6 @@ namespace objects { PUS_SERVICE_23 = 0x51002300, PUS_SERVICE_201 = 0x51020100, - TIME_STAMPER = 0x52000001, TM_FUNNEL = 0x52000002, /* Test Task */ From 804871ee27eee5e8f382a6a62b5d5ff8967293d0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 16:56:51 +0100 Subject: [PATCH 3/7] another fix --- fsfwconfig/FSFWConfig.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h index 5df83705..fdfa889a 100644 --- a/fsfwconfig/FSFWConfig.h +++ b/fsfwconfig/FSFWConfig.h @@ -2,6 +2,7 @@ #define FSFWCONFIG_FSFWCONFIG_H_ #include +#include //! Used to determine whether C++ ostreams are used //! Those can lead to code bloat. @@ -14,12 +15,6 @@ //! Can be used to enable debugging printouts for developing the FSFW #define FSFW_DEBUGGING 0 -//! Defines the FIFO depth of each commanding service base which -//! also determines how many commands a CSB service can handle in one cycle -//! simulataneously. This will increase the required RAM for -//! each CSB service ! -#define FSFW_CSB_FIFO_DEPTH 6 - //! If FSFW_OBJ_EVENT_TRANSLATION is set to one, //! additional output which requires the translation files translateObjects //! and translateEvents (and their compiled source files) @@ -48,6 +43,12 @@ static constexpr uint8_t FSFW_MISSION_TIMESTAMP_SIZE = 8; static constexpr size_t FSFW_EVENTMGMR_MATCHTREE_NODES = 240; static constexpr size_t FSFW_EVENTMGMT_EVENTIDMATCHERS = 120; static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS = 120; + +//! Defines the FIFO depth of each commanding service base which +//! also determines how many commands a CSB service can handle in one cycle +//! simulataneously. This will increase the required RAM for +//! each CSB service ! +static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6; } #endif /* FSFWCONFIG_FSFWCONFIG_H_ */ From 90d1b601be01658898fc886c08d407c688c41d35 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:00:38 +0100 Subject: [PATCH 4/7] more fixes --- bsp_linux/InitMission.cpp | 4 ---- fsfwconfig/cdatapool/dataPoolInit.cpp | 5 ----- fsfwconfig/cdatapool/dataPoolInit.h | 13 ------------- 3 files changed, 22 deletions(-) delete mode 100644 fsfwconfig/cdatapool/dataPoolInit.cpp delete mode 100644 fsfwconfig/cdatapool/dataPoolInit.h diff --git a/bsp_linux/InitMission.cpp b/bsp_linux/InitMission.cpp index cf84ab0d..d076c680 100644 --- a/bsp_linux/InitMission.cpp +++ b/bsp_linux/InitMission.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -29,9 +28,6 @@ ServiceInterfaceStream sif::error("ERROR", true, false, true); ObjectManagerIF *objectManager = nullptr; -//Initialize Data Pool -DataPool dataPool(nullptr); - void InitMission::initMission() { sif::info << "Building global objects.." << std::endl; /* Instantiate global object manager and also create all objects */ diff --git a/fsfwconfig/cdatapool/dataPoolInit.cpp b/fsfwconfig/cdatapool/dataPoolInit.cpp deleted file mode 100644 index fd536af5..00000000 --- a/fsfwconfig/cdatapool/dataPoolInit.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include - -void datapool::dataPoolInit(std::map* poolMap) { - -} diff --git a/fsfwconfig/cdatapool/dataPoolInit.h b/fsfwconfig/cdatapool/dataPoolInit.h deleted file mode 100644 index f97fe7a3..00000000 --- a/fsfwconfig/cdatapool/dataPoolInit.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ -#define FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ - -#include - -namespace datapool{ - void dataPoolInit(std::map* poolMap); - - enum datapoolvariables { - NO_PARAMETER = 0, - }; -} -#endif /* FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ */ From 3688b2b4659101c825e916cd4d35217bf493d77e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:04:15 +0100 Subject: [PATCH 5/7] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index e0c896e6..9be8713f 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f +Subproject commit 9be8713fa0cc6128e9469da2e635365b03146de3 From f447a1bdeff60ccba709e35c3528acca1ab66906 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:14:26 +0100 Subject: [PATCH 6/7] another fix --- mission/devices/MGMHandlerLIS3MDL.cpp | 4 ++-- tmtc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mission/devices/MGMHandlerLIS3MDL.cpp b/mission/devices/MGMHandlerLIS3MDL.cpp index 1cc83bf8..5de4f719 100644 --- a/mission/devices/MGMHandlerLIS3MDL.cpp +++ b/mission/devices/MGMHandlerLIS3MDL.cpp @@ -154,7 +154,7 @@ ReturnValue_t MGMHandlerLIS3MDL::buildCommandFromCommand( return setOperatingMode(commandData, commandDataLen); } default: - lastSentCommand = DeviceHandlerIF::NO_COMMAND; + lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID; return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED; } return HasReturnvaluesIF::RETURN_FAILED; @@ -283,7 +283,7 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id, } default: { - return DeviceHandlerIF::UNKNOW_DEVICE_REPLY; + return DeviceHandlerIF::UNKNOWN_DEVICE_REPLY; } } diff --git a/tmtc b/tmtc index e0c896e6..9be8713f 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f +Subproject commit 9be8713fa0cc6128e9469da2e635365b03146de3 From e475cc408b45eefd20f25dae16880514c9aa0d74 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:15:59 +0100 Subject: [PATCH 7/7] fix --- mission/devices/MGMHandlerLIS3MDL.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/MGMHandlerLIS3MDL.h b/mission/devices/MGMHandlerLIS3MDL.h index b400daee..a5a1cadf 100644 --- a/mission/devices/MGMHandlerLIS3MDL.h +++ b/mission/devices/MGMHandlerLIS3MDL.h @@ -144,7 +144,7 @@ private: * As this is a SPI Device, we get the Answer of the last sent command in * the next read cycle, so we could check the command for identification. */ - DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND; + DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID; /** * We always update all registers together, so this method updates