From f7196a47916799154525abc8374db7c6fb9972be Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 14 Sep 2022 12:47:15 +0200 Subject: [PATCH 1/8] updated to new fsfw --- fsfw | 2 +- linux/fsfwconfig/FSFWConfig.h.in | 4 ++++ linux/obc/PtmeConfig.h | 1 + mission/memory/NVMParameterBase.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fsfw b/fsfw index cf8fe7ea..bd594123 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e +Subproject commit bd594123a2a1579f505071f9c76d1249433c070e diff --git a/linux/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in index 072c47c8..25772ce7 100644 --- a/linux/fsfwconfig/FSFWConfig.h.in +++ b/linux/fsfwconfig/FSFWConfig.h.in @@ -4,6 +4,10 @@ #include #include +// It is assumed the user has a subsystem and class ID list in some user header files. +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + //! 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 diff --git a/linux/obc/PtmeConfig.h b/linux/obc/PtmeConfig.h index 06aff2e2..aa5c663a 100644 --- a/linux/obc/PtmeConfig.h +++ b/linux/obc/PtmeConfig.h @@ -4,6 +4,7 @@ #include "AxiPtmeConfig.h" #include "fsfw/objectmanager/SystemObject.h" #include "fsfw/returnvalues/returnvalue.h" +#include "returnvalues/classIds.h" #include "linux/obc/PtmeConfig.h" /** diff --git a/mission/memory/NVMParameterBase.h b/mission/memory/NVMParameterBase.h index 4f644fcc..dd02fffe 100644 --- a/mission/memory/NVMParameterBase.h +++ b/mission/memory/NVMParameterBase.h @@ -6,6 +6,7 @@ #include #include "fsfw/returnvalues/returnvalue.h" +#include "returnvalues/classIds.h" class NVMParameterBase { public: From ff3bc7da73fbff1e8063428d117344c10cabe0ec Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 14 Sep 2022 13:18:50 +0200 Subject: [PATCH 2/8] fix for new fsfw --- mission/devices/devicedefinitions/RwDefinitions.h | 1 + 1 file changed, 1 insertion(+) diff --git a/mission/devices/devicedefinitions/RwDefinitions.h b/mission/devices/devicedefinitions/RwDefinitions.h index d6a43622..2923b41b 100644 --- a/mission/devices/devicedefinitions/RwDefinitions.h +++ b/mission/devices/devicedefinitions/RwDefinitions.h @@ -5,6 +5,7 @@ #include #include +#include "events/subsystemIdRanges.h" #include "objects/systemObjectList.h" namespace RwDefinitions { From 4d93368b4c744278f8229f2abc0504ff9b089c9f Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 14 Sep 2022 13:44:43 +0200 Subject: [PATCH 3/8] fixed for new fsfw --- mission/devices/HeaterHandler.h | 2 ++ mission/devices/IMTQHandler.h | 3 +++ mission/devices/RwHandler.h | 3 +++ mission/devices/SolarArrayDeploymentHandler.h | 3 +++ mission/devices/SusHandler.h | 3 +++ mission/devices/SyrlinksHkHandler.h | 1 + mission/system/SusAssembly.h | 2 ++ mission/system/TcsBoardAssembly.h | 3 +++ 8 files changed, 20 insertions(+) diff --git a/mission/devices/HeaterHandler.h b/mission/devices/HeaterHandler.h index 75badf91..b63f4dfe 100644 --- a/mission/devices/HeaterHandler.h +++ b/mission/devices/HeaterHandler.h @@ -18,6 +18,8 @@ #include #include "devices/heaterSwitcherList.h" +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" class PowerSwitchIF; class HealthTableIF; diff --git a/mission/devices/IMTQHandler.h b/mission/devices/IMTQHandler.h index 481d554c..5102b2e0 100644 --- a/mission/devices/IMTQHandler.h +++ b/mission/devices/IMTQHandler.h @@ -5,6 +5,9 @@ #include #include +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + /** * @brief This is the device handler for the ISIS Magnetorquer iMTQ. * diff --git a/mission/devices/RwHandler.h b/mission/devices/RwHandler.h index 008d5746..f9f66bd5 100644 --- a/mission/devices/RwHandler.h +++ b/mission/devices/RwHandler.h @@ -6,6 +6,9 @@ #include #include +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + class GpioIF; /** diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h index 691bdf77..89be12a6 100644 --- a/mission/devices/SolarArrayDeploymentHandler.h +++ b/mission/devices/SolarArrayDeploymentHandler.h @@ -14,6 +14,9 @@ #include +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + /** * @brief This class is used to control the solar array deployment. * diff --git a/mission/devices/SusHandler.h b/mission/devices/SusHandler.h index c1fc08c4..94673c40 100644 --- a/mission/devices/SusHandler.h +++ b/mission/devices/SusHandler.h @@ -7,6 +7,9 @@ #include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "mission/devices/max1227.h" +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + /** * @brief This is the device handler class for the SUS sensor based on the MAX1227 ADC. * diff --git a/mission/devices/SyrlinksHkHandler.h b/mission/devices/SyrlinksHkHandler.h index 44b154f6..a3bf0a67 100644 --- a/mission/devices/SyrlinksHkHandler.h +++ b/mission/devices/SyrlinksHkHandler.h @@ -8,6 +8,7 @@ #include "fsfw/timemanager/Countdown.h" #include "fsfw_hal/linux/gpio/Gpio.h" #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h" +#include "returnvalues/classIds.h" /** * @brief This is the device handler for the syrlinks transceiver. It handles the command diff --git a/mission/system/SusAssembly.h b/mission/system/SusAssembly.h index b9216072..3cce9d86 100644 --- a/mission/system/SusAssembly.h +++ b/mission/system/SusAssembly.h @@ -5,6 +5,8 @@ #include #include "DualLaneAssemblyBase.h" +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" struct SusAssHelper { public: diff --git a/mission/system/TcsBoardAssembly.h b/mission/system/TcsBoardAssembly.h index 10b451b2..6042abaa 100644 --- a/mission/system/TcsBoardAssembly.h +++ b/mission/system/TcsBoardAssembly.h @@ -5,6 +5,9 @@ #include #include +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + struct TcsBoardHelper { TcsBoardHelper(std::array, 16> rtdInfos) : rtdInfos(std::move(rtdInfos)) {} From 63e4448178d48b4047771991757834f2af24eeae Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 14 Sep 2022 16:47:58 +0200 Subject: [PATCH 4/8] run afmt, bump proj files --- linux/csp/CspComIF.cpp | 12 ++++++------ misc/eclipse/.cproject | 24 +++++++++++------------ mission/devices/GomspaceDeviceHandler.cpp | 8 ++++---- mission/devices/GomspaceDeviceHandler.h | 7 +++---- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/linux/csp/CspComIF.cpp b/linux/csp/CspComIF.cpp index 5d8c3fd6..ea508a31 100644 --- a/linux/csp/CspComIF.cpp +++ b/linux/csp/CspComIF.cpp @@ -166,23 +166,23 @@ ReturnValue_t CspComIF::sendMessage(CookieIF* cookie, const uint8_t* sendData, s if (result != 0) { return returnvalue::FAILED; } - } else if(req == GOMSPACE::SpecialRequestTypes::SAVE_TABLE) { - if(sendLen < 2) { + } else if (req == GOMSPACE::SpecialRequestTypes::SAVE_TABLE) { + if (sendLen < 2) { return returnvalue::FAILED; } const TableInfo* tableInfo = reinterpret_cast(sendData); int result = gs_rparam_save(cspAddress, cspCookie->getTimeout(), tableInfo->sourceTable, - tableInfo->targetTable); + tableInfo->targetTable); if (result != 0) { return returnvalue::FAILED; } - } else if(req == GOMSPACE::SpecialRequestTypes::LOAD_TABLE) { - if(sendLen < 2) { + } else if (req == GOMSPACE::SpecialRequestTypes::LOAD_TABLE) { + if (sendLen < 2) { return returnvalue::FAILED; } const TableInfo* tableInfo = reinterpret_cast(sendData); int result = gs_rparam_load(cspAddress, cspCookie->getTimeout(), tableInfo->sourceTable, - tableInfo->targetTable); + tableInfo->targetTable); if (result != 0) { return returnvalue::FAILED; } diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index d30ef1ec..19c18545 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -57,7 +57,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -750,7 +750,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1149,7 +1149,7 @@ - + @@ -1317,7 +1317,7 @@ - + @@ -1386,7 +1386,7 @@ - + diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp index ebfcf2a9..412f2e46 100644 --- a/mission/devices/GomspaceDeviceHandler.cpp +++ b/mission/devices/GomspaceDeviceHandler.cpp @@ -87,7 +87,7 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(DeviceCommandId_t d } case (GOMSPACE::REQUEST_HK_TABLE): { DeviceType devType; - if(getDevType(devType) != returnvalue::OK) { + if (getDevType(devType) != returnvalue::OK) { return returnvalue::FAILED; } result = @@ -99,11 +99,11 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(DeviceCommandId_t d } case (GOMSPACE::REQUEST_CONFIG_TABLE): { DeviceType devType; - if(getDevType(devType) != returnvalue::OK) { + if (getDevType(devType) != returnvalue::OK) { return returnvalue::FAILED; } - result = generateRequestFullCfgTableCmd(devType, tableCfg.cfgTableSize, - deviceCommand, cspCookie); + result = + generateRequestFullCfgTableCmd(devType, tableCfg.cfgTableSize, deviceCommand, cspCookie); if (result != returnvalue::OK) { return result; } diff --git a/mission/devices/GomspaceDeviceHandler.h b/mission/devices/GomspaceDeviceHandler.h index 528cd2dd..af9d3411 100644 --- a/mission/devices/GomspaceDeviceHandler.h +++ b/mission/devices/GomspaceDeviceHandler.h @@ -93,10 +93,9 @@ class GomspaceDeviceHandler : public DeviceHandlerBase { * @param cspCookie * @return */ - ReturnValue_t generateRequestFullCfgTableCmd(GOMSPACE::DeviceType devType, - uint16_t tableSize, DeviceCommandId_t id, - CspCookie *cspCookie); - ReturnValue_t getDevType(GOMSPACE::DeviceType& type) const; + ReturnValue_t generateRequestFullCfgTableCmd(GOMSPACE::DeviceType devType, uint16_t tableSize, + DeviceCommandId_t id, CspCookie *cspCookie); + ReturnValue_t getDevType(GOMSPACE::DeviceType &type) const; /** * This command handles printing the HK table to the console. This is useful for debugging * purposes From 94a70aa2fc9e114d5a98c11511fa173b10e57d80 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Sep 2022 11:36:04 +0200 Subject: [PATCH 5/8] update .cproject file --- misc/eclipse/.cproject | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 19c18545..9bb5f401 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -1256,7 +1256,7 @@ - + @@ -1268,7 +1268,7 @@ - +