From 079da3b0e4f9d49b79154aba8b14749a799e6937 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Mar 2023 16:05:01 +0200 Subject: [PATCH 1/5] more ACS cleaning - STR code is now in mission folder, but still only conpiled for Q7S code because wire library is proprietary --- CMakeLists.txt | 1 - bsp_q7s/core/ObjectFactory.cpp | 8 +++--- dummies/StarTrackerDummy.cpp | 2 +- linux/acs/CMakeLists.txt | 10 +++---- .../GpsHyperionLinuxController.cpp | 0 .../GpsHyperionLinuxController.h | 0 linux/acs/{startracker => }/StrComHandler.cpp | 7 +++-- linux/acs/{startracker => }/StrComHandler.h | 3 ++- linux/acs/startracker/helpers.cpp | 7 ----- linux/acs/startracker/helpers.h | 17 ------------ linux/devices/CMakeLists.txt | 4 --- mission/acs/CMakeLists.txt | 5 ++++ mission/acs/imtqHelpers.h | 3 +++ .../acs/str}/ArcsecDatalinkLayer.cpp | 2 +- .../acs/str}/ArcsecDatalinkLayer.h | 2 +- .../acs/str}/ArcsecJsonParamBase.cpp | 3 ++- .../acs/str}/ArcsecJsonParamBase.h | 3 ++- .../acs/str}/CMakeLists.txt | 2 +- .../acs/str}/StarTrackerHandler.cpp | 27 +++++++++---------- .../acs/str}/StarTrackerHandler.h | 8 +++--- .../acs/str}/arcsecJsonKeys.h | 0 mission/acs/str/strHelpers.cpp | 7 +++++ .../acs/str/strHelpers.h | 7 +++++ .../acs/str}/strJsonCommands.cpp | 3 ++- .../acs/str}/strJsonCommands.h | 3 ++- mission/controller/ThermalController.cpp | 2 +- mission/controller/ThermalController.h | 2 +- mission/controller/acs/SensorValues.h | 2 +- thirdparty/CMakeLists.txt | 5 ++++ thirdparty/arcsec_star_tracker | 2 +- 30 files changed, 74 insertions(+), 73 deletions(-) rename linux/{devices => acs}/GpsHyperionLinuxController.cpp (100%) rename linux/{devices => acs}/GpsHyperionLinuxController.h (100%) rename linux/acs/{startracker => }/StrComHandler.cpp (99%) rename linux/acs/{startracker => }/StrComHandler.h (99%) delete mode 100644 linux/acs/startracker/helpers.cpp delete mode 100644 linux/acs/startracker/helpers.h rename {linux/acs/startracker => mission/acs/str}/ArcsecDatalinkLayer.cpp (97%) rename {linux/acs/startracker => mission/acs/str}/ArcsecDatalinkLayer.h (97%) rename {linux/acs/startracker => mission/acs/str}/ArcsecJsonParamBase.cpp (97%) rename {linux/acs/startracker => mission/acs/str}/ArcsecJsonParamBase.h (98%) rename {linux/acs/startracker => mission/acs/str}/CMakeLists.txt (62%) rename {linux/acs/startracker => mission/acs/str}/StarTrackerHandler.cpp (99%) rename {linux/acs/startracker => mission/acs/str}/StarTrackerHandler.h (99%) rename {linux/acs/startracker => mission/acs/str}/arcsecJsonKeys.h (100%) create mode 100644 mission/acs/str/strHelpers.cpp rename linux/devices/devicedefinitions/StarTrackerDefinitions.h => mission/acs/str/strHelpers.h (99%) rename {linux/acs/startracker => mission/acs/str}/strJsonCommands.cpp (99%) rename {linux/acs/startracker => mission/acs/str}/strJsonCommands.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6798ded7..f0ab6abe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,7 +407,6 @@ add_subdirectory(thirdparty) if(EIVE_ADD_LINUX_FILES) if(TGT_BSP MATCHES "arm/q7s") add_subdirectory(${LIB_GOMSPACE_PATH}) - add_subdirectory(${LIB_ARCSEC_PATH}) endif() add_subdirectory(${LINUX_PATH}) endif() diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index bd3917d5..ba7a0c99 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -2,13 +2,16 @@ #include #include +#include #include #include -#include +#include #include #include #include #include +#include +#include #include #include #include @@ -33,16 +36,13 @@ #include "eive/definitions.h" #include "fsfw/ipc/QueueFactory.h" #include "linux/ObjectFactory.h" -#include "linux/acs/startracker/StarTrackerHandler.h" #include "linux/boardtest/I2cTestClass.h" #include "linux/boardtest/SpiTestClass.h" #include "linux/boardtest/UartTestClass.h" #include "linux/callbacks/gpioCallbacks.h" #include "linux/csp/CspComIF.h" -#include "linux/devices/GpsHyperionLinuxController.h" #include "linux/devices/ScexUartReader.h" #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h" -#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" #include "linux/devices/ploc/PlocMPSoCHandler.h" #include "linux/devices/ploc/PlocMPSoCHelper.h" #include "linux/devices/ploc/PlocMemoryDumper.h" diff --git a/dummies/StarTrackerDummy.cpp b/dummies/StarTrackerDummy.cpp index 71f0030c..5ee53b8c 100644 --- a/dummies/StarTrackerDummy.cpp +++ b/dummies/StarTrackerDummy.cpp @@ -1,6 +1,6 @@ #include "StarTrackerDummy.h" -#include +#include StarTrackerDummy::StarTrackerDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/linux/acs/CMakeLists.txt b/linux/acs/CMakeLists.txt index 532dced3..99cacbc2 100644 --- a/linux/acs/CMakeLists.txt +++ b/linux/acs/CMakeLists.txt @@ -1,7 +1,7 @@ -target_sources(${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp - RwPollingTask.cpp SusPolling.cpp) +target_sources( + ${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp RwPollingTask.cpp + SusPolling.cpp StrComHandler.cpp) -# Dependency on proprietary library -if(TGT_BSP MATCHES "arm/q7s") - add_subdirectory(startracker) +if(EIVE_BUILD_GPSD_GPS_HANDLER) + target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp) endif() diff --git a/linux/devices/GpsHyperionLinuxController.cpp b/linux/acs/GpsHyperionLinuxController.cpp similarity index 100% rename from linux/devices/GpsHyperionLinuxController.cpp rename to linux/acs/GpsHyperionLinuxController.cpp diff --git a/linux/devices/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h similarity index 100% rename from linux/devices/GpsHyperionLinuxController.h rename to linux/acs/GpsHyperionLinuxController.h diff --git a/linux/acs/startracker/StrComHandler.cpp b/linux/acs/StrComHandler.cpp similarity index 99% rename from linux/acs/startracker/StrComHandler.cpp rename to linux/acs/StrComHandler.cpp index 3dfa2169..c0fe3c45 100644 --- a/linux/acs/startracker/StrComHandler.cpp +++ b/linux/acs/StrComHandler.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -12,8 +13,6 @@ #include "OBSWConfig.h" #include "eive/definitions.h" #include "fsfw/timemanager/Countdown.h" -#include "helpers.h" -#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" #include "mission/utility/Filenaming.h" #include "mission/utility/ProgressPrinter.h" #include "mission/utility/Timestamp.h" @@ -554,12 +553,12 @@ ReturnValue_t StrComHandler::sendAndRead(size_t size, uint32_t failParameter) { } ReturnValue_t StrComHandler::checkActionReply(size_t replySize) { - uint8_t type = str::getReplyFrameType(replyPtr); + uint8_t type = startracker::getReplyFrameType(replyPtr); if (type != TMTC_ACTIONREPLY) { sif::warning << "StrHelper::checkActionReply: Received reply with invalid type ID" << std::endl; return INVALID_TYPE_ID; } - uint8_t status = str::getStatusField(replyPtr); + uint8_t status = startracker::getStatusField(replyPtr); if (status != ArcsecDatalinkLayer::STATUS_OK) { sif::warning << "StrHelper::checkActionReply: Status failure: " << static_cast(status) << std::endl; diff --git a/linux/acs/startracker/StrComHandler.h b/linux/acs/StrComHandler.h similarity index 99% rename from linux/acs/startracker/StrComHandler.h rename to linux/acs/StrComHandler.h index b581678c..52210036 100644 --- a/linux/acs/startracker/StrComHandler.h +++ b/linux/acs/StrComHandler.h @@ -1,9 +1,10 @@ #ifndef BSP_Q7S_DEVICES_STRHELPER_H_ #define BSP_Q7S_DEVICES_STRHELPER_H_ +#include + #include -#include "ArcsecDatalinkLayer.h" #include "OBSWConfig.h" #ifdef XIPHOS_Q7S diff --git a/linux/acs/startracker/helpers.cpp b/linux/acs/startracker/helpers.cpp deleted file mode 100644 index 112bc06a..00000000 --- a/linux/acs/startracker/helpers.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "helpers.h" - -uint8_t str::getReplyFrameType(const uint8_t* rawFrame) { return rawFrame[0]; } - -uint8_t str::getId(const uint8_t* rawFrame) { return rawFrame[1]; } - -uint8_t str::getStatusField(const uint8_t* rawFrame) { return rawFrame[2]; } diff --git a/linux/acs/startracker/helpers.h b/linux/acs/startracker/helpers.h deleted file mode 100644 index 9b4f5f9e..00000000 --- a/linux/acs/startracker/helpers.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef LINUX_DEVICES_STARTRACKER_HELPERS_H_ -#define LINUX_DEVICES_STARTRACKER_HELPERS_H_ - -#include "arcsec/common/genericstructs.h" - -namespace str { - -/** - * @brief Returns the frame type field of a decoded frame. - */ -uint8_t getReplyFrameType(const uint8_t* rawFrame); -uint8_t getId(const uint8_t* rawFrame); -uint8_t getStatusField(const uint8_t* rawFrame); - -} // namespace str - -#endif /* LINUX_DEVICES_STARTRACKER_HELPERS_H_ */ diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt index 2530b1cd..1f027fa2 100644 --- a/linux/devices/CMakeLists.txt +++ b/linux/devices/CMakeLists.txt @@ -1,7 +1,3 @@ -if(EIVE_BUILD_GPSD_GPS_HANDLER) - target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp) -endif() - target_sources(${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ScexDleParser.cpp ScexHelper.cpp) diff --git a/mission/acs/CMakeLists.txt b/mission/acs/CMakeLists.txt index 3702df28..e518d948 100644 --- a/mission/acs/CMakeLists.txt +++ b/mission/acs/CMakeLists.txt @@ -11,3 +11,8 @@ target_sources( imtqHelpers.cpp rwHelpers.cpp defs.cpp) + +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(str) +endif() diff --git a/mission/acs/imtqHelpers.h b/mission/acs/imtqHelpers.h index 87b69f8b..8fa2ebf0 100644 --- a/mission/acs/imtqHelpers.h +++ b/mission/acs/imtqHelpers.h @@ -8,6 +8,9 @@ class ImtqHandler; +// C garbage which can be included from gps.h +#undef STATUS_SET + namespace imtq { enum class RequestType : uint8_t { MEASURE_NO_ACTUATION, ACTUATE, DO_NOTHING }; diff --git a/linux/acs/startracker/ArcsecDatalinkLayer.cpp b/mission/acs/str/ArcsecDatalinkLayer.cpp similarity index 97% rename from linux/acs/startracker/ArcsecDatalinkLayer.cpp rename to mission/acs/str/ArcsecDatalinkLayer.cpp index 29043e32..532c12b8 100644 --- a/linux/acs/startracker/ArcsecDatalinkLayer.cpp +++ b/mission/acs/str/ArcsecDatalinkLayer.cpp @@ -1,4 +1,4 @@ -#include "ArcsecDatalinkLayer.h" +#include ArcsecDatalinkLayer::ArcsecDatalinkLayer() : decodeRingBuf(BUFFER_LENGTHS, true) { slipInit(); } diff --git a/linux/acs/startracker/ArcsecDatalinkLayer.h b/mission/acs/str/ArcsecDatalinkLayer.h similarity index 97% rename from linux/acs/startracker/ArcsecDatalinkLayer.h rename to mission/acs/str/ArcsecDatalinkLayer.h index bfc82d90..404d9e52 100644 --- a/linux/acs/startracker/ArcsecDatalinkLayer.h +++ b/mission/acs/str/ArcsecDatalinkLayer.h @@ -3,11 +3,11 @@ #include #include +#include #include "arcsec/common/misc.h" #include "eive/resultClassIds.h" #include "fsfw/returnvalues/returnvalue.h" -#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" /** * @brief Helper class to handle the datalinklayer of replies from the star tracker of arcsec. diff --git a/linux/acs/startracker/ArcsecJsonParamBase.cpp b/mission/acs/str/ArcsecJsonParamBase.cpp similarity index 97% rename from linux/acs/startracker/ArcsecJsonParamBase.cpp rename to mission/acs/str/ArcsecJsonParamBase.cpp index 04afb75f..b5dd2150 100644 --- a/linux/acs/startracker/ArcsecJsonParamBase.cpp +++ b/mission/acs/str/ArcsecJsonParamBase.cpp @@ -1,4 +1,5 @@ -#include "ArcsecJsonParamBase.h" +#include +#include #include "arcsecJsonKeys.h" diff --git a/linux/acs/startracker/ArcsecJsonParamBase.h b/mission/acs/str/ArcsecJsonParamBase.h similarity index 98% rename from linux/acs/startracker/ArcsecJsonParamBase.h rename to mission/acs/str/ArcsecJsonParamBase.h index ff457016..90c54f45 100644 --- a/linux/acs/startracker/ArcsecJsonParamBase.h +++ b/mission/acs/str/ArcsecJsonParamBase.h @@ -1,6 +1,8 @@ #ifndef BSP_Q7S_DEVICES_STARTRACKER_ARCSECJSONPARAMBASE_H_ #define BSP_Q7S_DEVICES_STARTRACKER_ARCSECJSONPARAMBASE_H_ +#include + #include #include #include @@ -9,7 +11,6 @@ #include "arcsec/common/genericstructs.h" #include "eive/resultClassIds.h" #include "fsfw/returnvalues/returnvalue.h" -#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" using json = nlohmann::json; diff --git a/linux/acs/startracker/CMakeLists.txt b/mission/acs/str/CMakeLists.txt similarity index 62% rename from linux/acs/startracker/CMakeLists.txt rename to mission/acs/str/CMakeLists.txt index 24dbaf8e..edb3494c 100644 --- a/linux/acs/startracker/CMakeLists.txt +++ b/mission/acs/str/CMakeLists.txt @@ -1,4 +1,4 @@ target_sources( ${OBSW_NAME} PRIVATE StarTrackerHandler.cpp strJsonCommands.cpp ArcsecDatalinkLayer.cpp - ArcsecJsonParamBase.cpp StrComHandler.cpp helpers.cpp) + ArcsecJsonParamBase.cpp strHelpers.cpp) diff --git a/linux/acs/startracker/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp similarity index 99% rename from linux/acs/startracker/StarTrackerHandler.cpp rename to mission/acs/str/StarTrackerHandler.cpp index 448afc91..a2af1771 100644 --- a/linux/acs/startracker/StarTrackerHandler.cpp +++ b/mission/acs/str/StarTrackerHandler.cpp @@ -1,10 +1,11 @@ -#include "StarTrackerHandler.h" - #include #include #include #include #include +#include +#include +#include #include #include @@ -12,8 +13,6 @@ #include "OBSWConfig.h" #include "arcsec/common/misc.h" -#include "helpers.h" -#include "strJsonCommands.h" std::atomic_bool JCFG_DONE(false); @@ -831,26 +830,26 @@ ReturnValue_t StarTrackerHandler::scanForReply(const uint8_t* start, size_t rema return returnvalue::FAILED; } - switch (str::getReplyFrameType(start)) { + switch (startracker::getReplyFrameType(start)) { case TMTC_ACTIONREPLY: { *foundLen = remainingSize - bytesLeft; - result = scanForActionReply(str::getId(start), foundId); + result = scanForActionReply(startracker::getId(start), foundId); break; } case TMTC_SETPARAMREPLY: { *foundLen = remainingSize - bytesLeft; - result = scanForSetParameterReply(str::getId(start), foundId); + result = scanForSetParameterReply(startracker::getId(start), foundId); break; } case TMTC_PARAMREPLY: { *foundLen = remainingSize - bytesLeft; - result = scanForGetParameterReply(str::getId(start), foundId); + result = scanForGetParameterReply(startracker::getId(start), foundId); break; } case TMTC_TELEMETRYREPLYA: case TMTC_TELEMETRYREPLY: { *foundLen = remainingSize - bytesLeft; - result = scanForTmReply(str::getId(start), foundId); + result = scanForTmReply(startracker::getId(start), foundId); break; } default: { @@ -1818,7 +1817,7 @@ ReturnValue_t StarTrackerHandler::prepareRequestDebugCameraParams() { } ReturnValue_t StarTrackerHandler::handleSetParamReply(const uint8_t* rawFrame) { - uint8_t status = str::getStatusField(rawFrame); + uint8_t status = startracker::getStatusField(rawFrame); if (status != startracker::STATUS_OK) { sif::warning << "StarTrackerHandler::handleSetParamReply: Failed to execute parameter set " " command with parameter ID" @@ -1835,7 +1834,7 @@ ReturnValue_t StarTrackerHandler::handleSetParamReply(const uint8_t* rawFrame) { } ReturnValue_t StarTrackerHandler::handleActionReply(const uint8_t* rawFrame) { - uint8_t status = str::getStatusField(rawFrame); + uint8_t status = startracker::getStatusField(rawFrame); if (status != startracker::STATUS_OK) { sif::warning << "StarTrackerHandler::handleActionReply: Failed to execute action " << "command with action ID " @@ -1903,7 +1902,7 @@ ReturnValue_t StarTrackerHandler::handleParamRequest(const uint8_t* rawFrame, ReturnValue_t StarTrackerHandler::handlePingReply(const uint8_t* rawFrame) { ReturnValue_t result = returnvalue::OK; uint32_t pingId = 0; - uint8_t status = str::getStatusField(rawFrame); + uint8_t status = startracker::getStatusField(rawFrame); const uint8_t* buffer = rawFrame + ACTION_DATA_OFFSET; size_t size = sizeof(pingId); SerializeAdapter::deSerialize(&pingId, &buffer, &size, SerializeIF::Endianness::LITTLE); @@ -1956,7 +1955,7 @@ ReturnValue_t StarTrackerHandler::checkProgram() { ReturnValue_t StarTrackerHandler::handleTm(const uint8_t* rawFrame, LocalPoolDataSetBase& dataset, size_t size) { ReturnValue_t result = returnvalue::OK; - uint8_t status = str::getStatusField(rawFrame); + uint8_t status = startracker::getStatusField(rawFrame); if (status != startracker::STATUS_OK) { sif::warning << "StarTrackerHandler::handleTm: Reply error: " << static_cast(status) << std::endl; @@ -1987,7 +1986,7 @@ ReturnValue_t StarTrackerHandler::handleTm(const uint8_t* rawFrame, LocalPoolDat ReturnValue_t StarTrackerHandler::handleActionReplySet(const uint8_t* rawFrame, LocalPoolDataSetBase& dataset, size_t size) { ReturnValue_t result = returnvalue::OK; - uint8_t status = str::getStatusField(rawFrame); + uint8_t status = startracker::getStatusField(rawFrame); if (status != startracker::STATUS_OK) { sif::warning << "StarTrackerHandler::handleActionReplySet: Reply error: " << static_cast(status) << std::endl; diff --git a/linux/acs/startracker/StarTrackerHandler.h b/mission/acs/str/StarTrackerHandler.h similarity index 99% rename from linux/acs/startracker/StarTrackerHandler.h rename to mission/acs/str/StarTrackerHandler.h index 821aa3b2..c1acc545 100644 --- a/linux/acs/startracker/StarTrackerHandler.h +++ b/mission/acs/str/StarTrackerHandler.h @@ -2,19 +2,19 @@ #define MISSION_DEVICES_STARTRACKERHANDLER_H_ #include +#include +#include +#include +#include #include -#include "ArcsecJsonParamBase.h" #include "OBSWConfig.h" -#include "StrComHandler.h" #include "arcsec/common/SLIP.h" #include "devices/powerSwitcherList.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/src/fsfw/serialize/SerializeAdapter.h" #include "fsfw/timemanager/Countdown.h" -#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" -#include "strJsonCommands.h" /** * @brief This is the device handler for the star tracker from arcsec. diff --git a/linux/acs/startracker/arcsecJsonKeys.h b/mission/acs/str/arcsecJsonKeys.h similarity index 100% rename from linux/acs/startracker/arcsecJsonKeys.h rename to mission/acs/str/arcsecJsonKeys.h diff --git a/mission/acs/str/strHelpers.cpp b/mission/acs/str/strHelpers.cpp new file mode 100644 index 00000000..c6d59c7a --- /dev/null +++ b/mission/acs/str/strHelpers.cpp @@ -0,0 +1,7 @@ +#include + +uint8_t startracker::getReplyFrameType(const uint8_t* rawFrame) { return rawFrame[0]; } + +uint8_t startracker::getId(const uint8_t* rawFrame) { return rawFrame[1]; } + +uint8_t startracker::getStatusField(const uint8_t* rawFrame) { return rawFrame[2]; } diff --git a/linux/devices/devicedefinitions/StarTrackerDefinitions.h b/mission/acs/str/strHelpers.h similarity index 99% rename from linux/devices/devicedefinitions/StarTrackerDefinitions.h rename to mission/acs/str/strHelpers.h index be115a78..002d9934 100644 --- a/linux/devices/devicedefinitions/StarTrackerDefinitions.h +++ b/mission/acs/str/strHelpers.h @@ -11,6 +11,13 @@ namespace startracker { +/** + * @brief Returns the frame type field of a decoded frame. + */ +uint8_t getReplyFrameType(const uint8_t* rawFrame); +uint8_t getId(const uint8_t* rawFrame); +uint8_t getStatusField(const uint8_t* rawFrame); + /** This is the address of the star tracker */ static const uint8_t ADDRESS = 33; diff --git a/linux/acs/startracker/strJsonCommands.cpp b/mission/acs/str/strJsonCommands.cpp similarity index 99% rename from linux/acs/startracker/strJsonCommands.cpp rename to mission/acs/str/strJsonCommands.cpp index 0a47cb87..134a00a0 100644 --- a/linux/acs/startracker/strJsonCommands.cpp +++ b/mission/acs/str/strJsonCommands.cpp @@ -1,4 +1,5 @@ -#include "strJsonCommands.h" +#include +#include #include "arcsecJsonKeys.h" diff --git a/linux/acs/startracker/strJsonCommands.h b/mission/acs/str/strJsonCommands.h similarity index 98% rename from linux/acs/startracker/strJsonCommands.h rename to mission/acs/str/strJsonCommands.h index 381246a6..99588f9c 100644 --- a/linux/acs/startracker/strJsonCommands.h +++ b/mission/acs/str/strJsonCommands.h @@ -7,9 +7,10 @@ * @author J. Meier */ +#include + #include -#include "ArcsecJsonParamBase.h" #include "fsfw/serviceinterface/ServiceInterface.h" /** diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 3879339d..9f86254b 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -5,10 +5,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index e091042b..543353d8 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -7,10 +7,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h index 03bc22c4..a0473ae2 100644 --- a/mission/controller/acs/SensorValues.h +++ b/mission/controller/acs/SensorValues.h @@ -4,10 +4,10 @@ #include #include #include -#include #include #include #include +#include #include #include diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 7455bdae..e300cd11 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -2,4 +2,9 @@ if(EIVE_ADD_LINUX_FILES) add_subdirectory(tas) endif() +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(arcsec_star_tracker) +endif() + add_subdirectory(rapidcsv) diff --git a/thirdparty/arcsec_star_tracker b/thirdparty/arcsec_star_tracker index cbb3b24d..2823952e 160000 --- a/thirdparty/arcsec_star_tracker +++ b/thirdparty/arcsec_star_tracker @@ -1 +1 @@ -Subproject commit cbb3b24dc1993b727735fd63576088401ba351ec +Subproject commit 2823952e0902726e6e35dd7c159761f76bf7e505 From 7c700a9e19e6b101a61de0aaf60ce455e0c9a583 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Mar 2023 16:13:54 +0200 Subject: [PATCH 2/5] clean up power code --- bsp_q7s/callbacks/pcduSwitchCb.h | 4 ++-- bsp_q7s/core/CoreController.h | 2 +- bsp_q7s/core/ObjectFactory.cpp | 14 +++++++------- bsp_q7s/em/emObjectFactory.cpp | 2 +- bsp_q7s/fmObjectFactory.cpp | 2 +- common/config/devices/powerSwitcherList.h | 2 +- dummies/AcuDummy.cpp | 2 +- dummies/BpxDummy.cpp | 2 +- dummies/GpsCtrlDummy.h | 2 +- dummies/GpsDhbDummy.cpp | 2 +- dummies/P60DockDummy.cpp | 2 +- dummies/PcduHandlerDummy.cpp | 2 +- dummies/PduDummy.cpp | 2 +- dummies/PduDummy.h | 3 +-- dummies/PlPcduDummy.cpp | 2 +- dummies/helpers.cpp | 2 +- linux/acs/GpsHyperionLinuxController.h | 3 ++- linux/boardtest/I2cTestClass.h | 3 +-- linux/csp/CspComIF.cpp | 2 +- mission/CMakeLists.txt | 1 + .../archive}/GPSDefinitions.h | 6 +++--- mission/acs/archive/GPSHyperionHandler.cpp | 3 ++- mission/acs/archive/GPSHyperionHandler.h | 3 ++- mission/controller/ThermalController.cpp | 4 ++-- mission/controller/ThermalController.h | 4 ++-- mission/controller/acs/SensorValues.h | 2 +- mission/core/GenericFactory.cpp | 2 +- mission/csp/CspCookie.h | 3 +-- mission/devices/CMakeLists.txt | 9 +-------- mission/devices/PayloadPcduHandler.h | 2 +- mission/devices/RadiationSensorHandler.cpp | 2 +- .../ACUHandler.cpp => power/AcuHandler.cpp} | 2 +- .../ACUHandler.h => power/AcuHandler.h} | 10 +++++----- .../{devices => power}/BpxBatteryHandler.cpp | 3 +-- mission/{devices => power}/BpxBatteryHandler.h | 8 ++++---- mission/power/CMakeLists.txt | 9 +++++++++ .../GomSpacePackets.h | 8 ++++---- .../GomspaceDeviceHandler.cpp | 8 +++----- .../{devices => power}/GomspaceDeviceHandler.h | 10 +++++----- mission/{devices => power}/P60DockHandler.cpp | 3 +-- mission/{devices => power}/P60DockHandler.h | 10 +++++----- mission/{devices => power}/PcduHandler.cpp | 4 ++-- mission/{devices => power}/PcduHandler.h | 13 ++++++------- mission/{devices => power}/Pdu1Handler.cpp | 4 ++-- mission/{devices => power}/Pdu1Handler.h | 4 ++-- mission/{devices => power}/Pdu2Handler.cpp | 4 ++-- mission/{devices => power}/Pdu2Handler.h | 11 +++++------ .../bpxBattDefs.h} | 6 +++--- .../powerDefinitions.h => power/defs.h} | 18 +++++++++++++++--- .../GomspaceDefinitions.h => power/gsDefs.h} | 8 ++++---- .../gomspaceDefines.h => power/gsLibDefs.h} | 6 +++--- mission/powerDefs.h | 16 ---------------- mission/system/DualLanePowerStateMachine.h | 2 +- mission/system/acs/acsModeTree.cpp | 2 +- mission/system/fdir/GomspacePowerFdir.cpp | 2 +- mission/system/objects/PowerStateMachineBase.h | 2 +- mission/system/objects/Stack5VHandler.h | 3 +-- mission/system/tree/payloadModeTree.cpp | 2 +- 58 files changed, 133 insertions(+), 141 deletions(-) rename mission/{devices/devicedefinitions => acs/archive}/GPSDefinitions.h (94%) rename mission/{devices/ACUHandler.cpp => power/AcuHandler.cpp} (99%) rename mission/{devices/ACUHandler.h => power/AcuHandler.h} (87%) rename mission/{devices => power}/BpxBatteryHandler.cpp (99%) rename mission/{devices => power}/BpxBatteryHandler.h (92%) create mode 100644 mission/power/CMakeLists.txt rename mission/{devices/devicedefinitions => power}/GomSpacePackets.h (97%) rename mission/{devices => power}/GomspaceDeviceHandler.cpp (99%) rename mission/{devices => power}/GomspaceDeviceHandler.h (96%) rename mission/{devices => power}/P60DockHandler.cpp (99%) rename mission/{devices => power}/P60DockHandler.h (92%) rename mission/{devices => power}/PcduHandler.cpp (99%) rename mission/{devices => power}/PcduHandler.h (95%) rename mission/{devices => power}/Pdu1Handler.cpp (98%) rename mission/{devices => power}/Pdu1Handler.h (96%) rename mission/{devices => power}/Pdu2Handler.cpp (98%) rename mission/{devices => power}/Pdu2Handler.h (89%) rename mission/{devices/devicedefinitions/BpxBatteryDefinitions.h => power/bpxBattDefs.h} (97%) rename mission/{devices/devicedefinitions/powerDefinitions.h => power/defs.h} (68%) rename mission/{devices/devicedefinitions/GomspaceDefinitions.h => power/gsDefs.h} (99%) rename mission/{devices/devicedefinitions/gomspaceDefines.h => power/gsLibDefs.h} (80%) delete mode 100644 mission/powerDefs.h diff --git a/bsp_q7s/callbacks/pcduSwitchCb.h b/bsp_q7s/callbacks/pcduSwitchCb.h index d0f2b748..4c006978 100644 --- a/bsp_q7s/callbacks/pcduSwitchCb.h +++ b/bsp_q7s/callbacks/pcduSwitchCb.h @@ -1,9 +1,9 @@ #ifndef BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_ #define BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_ -#include +#include -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" +#include namespace pcdu { diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h index aaaba8ac..b95298ee 100644 --- a/bsp_q7s/core/CoreController.h +++ b/bsp_q7s/core/CoreController.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -14,7 +15,6 @@ #include "bsp_q7s/fs/SdCardManager.h" #include "events/subsystemIdRanges.h" #include "fsfw/controller/ExtendedControllerBase.h" -#include "mission/devices/devicedefinitions/GPSDefinitions.h" #include "mission/trace.h" class Timer; diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index ba7a0c99..06f02e1e 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -79,9 +79,13 @@ using gpio::Levels; #include #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -106,16 +110,12 @@ using gpio::Levels; #include "mission/com/CcsdsIpCoreHandler.h" #include "mission/com/syrlinksDefs.h" #include "mission/core/GenericFactory.h" -#include "mission/devices/ACUHandler.h" -#include "mission/devices/BpxBatteryHandler.h" #include "mission/devices/HeaterHandler.h" #include "mission/devices/Max31865PT1000Handler.h" -#include "mission/devices/P60DockHandler.h" #include "mission/devices/PayloadPcduHandler.h" #include "mission/devices/RadiationSensorHandler.h" #include "mission/devices/SolarArrayDeploymentHandler.h" #include "mission/devices/Tmp1075Handler.h" -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" #include "mission/devices/devicedefinitions/Max31865Definitions.h" #include "mission/devices/devicedefinitions/RadSensorDefinitions.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp index 87237916..153926d0 100644 --- a/bsp_q7s/em/emObjectFactory.cpp +++ b/bsp_q7s/em/emObjectFactory.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp index f3ce12e1..cb1ea118 100644 --- a/bsp_q7s/fmObjectFactory.cpp +++ b/bsp_q7s/fmObjectFactory.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "OBSWConfig.h" #include "bsp_q7s/core/CoreController.h" diff --git a/common/config/devices/powerSwitcherList.h b/common/config/devices/powerSwitcherList.h index d032428b..940d5581 100644 --- a/common/config/devices/powerSwitcherList.h +++ b/common/config/devices/powerSwitcherList.h @@ -1,6 +1,6 @@ #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" +#include #endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */ diff --git a/dummies/AcuDummy.cpp b/dummies/AcuDummy.cpp index aa33a068..7c18f6bf 100644 --- a/dummies/AcuDummy.cpp +++ b/dummies/AcuDummy.cpp @@ -1,6 +1,6 @@ #include "AcuDummy.h" -#include +#include AcuDummy::AcuDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/BpxDummy.cpp b/dummies/BpxDummy.cpp index 0770e9fc..ca546285 100644 --- a/dummies/BpxDummy.cpp +++ b/dummies/BpxDummy.cpp @@ -1,6 +1,6 @@ #include "BpxDummy.h" -#include +#include BpxDummy::BpxDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/GpsCtrlDummy.h b/dummies/GpsCtrlDummy.h index 4b7fc1bf..18b990fb 100644 --- a/dummies/GpsCtrlDummy.h +++ b/dummies/GpsCtrlDummy.h @@ -2,7 +2,7 @@ #define DUMMIES_GPSCTRLDUMMY_H_ #include -#include +#include class GpsCtrlDummy : public ExtendedControllerBase { public: diff --git a/dummies/GpsDhbDummy.cpp b/dummies/GpsDhbDummy.cpp index d46e6265..4e385ec5 100644 --- a/dummies/GpsDhbDummy.cpp +++ b/dummies/GpsDhbDummy.cpp @@ -1,5 +1,5 @@ #include -#include +#include GpsDhbDummy::GpsDhbDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/P60DockDummy.cpp b/dummies/P60DockDummy.cpp index f4e4f9bb..17c48e8c 100644 --- a/dummies/P60DockDummy.cpp +++ b/dummies/P60DockDummy.cpp @@ -1,6 +1,6 @@ #include "P60DockDummy.h" -#include +#include P60DockDummy::P60DockDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/PcduHandlerDummy.cpp b/dummies/PcduHandlerDummy.cpp index 15529fcf..e3331c8d 100644 --- a/dummies/PcduHandlerDummy.cpp +++ b/dummies/PcduHandlerDummy.cpp @@ -1,6 +1,6 @@ #include "PcduHandlerDummy.h" -#include +#include PcduHandlerDummy::PcduHandlerDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie), dummySwitcher(objectId, 18, 18, false) {} diff --git a/dummies/PduDummy.cpp b/dummies/PduDummy.cpp index 4b1efff8..2e3079ef 100644 --- a/dummies/PduDummy.cpp +++ b/dummies/PduDummy.cpp @@ -1,6 +1,6 @@ #include "PduDummy.h" -#include +#include PduDummy::PduDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie), diff --git a/dummies/PduDummy.h b/dummies/PduDummy.h index 751896cd..5d62978c 100644 --- a/dummies/PduDummy.h +++ b/dummies/PduDummy.h @@ -2,8 +2,7 @@ #define DUMMIES_PDUDUMMY_H_ #include - -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" +#include class PduDummy : public DeviceHandlerBase { public: diff --git a/dummies/PlPcduDummy.cpp b/dummies/PlPcduDummy.cpp index 1366f63e..6bfc271f 100644 --- a/dummies/PlPcduDummy.cpp +++ b/dummies/PlPcduDummy.cpp @@ -1,6 +1,6 @@ #include "PlPcduDummy.h" -#include +#include PlPcduDummy::PlPcduDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp index 0ec1d070..00439355 100644 --- a/dummies/helpers.cpp +++ b/dummies/helpers.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include "dummies/Max31865Dummy.h" #include "dummies/Tmp1075Dummy.h" #include "mission/core/GenericFactory.h" -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" #include "mission/system/acs/acsModeTree.h" #include "mission/system/com/comModeTree.h" #include "mission/system/tree/payloadModeTree.h" diff --git a/linux/acs/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h index f00724bd..082853f8 100644 --- a/linux/acs/GpsHyperionLinuxController.h +++ b/linux/acs/GpsHyperionLinuxController.h @@ -1,11 +1,12 @@ #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_ #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_ +#include + #include "eive/eventSubsystemIds.h" #include "fsfw/FSFW.h" #include "fsfw/controller/ExtendedControllerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" -#include "mission/devices/devicedefinitions/GPSDefinitions.h" #include "mission/trace.h" #ifdef FSFW_OSAL_LINUX diff --git a/linux/boardtest/I2cTestClass.h b/linux/boardtest/I2cTestClass.h index 1a578363..299d74c5 100644 --- a/linux/boardtest/I2cTestClass.h +++ b/linux/boardtest/I2cTestClass.h @@ -1,13 +1,12 @@ #ifndef LINUX_BOARDTEST_I2CTESTCLASS_H_ #define LINUX_BOARDTEST_I2CTESTCLASS_H_ +#include #include #include #include -#include "mission/devices/devicedefinitions/BpxBatteryDefinitions.h" - class I2cTestClass : public TestTask { public: I2cTestClass(object_id_t objectId, std::string i2cdev); diff --git a/linux/csp/CspComIF.cpp b/linux/csp/CspComIF.cpp index 554ecba0..d24ebc2e 100644 --- a/linux/csp/CspComIF.cpp +++ b/linux/csp/CspComIF.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt index f1495899..f6435ad8 100644 --- a/mission/CMakeLists.txt +++ b/mission/CMakeLists.txt @@ -7,6 +7,7 @@ add_subdirectory(tmtc) add_subdirectory(system) add_subdirectory(com) add_subdirectory(acs) +add_subdirectory(power) add_subdirectory(csp) add_subdirectory(cfdp) add_subdirectory(config) diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/acs/archive/GPSDefinitions.h similarity index 94% rename from mission/devices/devicedefinitions/GPSDefinitions.h rename to mission/acs/archive/GPSDefinitions.h index 80e2861a..d9f93173 100644 --- a/mission/devices/devicedefinitions/GPSDefinitions.h +++ b/mission/acs/archive/GPSDefinitions.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ +#ifndef MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ +#define MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ #include "eive/eventSubsystemIds.h" #include "fsfw/datapoollocal/StaticLocalDataSet.h" @@ -72,4 +72,4 @@ class GpsPrimaryDataset : public StaticLocalDataSet<18> { : StaticLocalDataSet(hkOwner, GpsHyperion::DATASET_ID) {} }; -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ */ +#endif /* MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ */ diff --git a/mission/acs/archive/GPSHyperionHandler.cpp b/mission/acs/archive/GPSHyperionHandler.cpp index 1bc34959..16451ae3 100644 --- a/mission/acs/archive/GPSHyperionHandler.cpp +++ b/mission/acs/archive/GPSHyperionHandler.cpp @@ -1,6 +1,7 @@ #include "GPSHyperionHandler.h" -#include "devicedefinitions/GPSDefinitions.h" +#include + #include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/timemanager/Clock.h" #include "lwgps/lwgps.h" diff --git a/mission/acs/archive/GPSHyperionHandler.h b/mission/acs/archive/GPSHyperionHandler.h index b5734f23..cbc36fb6 100644 --- a/mission/acs/archive/GPSHyperionHandler.h +++ b/mission/acs/archive/GPSHyperionHandler.h @@ -1,7 +1,8 @@ #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_ #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_ -#include "devicedefinitions/GPSDefinitions.h" +#include + #include "fsfw/FSFW.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "lwgps/lwgps.h" diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 9f86254b..03addc23 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include #include +#include +#include #include ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater) diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index 543353d8..6eddfd76 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -13,16 +13,16 @@ #include #include #include -#include #include #include #include #include +#include +#include #include #include "mission/devices/HeaterHandler.h" -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" #include "mission/trace.h" /** diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h index a0473ae2..177354e2 100644 --- a/mission/controller/acs/SensorValues.h +++ b/mission/controller/acs/SensorValues.h @@ -4,11 +4,11 @@ #include #include #include +#include #include #include #include #include -#include #include namespace ACS { diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp index 433b4191..9e18061c 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/core/GenericFactory.cpp @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/mission/csp/CspCookie.h b/mission/csp/CspCookie.h index 9eb0a639..a77de5d3 100644 --- a/mission/csp/CspCookie.h +++ b/mission/csp/CspCookie.h @@ -2,12 +2,11 @@ #define LINUX_CSP_CSPCOOKIE_H_ #include +#include #include #include -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" - /** * @brief This is the cookie for devices supporting the CSP (CubeSat Space * Protocol). diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt index 1c1717e4..42a2c69a 100644 --- a/mission/devices/CMakeLists.txt +++ b/mission/devices/CMakeLists.txt @@ -1,13 +1,6 @@ target_sources( ${LIB_EIVE_MISSION} - PRIVATE GomspaceDeviceHandler.cpp - BpxBatteryHandler.cpp - Tmp1075Handler.cpp - PcduHandler.cpp - P60DockHandler.cpp - Pdu1Handler.cpp - Pdu2Handler.cpp - ACUHandler.cpp + PRIVATE Tmp1075Handler.cpp Max31865EiveHandler.cpp HeaterHandler.cpp RadiationSensorHandler.cpp diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h index ea98b0ff..2f86ebf9 100644 --- a/mission/devices/PayloadPcduHandler.h +++ b/mission/devices/PayloadPcduHandler.h @@ -11,7 +11,7 @@ #include "fsfw_hal/common/gpio/GpioIF.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/memory/SdCardMountedIF.h" -#include "mission/powerDefs.h" +#include "mission/power/defs.h" #include "mission/system/DualLanePowerStateMachine.h" #ifdef FSFW_OSAL_LINUX diff --git a/mission/devices/RadiationSensorHandler.cpp b/mission/devices/RadiationSensorHandler.cpp index 0520daec..f6500ec2 100644 --- a/mission/devices/RadiationSensorHandler.cpp +++ b/mission/devices/RadiationSensorHandler.cpp @@ -2,8 +2,8 @@ #include #include #include -#include #include +#include RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie, GpioIF *gpioIF, diff --git a/mission/devices/ACUHandler.cpp b/mission/power/AcuHandler.cpp similarity index 99% rename from mission/devices/ACUHandler.cpp rename to mission/power/AcuHandler.cpp index 2a8ffe8b..c7156742 100644 --- a/mission/devices/ACUHandler.cpp +++ b/mission/power/AcuHandler.cpp @@ -1,4 +1,4 @@ -#include "ACUHandler.h" +#include #include "OBSWConfig.h" diff --git a/mission/devices/ACUHandler.h b/mission/power/AcuHandler.h similarity index 87% rename from mission/devices/ACUHandler.h rename to mission/power/AcuHandler.h index ef4feab0..83d0609c 100644 --- a/mission/devices/ACUHandler.h +++ b/mission/power/AcuHandler.h @@ -1,9 +1,9 @@ -#ifndef MISSION_DEVICES_ACUHANDLER_H_ -#define MISSION_DEVICES_ACUHANDLER_H_ +#ifndef MISSION_POWER_ACUHANDLER_H_ +#define MISSION_POWER_ACUHANDLER_H_ -#include +#include +#include -#include "GomspaceDeviceHandler.h" #include "fsfw/datapool/PoolReadGuard.h" /** @@ -53,4 +53,4 @@ class ACUHandler : public GomspaceDeviceHandler { void printChannelStats(); }; -#endif /* MISSION_DEVICES_ACUHANDLER_H_ */ +#endif /* MISSION_POWER_ACUHANDLER_H_ */ diff --git a/mission/devices/BpxBatteryHandler.cpp b/mission/power/BpxBatteryHandler.cpp similarity index 99% rename from mission/devices/BpxBatteryHandler.cpp rename to mission/power/BpxBatteryHandler.cpp index b4bdc307..668b4fb2 100644 --- a/mission/devices/BpxBatteryHandler.cpp +++ b/mission/power/BpxBatteryHandler.cpp @@ -1,6 +1,5 @@ -#include "BpxBatteryHandler.h" - #include +#include BpxBatteryHandler::BpxBatteryHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie) : DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {} diff --git a/mission/devices/BpxBatteryHandler.h b/mission/power/BpxBatteryHandler.h similarity index 92% rename from mission/devices/BpxBatteryHandler.h rename to mission/power/BpxBatteryHandler.h index c42ed7fd..9f27ce34 100644 --- a/mission/devices/BpxBatteryHandler.h +++ b/mission/power/BpxBatteryHandler.h @@ -1,9 +1,9 @@ -#ifndef MISSION_DEVICES_BPXBATTERYHANDLER_H_ -#define MISSION_DEVICES_BPXBATTERYHANDLER_H_ +#ifndef MISSION_POWER_BPXBATTERYHANDLER_H_ +#define MISSION_POWER_BPXBATTERYHANDLER_H_ #include +#include -#include "devicedefinitions/BpxBatteryDefinitions.h" #include "mission/trace.h" class BpxBatteryHandler : public DeviceHandlerBase { @@ -63,4 +63,4 @@ class BpxBatteryHandler : public DeviceHandlerBase { LocalDataPoolManager& poolManager) override; }; -#endif /* MISSION_DEVICES_BPXBATTERYHANDLER_H_ */ +#endif /* MISSION_POWER_BPXBATTERYHANDLER_H_ */ diff --git a/mission/power/CMakeLists.txt b/mission/power/CMakeLists.txt new file mode 100644 index 00000000..d18daf96 --- /dev/null +++ b/mission/power/CMakeLists.txt @@ -0,0 +1,9 @@ +target_sources( + ${LIB_EIVE_MISSION} + PRIVATE Pdu1Handler.cpp + Pdu2Handler.cpp + AcuHandler.cpp + P60DockHandler.cpp + PcduHandler.cpp + GomspaceDeviceHandler.cpp + BpxBatteryHandler.cpp) diff --git a/mission/devices/devicedefinitions/GomSpacePackets.h b/mission/power/GomSpacePackets.h similarity index 97% rename from mission/devices/devicedefinitions/GomSpacePackets.h rename to mission/power/GomSpacePackets.h index 650fa763..ad90eca9 100644 --- a/mission/devices/devicedefinitions/GomSpacePackets.h +++ b/mission/power/GomSpacePackets.h @@ -1,11 +1,11 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_ +#ifndef MISSION_POWER_GOMSPACEPACKETS_H_ +#define MISSION_POWER_GOMSPACEPACKETS_H_ #include #include #include #include -#include +#include class CspParamRequestBase : public SerialLinkedListAdapter { public: @@ -381,4 +381,4 @@ class GetParamMessageUnpacker : public SerialLinkedListAdapter { SerializeElement parameterSize; }; -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_ */ +#endif /* MISSION_POWER_GOMSPACEPACKETS_H_ */ diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/power/GomspaceDeviceHandler.cpp similarity index 99% rename from mission/devices/GomspaceDeviceHandler.cpp rename to mission/power/GomspaceDeviceHandler.cpp index 389b08c7..bdb0a5d1 100644 --- a/mission/devices/GomspaceDeviceHandler.cpp +++ b/mission/power/GomspaceDeviceHandler.cpp @@ -1,12 +1,10 @@ -#include "GomspaceDeviceHandler.h" - #include #include - +#include +#include +#include #include -#include "devicedefinitions/GomSpacePackets.h" -#include "devicedefinitions/powerDefinitions.h" #include "eive/objects.h" using namespace GOMSPACE; diff --git a/mission/devices/GomspaceDeviceHandler.h b/mission/power/GomspaceDeviceHandler.h similarity index 96% rename from mission/devices/GomspaceDeviceHandler.h rename to mission/power/GomspaceDeviceHandler.h index af9d3411..03e9a534 100644 --- a/mission/devices/GomspaceDeviceHandler.h +++ b/mission/power/GomspaceDeviceHandler.h @@ -1,11 +1,11 @@ -#ifndef MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_ -#define MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_ +#ifndef MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ +#define MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ #include -#include +#include +#include #include "fsfw/devicehandlers/DeviceHandlerBase.h" -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" #include "returnvalues/classIds.h" struct TableConfig { @@ -180,4 +180,4 @@ inline T GomspaceDeviceHandler::as(const uint8_t *ptr) { return *(reinterpret_cast(ptr)); } -#endif /* MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_ */ +#endif /* MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ */ diff --git a/mission/devices/P60DockHandler.cpp b/mission/power/P60DockHandler.cpp similarity index 99% rename from mission/devices/P60DockHandler.cpp rename to mission/power/P60DockHandler.cpp index 8c768847..587a184e 100644 --- a/mission/devices/P60DockHandler.cpp +++ b/mission/power/P60DockHandler.cpp @@ -1,6 +1,5 @@ -#include "P60DockHandler.h" - #include +#include #include "OBSWConfig.h" diff --git a/mission/devices/P60DockHandler.h b/mission/power/P60DockHandler.h similarity index 92% rename from mission/devices/P60DockHandler.h rename to mission/power/P60DockHandler.h index b91907a8..359edf20 100644 --- a/mission/devices/P60DockHandler.h +++ b/mission/power/P60DockHandler.h @@ -1,9 +1,9 @@ -#ifndef MISSION_DEVICES_P60DOCKHANDLER_H_ -#define MISSION_DEVICES_P60DOCKHANDLER_H_ +#ifndef MISSION_POWER_P60DOCKHANDLER_H_ +#define MISSION_POWER_P60DOCKHANDLER_H_ -#include +#include +#include -#include "GomspaceDeviceHandler.h" #include "eive/eventSubsystemIds.h" /** @@ -71,4 +71,4 @@ class P60DockHandler : public GomspaceDeviceHandler { void parseHkTableReply(const uint8_t* packet); }; -#endif /* MISSION_DEVICES_P60DOCKHANDLER_H_ */ +#endif /* MISSION_POWER_P60DOCKHANDLER_H_ */ diff --git a/mission/devices/PcduHandler.cpp b/mission/power/PcduHandler.cpp similarity index 99% rename from mission/devices/PcduHandler.cpp rename to mission/power/PcduHandler.cpp index 4c2f742c..8968110e 100644 --- a/mission/devices/PcduHandler.cpp +++ b/mission/power/PcduHandler.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include PcduHandler::PcduHandler(object_id_t setObjectId, size_t cmdQueueSize) : SystemObject(setObjectId), diff --git a/mission/devices/PcduHandler.h b/mission/power/PcduHandler.h similarity index 95% rename from mission/devices/PcduHandler.h rename to mission/power/PcduHandler.h index 170c27f2..2144227a 100644 --- a/mission/devices/PcduHandler.h +++ b/mission/power/PcduHandler.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_PCDUHANDLER_H_ -#define MISSION_DEVICES_PCDUHANDLER_H_ +#ifndef MISSION_POWER_PCDUHANDLER_H_ +#define MISSION_POWER_PCDUHANDLER_H_ #include #include @@ -8,10 +8,9 @@ #include #include #include -#include - -#include "devicedefinitions/GomspaceDefinitions.h" -#include "devicedefinitions/powerDefinitions.h" +#include +#include +#include /** * @brief The PCDUHandler provides a compact interface to handle all devices related to the @@ -141,4 +140,4 @@ class PcduHandler : public PowerSwitchIF, void checkAndUpdatePduSwitch(GOMSPACE::Pdu pdu, pcdu::Switches switchIdx, uint8_t setValue); }; -#endif /* MISSION_DEVICES_PCDUHANDLER_H_ */ +#endif /* MISSION_POWER_PCDUHANDLER_H_ */ diff --git a/mission/devices/Pdu1Handler.cpp b/mission/power/Pdu1Handler.cpp similarity index 98% rename from mission/devices/Pdu1Handler.cpp rename to mission/power/Pdu1Handler.cpp index 25f14c76..80b10d85 100644 --- a/mission/devices/Pdu1Handler.cpp +++ b/mission/power/Pdu1Handler.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "devices/powerSwitcherList.h" diff --git a/mission/devices/Pdu1Handler.h b/mission/power/Pdu1Handler.h similarity index 96% rename from mission/devices/Pdu1Handler.h rename to mission/power/Pdu1Handler.h index b81f647e..b3e59229 100644 --- a/mission/devices/Pdu1Handler.h +++ b/mission/power/Pdu1Handler.h @@ -1,8 +1,8 @@ #ifndef MISSION_DEVICES_PDU1Handler_H_ #define MISSION_DEVICES_PDU1Handler_H_ -#include "GomspaceDeviceHandler.h" -#include "devicedefinitions/GomspaceDefinitions.h" +#include +#include /** * @brief This is the device handler for the PDU1. diff --git a/mission/devices/Pdu2Handler.cpp b/mission/power/Pdu2Handler.cpp similarity index 98% rename from mission/devices/Pdu2Handler.cpp rename to mission/power/Pdu2Handler.cpp index 363c5f51..bf945849 100644 --- a/mission/devices/Pdu2Handler.cpp +++ b/mission/power/Pdu2Handler.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "devices/powerSwitcherList.h" diff --git a/mission/devices/Pdu2Handler.h b/mission/power/Pdu2Handler.h similarity index 89% rename from mission/devices/Pdu2Handler.h rename to mission/power/Pdu2Handler.h index acb229dc..f0756cb9 100644 --- a/mission/devices/Pdu2Handler.h +++ b/mission/power/Pdu2Handler.h @@ -1,9 +1,8 @@ -#ifndef MISSION_DEVICES_PDU2HANDLER_H_ -#define MISSION_DEVICES_PDU2HANDLER_H_ +#ifndef MISSION_POWER_PDU2HANDLER_H_ +#define MISSION_POWER_PDU2HANDLER_H_ -#include - -#include "GomspaceDeviceHandler.h" +#include +#include /** * @brief This is the device handler for the PDU2. @@ -56,4 +55,4 @@ class Pdu2Handler : public GomspaceDeviceHandler { void parseHkTableReply(const uint8_t* packet); }; -#endif /* MISSION_DEVICES_PDU2HANDLER_H_ */ +#endif /* MISSION_POWER_PDU2HANDLER_H_ */ diff --git a/mission/devices/devicedefinitions/BpxBatteryDefinitions.h b/mission/power/bpxBattDefs.h similarity index 97% rename from mission/devices/devicedefinitions/BpxBatteryDefinitions.h rename to mission/power/bpxBattDefs.h index eb19529b..1808c94a 100644 --- a/mission/devices/devicedefinitions/BpxBatteryDefinitions.h +++ b/mission/power/bpxBattDefs.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_ +#ifndef MISSION_POWER_BPXBATTDEFS_H_ +#define MISSION_POWER_BPXBATTDEFS_H_ #include #include @@ -248,4 +248,4 @@ class BpxBatteryCfg : public StaticLocalDataSet { : StaticLocalDataSet(hkOwner, BpxBattery::CFG_SET_ID) {} }; -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_ */ +#endif /* MISSION_POWER_BPXBATTDEFS_H_ */ diff --git a/mission/devices/devicedefinitions/powerDefinitions.h b/mission/power/defs.h similarity index 68% rename from mission/devices/devicedefinitions/powerDefinitions.h rename to mission/power/defs.h index 8d1b5578..2aadc361 100644 --- a/mission/devices/devicedefinitions/powerDefinitions.h +++ b/mission/power/defs.h @@ -1,7 +1,8 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_ +#ifndef MISSION_POWER_DEFS_H_ +#define MISSION_POWER_DEFS_H_ #include +#include #include "eive/eventSubsystemIds.h" @@ -18,6 +19,17 @@ static constexpr Event SWITCHING_Q7S_DENIED = event::makeEvent(SUBSYSTEM_ID, 2, static constexpr Event FDIR_REACTION_IGNORED = event::makeEvent(SUBSYSTEM_ID, 3, severity::MEDIUM); + +enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING }; +enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED }; + } // namespace power -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_ */ + +namespace duallane { + +enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 }; + +} + +#endif /* MISSION_POWER_DEFS_H_ */ diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/power/gsDefs.h similarity index 99% rename from mission/devices/devicedefinitions/GomspaceDefinitions.h rename to mission/power/gsDefs.h index 75a81d8f..e1ffe6d3 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/power/gsDefs.h @@ -1,16 +1,16 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_ +#ifndef MISSION_POWER_GSDEFS_H_ +#define MISSION_POWER_GSDEFS_H_ #include #include #include #include +#include #include #include "devices/powerSwitcherList.h" #include "fsfw/platform.h" -#include "gomspaceDefines.h" namespace GOMSPACE { @@ -774,4 +774,4 @@ class SwitcherStates : public StaticLocalDataSet { }; } // namespace pcdu -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_ */ +#endif /* MISSION_POWER_GSDEFS_H_ */ diff --git a/mission/devices/devicedefinitions/gomspaceDefines.h b/mission/power/gsLibDefs.h similarity index 80% rename from mission/devices/devicedefinitions/gomspaceDefines.h rename to mission/power/gsLibDefs.h index ddd346d7..cc9fc121 100644 --- a/mission/devices/devicedefinitions/gomspaceDefines.h +++ b/mission/power/gsLibDefs.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ +#ifndef MISSION_POWER_GSLIBDEFS_H_ +#define MISSION_POWER_GSLIBDEFS_H_ #include "fsfw/platform.h" @@ -30,4 +30,4 @@ static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B; } // namespace gsConstants -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */ +#endif /* MISSION_POWER_GSLIBDEFS_H_ */ diff --git a/mission/powerDefs.h b/mission/powerDefs.h deleted file mode 100644 index 9e0176d9..00000000 --- a/mission/powerDefs.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include - -namespace power { - -enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING }; -enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED }; - -} // namespace power - -namespace duallane { - -enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 }; - -} // namespace duallane diff --git a/mission/system/DualLanePowerStateMachine.h b/mission/system/DualLanePowerStateMachine.h index 7db99c83..d3f596f7 100644 --- a/mission/system/DualLanePowerStateMachine.h +++ b/mission/system/DualLanePowerStateMachine.h @@ -5,7 +5,7 @@ #include #include -#include "mission/powerDefs.h" +#include "mission/power/defs.h" class AssemblyBase; class PowerSwitchIF; diff --git a/mission/system/acs/acsModeTree.cpp b/mission/system/acs/acsModeTree.cpp index cee5445d..85d2ea45 100644 --- a/mission/system/acs/acsModeTree.cpp +++ b/mission/system/acs/acsModeTree.cpp @@ -10,7 +10,7 @@ #include "eive/objects.h" #include "mission/acs/defs.h" -#include "mission/powerDefs.h" +#include "mission/power/defs.h" #include "mission/system/tree/util.h" AcsSubsystem satsystem::acs::ACS_SUBSYSTEM(objects::ACS_SUBSYSTEM, 12, 24); diff --git a/mission/system/fdir/GomspacePowerFdir.cpp b/mission/system/fdir/GomspacePowerFdir.cpp index 5d35ca24..7cec4815 100644 --- a/mission/system/fdir/GomspacePowerFdir.cpp +++ b/mission/system/fdir/GomspacePowerFdir.cpp @@ -1,3 +1,4 @@ +#include #include "GomspacePowerFdir.h" #include "fsfw/devicehandlers/DeviceHandlerIF.h" @@ -7,7 +8,6 @@ #include "fsfw/power/Fuse.h" #include "fsfw/serviceinterface/ServiceInterfaceStream.h" #include "fsfw/thermal/ThermalComponentIF.h" -#include "mission/devices/devicedefinitions/powerDefinitions.h" GomspacePowerFdir::GomspacePowerFdir(object_id_t devId, object_id_t parentId) : DeviceHandlerFailureIsolation(devId, parentId) {} diff --git a/mission/system/objects/PowerStateMachineBase.h b/mission/system/objects/PowerStateMachineBase.h index 25af577b..bc917b23 100644 --- a/mission/system/objects/PowerStateMachineBase.h +++ b/mission/system/objects/PowerStateMachineBase.h @@ -5,7 +5,7 @@ #include #include -#include "mission/powerDefs.h" +#include "mission/power/defs.h" class PowerStateMachineBase { public: diff --git a/mission/system/objects/Stack5VHandler.h b/mission/system/objects/Stack5VHandler.h index 364d744b..17b9ed1e 100644 --- a/mission/system/objects/Stack5VHandler.h +++ b/mission/system/objects/Stack5VHandler.h @@ -2,8 +2,7 @@ #define MISSION_SYSTEM_OBJECTS_STACK5VHANDLER_H_ #include - -#include "mission/devices/devicedefinitions/GomspaceDefinitions.h" +#include enum class StackCommander { RAD_SENSOR = 0, PL_PCDU = 1 }; enum class HandlerState { SWITCH_PENDING, IDLE }; diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp index 283cd761..511cf5f1 100644 --- a/mission/system/tree/payloadModeTree.cpp +++ b/mission/system/tree/payloadModeTree.cpp @@ -8,7 +8,7 @@ #include "eive/objects.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/payloadDefs.h" -#include "mission/powerDefs.h" +#include "mission/power/defs.h" #include "mission/system/objects/PayloadSubsystem.h" #include "util.h" From e7eaaa9295acf752f91e90b7250aa1d1e9cae267 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Mar 2023 16:16:54 +0200 Subject: [PATCH 3/5] finished power clean up --- bsp_q7s/core/ObjectFactory.cpp | 2 +- linux/csp/CspComIF.cpp | 3 +-- mission/CMakeLists.txt | 1 - mission/csp/CMakeLists.txt | 1 - mission/power/CMakeLists.txt | 3 ++- mission/{csp => power}/CspCookie.cpp | 2 +- mission/{csp => power}/CspCookie.h | 0 mission/power/GomspaceDeviceHandler.cpp | 3 ++- mission/power/GomspaceDeviceHandler.h | 2 +- mission/power/PcduHandler.h | 2 +- mission/power/defs.h | 2 -- mission/system/fdir/GomspacePowerFdir.cpp | 3 ++- 12 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 mission/csp/CMakeLists.txt rename mission/{csp => power}/CspCookie.cpp (95%) rename mission/{csp => power}/CspCookie.h (100%) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 06f02e1e..f638690d 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -53,7 +54,6 @@ #include "linux/ipcore/Ptme.h" #include "linux/ipcore/PtmeConfig.h" #include "mission/config/configfile.h" -#include "mission/csp/CspCookie.h" #include "mission/system/acs/AcsBoardFdir.h" #include "mission/system/acs/AcsSubsystem.h" #include "mission/system/acs/RwAssembly.h" diff --git a/linux/csp/CspComIF.cpp b/linux/csp/CspComIF.cpp index d24ebc2e..6aef5205 100644 --- a/linux/csp/CspComIF.cpp +++ b/linux/csp/CspComIF.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -10,8 +11,6 @@ #include #include -#include "mission/csp/CspCookie.h" - using namespace GOMSPACE; CspComIF::CspComIF(object_id_t objectId, const char* routeTaskName, uint32_t routerRealTimePriority) diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt index f6435ad8..b8d0aaa0 100644 --- a/mission/CMakeLists.txt +++ b/mission/CMakeLists.txt @@ -8,7 +8,6 @@ add_subdirectory(system) add_subdirectory(com) add_subdirectory(acs) add_subdirectory(power) -add_subdirectory(csp) add_subdirectory(cfdp) add_subdirectory(config) diff --git a/mission/csp/CMakeLists.txt b/mission/csp/CMakeLists.txt deleted file mode 100644 index d5b6f3fe..00000000 --- a/mission/csp/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -target_sources(${LIB_EIVE_MISSION} PRIVATE CspCookie.cpp) diff --git a/mission/power/CMakeLists.txt b/mission/power/CMakeLists.txt index d18daf96..05232e25 100644 --- a/mission/power/CMakeLists.txt +++ b/mission/power/CMakeLists.txt @@ -1,6 +1,7 @@ target_sources( ${LIB_EIVE_MISSION} - PRIVATE Pdu1Handler.cpp + PRIVATE CspCookie.cpp + Pdu1Handler.cpp Pdu2Handler.cpp AcuHandler.cpp P60DockHandler.cpp diff --git a/mission/csp/CspCookie.cpp b/mission/power/CspCookie.cpp similarity index 95% rename from mission/csp/CspCookie.cpp rename to mission/power/CspCookie.cpp index 228a8058..2bb85fd1 100644 --- a/mission/csp/CspCookie.cpp +++ b/mission/power/CspCookie.cpp @@ -1,4 +1,4 @@ -#include "CspCookie.h" +#include using namespace GOMSPACE; CspCookie::CspCookie(uint16_t maxReplyLength_, uint8_t cspAddress_, uint32_t timeoutMs) diff --git a/mission/csp/CspCookie.h b/mission/power/CspCookie.h similarity index 100% rename from mission/csp/CspCookie.h rename to mission/power/CspCookie.h diff --git a/mission/power/GomspaceDeviceHandler.cpp b/mission/power/GomspaceDeviceHandler.cpp index bdb0a5d1..eb2504c4 100644 --- a/mission/power/GomspaceDeviceHandler.cpp +++ b/mission/power/GomspaceDeviceHandler.cpp @@ -1,8 +1,9 @@ #include #include -#include #include #include +#include + #include #include "eive/objects.h" diff --git a/mission/power/GomspaceDeviceHandler.h b/mission/power/GomspaceDeviceHandler.h index 03e9a534..8c59405c 100644 --- a/mission/power/GomspaceDeviceHandler.h +++ b/mission/power/GomspaceDeviceHandler.h @@ -1,7 +1,7 @@ #ifndef MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ #define MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ -#include +#include #include #include diff --git a/mission/power/PcduHandler.h b/mission/power/PcduHandler.h index 2144227a..dd7c235a 100644 --- a/mission/power/PcduHandler.h +++ b/mission/power/PcduHandler.h @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include #include /** diff --git a/mission/power/defs.h b/mission/power/defs.h index 2aadc361..70e155a6 100644 --- a/mission/power/defs.h +++ b/mission/power/defs.h @@ -19,13 +19,11 @@ static constexpr Event SWITCHING_Q7S_DENIED = event::makeEvent(SUBSYSTEM_ID, 2, static constexpr Event FDIR_REACTION_IGNORED = event::makeEvent(SUBSYSTEM_ID, 3, severity::MEDIUM); - enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING }; enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED }; } // namespace power - namespace duallane { enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 }; diff --git a/mission/system/fdir/GomspacePowerFdir.cpp b/mission/system/fdir/GomspacePowerFdir.cpp index 7cec4815..98e10f58 100644 --- a/mission/system/fdir/GomspacePowerFdir.cpp +++ b/mission/system/fdir/GomspacePowerFdir.cpp @@ -1,6 +1,7 @@ -#include #include "GomspacePowerFdir.h" +#include + #include "fsfw/devicehandlers/DeviceHandlerIF.h" #include "fsfw/health/HealthTableIF.h" #include "fsfw/modes/HasModesIF.h" From 63b50e6101c60b266fd5ce48f807c59a2be4f9f6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Mar 2023 16:42:00 +0200 Subject: [PATCH 4/5] clean up op done --- .../fsfwconfig/events/translateEvents.cpp | 2 +- .../fsfwconfig/objects/translateObjects.cpp | 2 +- bsp_q7s/core/CoreController.h | 2 +- bsp_q7s/core/ObjectFactory.cpp | 34 +-- bsp_q7s/core/ObjectFactory.h | 4 +- bsp_q7s/core/scheduling.cpp | 6 +- bsp_q7s/core/scheduling.h | 2 +- bsp_q7s/fmObjectFactory.cpp | 2 +- dummies/CoreControllerDummy.h | 2 +- dummies/Max31865Dummy.h | 3 +- dummies/PlPcduDummy.h | 2 +- dummies/SusDummy.h | 2 +- dummies/TemperatureSensorInserter.h | 2 +- dummies/Tmp1075Dummy.cpp | 2 +- dummies/Tmp1075Dummy.h | 3 +- dummies/helpers.cpp | 2 +- generators/bsp_hosted_events.csv | 236 ++++++++--------- generators/bsp_hosted_returnvalues.csv | 88 ++++--- generators/bsp_q7s_events.csv | 236 ++++++++--------- generators/bsp_q7s_returnvalues.csv | 238 +++++++++--------- generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 2 +- linux/CMakeLists.txt | 5 +- linux/ObjectFactory.cpp | 8 +- linux/ObjectFactory.h | 3 +- linux/acs/GpsHyperionLinuxController.h | 2 +- linux/acs/SusPolling.cpp | 5 +- linux/boardtest/SpiTestClass.cpp | 3 +- linux/boardtest/UartTestClass.cpp | 8 +- linux/boardtest/UartTestClass.h | 2 +- linux/devices/CMakeLists.txt | 4 - linux/devices/ploc/CMakeLists.txt | 4 - linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- linux/payload/CMakeLists.txt | 10 + .../ploc => payload}/PlocMemoryDumper.cpp | 3 +- .../ploc => payload}/PlocMemoryDumper.h | 4 +- .../PlocMpsocHandler.cpp} | 4 +- .../PlocMpsocHandler.h} | 9 +- .../PlocMpsocHelper.cpp} | 2 +- .../PlocMpsocHelper.h} | 5 +- .../PlocSupervisorHandler.cpp | 0 .../ploc => payload}/PlocSupervisorHandler.h | 4 +- .../ploc => payload}/PlocSupvUartMan.cpp | 2 +- .../ploc => payload}/PlocSupvUartMan.h | 4 +- linux/{devices => payload}/ScexDleParser.cpp | 2 +- linux/{devices => payload}/ScexDleParser.h | 0 linux/{devices => payload}/ScexHelper.cpp | 3 +- linux/{devices => payload}/ScexHelper.h | 8 +- linux/{devices => payload}/ScexUartReader.cpp | 3 +- linux/{devices => payload}/ScexUartReader.h | 2 +- .../mpsocRetvals.h} | 0 .../plocMemDumpDefs.h} | 0 .../plocMpscoDefs.h} | 6 +- .../plocSupvDefs.h} | 2 +- linux/{csp => power}/CMakeLists.txt | 0 linux/{csp => power}/CspComIF.cpp | 3 +- linux/{csp => power}/CspComIF.h | 6 +- linux/tcs/CMakeLists.txt | 1 + linux/{devices => tcs}/Max31865RtdPolling.cpp | 2 +- linux/{devices => tcs}/Max31865RtdPolling.h | 2 +- mission/CMakeLists.txt | 9 +- .../SolarArrayDeploymentHandler.cpp | 5 +- .../SolarArrayDeploymentHandler.h | 2 +- mission/acs/SusHandler.cpp | 2 +- mission/acs/SusHandler.h | 2 +- mission/acs/archive/LegacySusHandler.h | 4 +- .../susMax1227Helpers.h | 0 mission/controller/AcsController.h | 4 +- mission/controller/ThermalController.cpp | 2 +- mission/controller/ThermalController.h | 13 +- mission/controller/acs/SensorValues.h | 2 +- mission/core/CMakeLists.txt | 2 - mission/devices/CMakeLists.txt | 12 - .../devices/devicedefinitions/CMakeLists.txt | 1 - .../GenericFactory.cpp => genericFactory.cpp} | 5 +- .../GenericFactory.h => genericFactory.h} | 2 +- mission/payload/CMakeLists.txt | 3 + .../PayloadPcduHandler.cpp | 3 +- .../{devices => payload}/PayloadPcduHandler.h | 2 +- .../RadiationSensorHandler.cpp | 4 +- .../RadiationSensorHandler.h | 8 +- .../ScexDeviceHandler.cpp | 7 +- .../{devices => payload}/ScexDeviceHandler.h | 10 +- mission/{payloadDefs.cpp => payload/defs.cpp} | 2 +- mission/{payloadDefs.h => payload/defs.h} | 0 .../payloadPcduDefinitions.h | 2 +- .../SpBase.h => payload/plocSpBase.h} | 7 +- .../radSensorDefinitions.h} | 0 .../scexHelpers.cpp} | 3 +- .../scexHelpers.h} | 6 +- mission/{core => }/pollingSeqTables.cpp | 2 +- mission/{core => }/pollingSeqTables.h | 0 mission/power/BpxBatteryHandler.h | 3 +- mission/{core => }/scheduling.cpp | 3 +- mission/{core => }/scheduling.h | 0 mission/system/objects/PayloadSubsystem.cpp | 2 +- mission/system/tree/payloadModeTree.cpp | 4 +- mission/tcs/CMakeLists.txt | 3 + mission/{devices => tcs}/HeaterHandler.cpp | 3 +- mission/{devices => tcs}/HeaterHandler.h | 6 +- .../Max31865Definitions.h | 0 .../{devices => tcs}/Max31865EiveHandler.cpp | 3 +- .../{devices => tcs}/Max31865EiveHandler.h | 9 +- .../Max31865PT1000Handler.cpp | 2 +- .../{devices => tcs}/Max31865PT1000Handler.h | 9 +- .../Tmp1075Definitions.h | 12 +- mission/{devices => tcs}/Tmp1075Handler.cpp | 4 +- mission/{devices => tcs}/Tmp1075Handler.h | 8 +- mission/{devices => tcs}/max1227.cpp | 2 +- mission/{devices => tcs}/max1227.h | 6 +- mission/tmtc/PersistentLogTmStoreTask.h | 2 +- mission/utility/CMakeLists.txt | 5 +- mission/{ => utility}/trace.cpp | 2 +- mission/{ => utility}/trace.h | 6 +- tmtc | 2 +- 116 files changed, 630 insertions(+), 601 deletions(-) delete mode 100644 linux/devices/CMakeLists.txt delete mode 100644 linux/devices/ploc/CMakeLists.txt create mode 100644 linux/payload/CMakeLists.txt rename linux/{devices/ploc => payload}/PlocMemoryDumper.cpp (99%) rename linux/{devices/ploc => payload}/PlocMemoryDumper.h (96%) rename linux/{devices/ploc/PlocMPSoCHandler.cpp => payload/PlocMpsocHandler.cpp} (99%) rename linux/{devices/ploc/PlocMPSoCHandler.h => payload/PlocMpsocHandler.h} (98%) rename linux/{devices/ploc/PlocMPSoCHelper.cpp => payload/PlocMpsocHelper.cpp} (99%) rename linux/{devices/ploc/PlocMPSoCHelper.h => payload/PlocMpsocHelper.h} (98%) rename linux/{devices/ploc => payload}/PlocSupervisorHandler.cpp (100%) rename linux/{devices/ploc => payload}/PlocSupervisorHandler.h (99%) rename linux/{devices/ploc => payload}/PlocSupvUartMan.cpp (99%) rename linux/{devices/ploc => payload}/PlocSupvUartMan.h (99%) rename linux/{devices => payload}/ScexDleParser.cpp (86%) rename linux/{devices => payload}/ScexDleParser.h (100%) rename linux/{devices => payload}/ScexHelper.cpp (98%) rename linux/{devices => payload}/ScexHelper.h (88%) rename linux/{devices => payload}/ScexUartReader.cpp (99%) rename linux/{devices => payload}/ScexUartReader.h (98%) rename linux/{devices/devicedefinitions/MPSoCReturnValuesIF.h => payload/mpsocRetvals.h} (100%) rename linux/{devices/devicedefinitions/PlocMemDumpDefinitions.h => payload/plocMemDumpDefs.h} (100%) rename linux/{devices/devicedefinitions/PlocMPSoCDefinitions.h => payload/plocMpscoDefs.h} (99%) rename linux/{devices/devicedefinitions/PlocSupervisorDefinitions.h => payload/plocSupvDefs.h} (99%) rename linux/{csp => power}/CMakeLists.txt (100%) rename linux/{csp => power}/CspComIF.cpp (99%) rename linux/{csp => power}/CspComIF.h (96%) create mode 100644 linux/tcs/CMakeLists.txt rename linux/{devices => tcs}/Max31865RtdPolling.cpp (99%) rename linux/{devices => tcs}/Max31865RtdPolling.h (98%) rename mission/{devices => }/SolarArrayDeploymentHandler.cpp (99%) rename mission/{devices => }/SolarArrayDeploymentHandler.h (99%) rename mission/{devices/devicedefinitions => acs}/susMax1227Helpers.h (100%) delete mode 100644 mission/core/CMakeLists.txt delete mode 100644 mission/devices/CMakeLists.txt delete mode 100644 mission/devices/devicedefinitions/CMakeLists.txt rename mission/{core/GenericFactory.cpp => genericFactory.cpp} (99%) rename mission/{core/GenericFactory.h => genericFactory.h} (97%) create mode 100644 mission/payload/CMakeLists.txt rename mission/{devices => payload}/PayloadPcduHandler.cpp (99%) rename mission/{devices => payload}/PayloadPcduHandler.h (99%) rename mission/{devices => payload}/RadiationSensorHandler.cpp (99%) rename mission/{devices => payload}/RadiationSensorHandler.h (90%) rename mission/{devices => payload}/ScexDeviceHandler.cpp (98%) rename mission/{devices => payload}/ScexDeviceHandler.h (91%) rename mission/{payloadDefs.cpp => payload/defs.cpp} (94%) rename mission/{payloadDefs.h => payload/defs.h} (100%) rename mission/{devices/devicedefinitions => payload}/payloadPcduDefinitions.h (99%) rename mission/{devices/devicedefinitions/SpBase.h => payload/plocSpBase.h} (95%) rename mission/{devices/devicedefinitions/RadSensorDefinitions.h => payload/radSensorDefinitions.h} (100%) rename mission/{devices/devicedefinitions/ScexDefinitions.cpp => payload/scexHelpers.cpp} (97%) rename mission/{devices/devicedefinitions/ScexDefinitions.h => payload/scexHelpers.h} (88%) rename mission/{core => }/pollingSeqTables.cpp (99%) rename mission/{core => }/pollingSeqTables.h (100%) rename mission/{core => }/scheduling.cpp (96%) rename mission/{core => }/scheduling.h (100%) create mode 100644 mission/tcs/CMakeLists.txt rename mission/{devices => tcs}/HeaterHandler.cpp (99%) rename mission/{devices => tcs}/HeaterHandler.h (98%) rename mission/{devices/devicedefinitions => tcs}/Max31865Definitions.h (100%) rename mission/{devices => tcs}/Max31865EiveHandler.cpp (99%) rename mission/{devices => tcs}/Max31865EiveHandler.h (90%) rename mission/{devices => tcs}/Max31865PT1000Handler.cpp (99%) rename mission/{devices => tcs}/Max31865PT1000Handler.h (95%) rename mission/{devices/devicedefinitions => tcs}/Tmp1075Definitions.h (82%) rename mission/{devices => tcs}/Tmp1075Handler.cpp (97%) rename mission/{devices => tcs}/Tmp1075Handler.h (91%) rename mission/{devices => tcs}/max1227.cpp (96%) rename mission/{devices => tcs}/max1227.h (95%) rename mission/{ => utility}/trace.cpp (85%) rename mission/{ => utility}/trace.h (58%) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 1698b6b4..c3d0a8a8 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 279 translations. * @details - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateEvents.h" diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 9a91a644..0b3c7d14 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 169 translations. - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateObjects.h" diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h index b95298ee..99f69a22 100644 --- a/bsp_q7s/core/CoreController.h +++ b/bsp_q7s/core/CoreController.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -15,7 +16,6 @@ #include "bsp_q7s/fs/SdCardManager.h" #include "events/subsystemIdRanges.h" #include "fsfw/controller/ExtendedControllerBase.h" -#include "mission/trace.h" class Timer; class SdCardManager; diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index f638690d..5f3757c9 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -7,6 +7,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -41,13 +48,6 @@ #include "linux/boardtest/SpiTestClass.h" #include "linux/boardtest/UartTestClass.h" #include "linux/callbacks/gpioCallbacks.h" -#include "linux/csp/CspComIF.h" -#include "linux/devices/ScexUartReader.h" -#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h" -#include "linux/devices/ploc/PlocMPSoCHandler.h" -#include "linux/devices/ploc/PlocMPSoCHelper.h" -#include "linux/devices/ploc/PlocMemoryDumper.h" -#include "linux/devices/ploc/PlocSupervisorHandler.h" #include "linux/ipcore/AxiPtmeConfig.h" #include "linux/ipcore/PapbVcInterface.h" #include "linux/ipcore/PdecHandler.h" @@ -75,10 +75,15 @@ using gpio::Levels; #if OBSW_TEST_LIBGPIOD == 1 #include "linux/boardtest/LibgpiodTest.h" #endif +#include #include #include #include #include +#include +#include +#include +#include #include #include #include @@ -86,6 +91,10 @@ using gpio::Levels; #include #include #include +#include +#include +#include +#include #include #include @@ -109,16 +118,7 @@ using gpio::Levels; #include "mission/acs/RwHandler.h" #include "mission/com/CcsdsIpCoreHandler.h" #include "mission/com/syrlinksDefs.h" -#include "mission/core/GenericFactory.h" -#include "mission/devices/HeaterHandler.h" -#include "mission/devices/Max31865PT1000Handler.h" -#include "mission/devices/PayloadPcduHandler.h" -#include "mission/devices/RadiationSensorHandler.h" -#include "mission/devices/SolarArrayDeploymentHandler.h" -#include "mission/devices/Tmp1075Handler.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" -#include "mission/devices/devicedefinitions/RadSensorDefinitions.h" -#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" +#include "mission/genericFactory.h" #include "mission/system/acs/AcsBoardAssembly.h" #include "mission/tmtc/TmFunnelHandler.h" diff --git a/bsp_q7s/core/ObjectFactory.h b/bsp_q7s/core/ObjectFactory.h index f71d433f..f12adac1 100644 --- a/bsp_q7s/core/ObjectFactory.h +++ b/bsp_q7s/core/ObjectFactory.h @@ -4,9 +4,9 @@ #include #include #include -#include -#include +#include #include +#include #include #include #include diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp index 0b4f2120..25f8ede4 100644 --- a/bsp_q7s/core/scheduling.cpp +++ b/bsp_q7s/core/scheduling.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -17,9 +18,8 @@ #include "fsfw/tasks/FixedTimeslotTaskIF.h" #include "fsfw/tasks/PeriodicTaskIF.h" #include "fsfw/tasks/TaskFactory.h" -#include "mission/core/pollingSeqTables.h" -#include "mission/core/scheduling.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" +#include "mission/pollingSeqTables.h" +#include "mission/scheduling.h" #include "mission/utility/InitMission.h" /* This is configured for linux without CR */ diff --git a/bsp_q7s/core/scheduling.h b/bsp_q7s/core/scheduling.h index e49ce036..4a493749 100644 --- a/bsp_q7s/core/scheduling.h +++ b/bsp_q7s/core/scheduling.h @@ -4,7 +4,7 @@ #include #include "fsfw/tasks/definitions.h" -#include "mission/core/pollingSeqTables.h" +#include "mission/pollingSeqTables.h" using pst::AcsPstCfg; diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp index cb1ea118..9565af67 100644 --- a/bsp_q7s/fmObjectFactory.cpp +++ b/bsp_q7s/fmObjectFactory.cpp @@ -12,7 +12,7 @@ #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" #include "linux/ObjectFactory.h" #include "linux/callbacks/gpioCallbacks.h" -#include "mission/core/GenericFactory.h" +#include "mission/genericFactory.h" #include "mission/system/tree/system.h" #include "mission/tmtc/tmFilters.h" diff --git a/dummies/CoreControllerDummy.h b/dummies/CoreControllerDummy.h index 37d88081..8fd5076b 100644 --- a/dummies/CoreControllerDummy.h +++ b/dummies/CoreControllerDummy.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include class CoreControllerDummy : public ExtendedControllerBase { public: diff --git a/dummies/Max31865Dummy.h b/dummies/Max31865Dummy.h index 79f4ddb4..87556166 100644 --- a/dummies/Max31865Dummy.h +++ b/dummies/Max31865Dummy.h @@ -1,8 +1,9 @@ #ifndef EIVE_OBSW_MAX31865DUMMY_H #define EIVE_OBSW_MAX31865DUMMY_H +#include + #include "fsfw/devicehandlers/DeviceHandlerBase.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" class Max31865Dummy : public DeviceHandlerBase { public: diff --git a/dummies/PlPcduDummy.h b/dummies/PlPcduDummy.h index 227eedf8..8bf7f0c2 100644 --- a/dummies/PlPcduDummy.h +++ b/dummies/PlPcduDummy.h @@ -2,7 +2,7 @@ #define DUMMIES_PLPCDUDUMMY_H_ #include -#include +#include class PlPcduDummy : public DeviceHandlerBase { public: diff --git a/dummies/SusDummy.h b/dummies/SusDummy.h index 9a49a591..0df35f8a 100644 --- a/dummies/SusDummy.h +++ b/dummies/SusDummy.h @@ -2,7 +2,7 @@ #define DUMMIES_SUSDUMMY_H_ #include -#include +#include class SusDummy : public DeviceHandlerBase { public: diff --git a/dummies/TemperatureSensorInserter.h b/dummies/TemperatureSensorInserter.h index 33d61443..5ad3c2e8 100644 --- a/dummies/TemperatureSensorInserter.h +++ b/dummies/TemperatureSensorInserter.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "Max31865Dummy.h" #include "Tmp1075Dummy.h" diff --git a/dummies/Tmp1075Dummy.cpp b/dummies/Tmp1075Dummy.cpp index 8cfede50..ed9b9285 100644 --- a/dummies/Tmp1075Dummy.cpp +++ b/dummies/Tmp1075Dummy.cpp @@ -1,6 +1,6 @@ #include "Tmp1075Dummy.h" -#include "mission/devices/devicedefinitions/Tmp1075Definitions.h" +#include using namespace returnvalue; diff --git a/dummies/Tmp1075Dummy.h b/dummies/Tmp1075Dummy.h index e43ca8e2..7f84d198 100644 --- a/dummies/Tmp1075Dummy.h +++ b/dummies/Tmp1075Dummy.h @@ -1,8 +1,9 @@ #ifndef EIVE_OBSW_TMP1075DUMMY_H #define EIVE_OBSW_TMP1075DUMMY_H +#include + #include "fsfw/devicehandlers/DeviceHandlerBase.h" -#include "mission/devices/devicedefinitions/Tmp1075Definitions.h" class Tmp1075Dummy : public DeviceHandlerBase { public: diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp index 00439355..e0880ab9 100644 --- a/dummies/helpers.cpp +++ b/dummies/helpers.cpp @@ -34,7 +34,7 @@ #include "TemperatureSensorInserter.h" #include "dummies/Max31865Dummy.h" #include "dummies/Tmp1075Dummy.h" -#include "mission/core/GenericFactory.h" +#include "mission/genericFactory.h" #include "mission/system/acs/acsModeTree.h" #include "mission/system/com/comModeTree.h" #include "mission/system/tree/payloadModeTree.h" diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index 7e543037..19f38913 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -93,33 +93,33 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11204;0x2bc4;MEKF_RECOVERY;INFO;No description;mission/acs/defs.h 11205;0x2bc5;MEKF_INVALID_MODE_VIOLATION;HIGH;No description;mission/acs/defs.h 11206;0x2bc6;SAFE_MODE_CONTROLLER_FAILURE;HIGH;No description;mission/acs/defs.h -11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h -11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h -11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/devices/devicedefinitions/powerDefinitions.h -11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/devices/devicedefinitions/powerDefinitions.h -11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/devices/HeaterHandler.h -11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/devices/HeaterHandler.h -11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/devices/HeaterHandler.h -11403;0x2c8b;HEATER_WENT_OFF;INFO;No description;mission/devices/HeaterHandler.h -11404;0x2c8c;SWITCH_ALREADY_ON;LOW;No description;mission/devices/HeaterHandler.h -11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;No description;mission/devices/HeaterHandler.h -11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;No description;mission/devices/HeaterHandler.h -11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;No description;mission/devices/HeaterHandler.h -11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h -11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h -11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;No description;mission/devices/SolarArrayDeploymentHandler.h -11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;No description;mission/devices/SolarArrayDeploymentHandler.h -11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;No description;mission/devices/SolarArrayDeploymentHandler.h -11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h -11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h -11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h -11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h -11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h -11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h +11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.h +11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h +11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h +11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/power/defs.h +11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/tcs/HeaterHandler.h +11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/tcs/HeaterHandler.h +11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/tcs/HeaterHandler.h +11403;0x2c8b;HEATER_WENT_OFF;INFO;No description;mission/tcs/HeaterHandler.h +11404;0x2c8c;SWITCH_ALREADY_ON;LOW;No description;mission/tcs/HeaterHandler.h +11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;No description;mission/tcs/HeaterHandler.h +11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;No description;mission/tcs/HeaterHandler.h +11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;No description;mission/tcs/HeaterHandler.h +11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h +11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h +11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h +11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h +11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;No description;mission/SolarArrayDeploymentHandler.h +11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/payload/PlocMpsocHandler.h +11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/payload/PlocMpsocHandler.h +11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/payload/PlocMpsocHandler.h +11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/payload/PlocMpsocHandler.h +11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHandler.h +11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/payload/PlocMpsocHandler.h 11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h 11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h 11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h @@ -130,21 +130,21 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/acs/ImtqHandler.h 11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/acs/rwHelpers.h 11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/acs/rwHelpers.h -11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;linux/acs/startracker/StarTrackerHandler.h -11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;linux/acs/startracker/StarTrackerHandler.h -12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h -12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/devices/ploc/PlocSupervisorHandler.h -12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/devices/ploc/PlocSupervisorHandler.h -12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h -12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h -12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h -12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h -12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h +11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h +11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h +12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h +12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h +12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h +12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/PlocSupervisorHandler.h +12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/PlocSupervisorHandler.h +12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h +12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h +12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h 12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h 12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;bsp_q7s/fs/SdCardManager.h -12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h -12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h -12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h +12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/payload/PlocMemoryDumper.h +12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/payload/PlocMemoryDumper.h +12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/payload/PlocMemoryDumper.h 12401;0x3071;INVALID_TC_FRAME;HIGH;No description;linux/ipcore/PdecHandler.h 12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/PdecHandler.h 12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/PdecHandler.h @@ -156,49 +156,49 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;HIGH;No description;linux/ipcore/PdecHandler.h 12410;0x307a;PDEC_RESET_FAILED;HIGH;Failed to pull PDEC reset to low;linux/ipcore/PdecHandler.h 12411;0x307b;OPEN_IRQ_FILE_FAILED;HIGH;Failed to open the IRQ uio file;linux/ipcore/PdecHandler.h -12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/startracker/StrComHandler.h -12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/startracker/StrComHandler.h -12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/startracker/StrComHandler.h -12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/acs/startracker/StrComHandler.h -12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/acs/startracker/StrComHandler.h -12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/acs/startracker/StrComHandler.h -12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/acs/startracker/StrComHandler.h -12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/acs/startracker/StrComHandler.h -12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/acs/startracker/StrComHandler.h -12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/startracker/StrComHandler.h -12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/startracker/StrComHandler.h -12511;0x30df;STR_COM_REPLY_TIMEOUT;LOW;Star tracker did not send a valid reply for a certain timeout. P1: Position of upload or download packet for which the packet wa sent. P2: Timeout;linux/acs/startracker/StrComHandler.h -12513;0x30e1;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/acs/startracker/StrComHandler.h -12514;0x30e2;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/acs/startracker/StrComHandler.h -12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/startracker/StrComHandler.h -12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/startracker/StrComHandler.h -12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/startracker/StrComHandler.h -12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h -12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h -12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h -12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h -12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h +12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/StrComHandler.h +12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/StrComHandler.h +12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/StrComHandler.h +12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/acs/StrComHandler.h +12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/acs/StrComHandler.h +12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/acs/StrComHandler.h +12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/acs/StrComHandler.h +12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/acs/StrComHandler.h +12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/acs/StrComHandler.h +12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h +12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h +12511;0x30df;STR_COM_REPLY_TIMEOUT;LOW;Star tracker did not send a valid reply for a certain timeout. P1: Position of upload or download packet for which the packet wa sent. P2: Timeout;linux/acs/StrComHandler.h +12513;0x30e1;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/acs/StrComHandler.h +12514;0x30e2;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/acs/StrComHandler.h +12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/StrComHandler.h +12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/StrComHandler.h +12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/StrComHandler.h +12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/payload/PlocMpsocHelper.h +12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/payload/PlocMpsocHelper.h +12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocMpsocHelper.h +12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHelper.h +12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/payload/PlocMpsocHelper.h +12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/payload/PlocMpsocHelper.h +12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/payload/PayloadPcduHandler.h +12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h 12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/AcsBoardAssembly.h 12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/AcsBoardAssembly.h 12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/AcsBoardAssembly.h @@ -208,43 +208,43 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/SusAssembly.h 12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/acs/SusAssembly.h 13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;No description;mission/system/objects/TcsBoardAssembly.h -13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h -13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/devices/devicedefinitions/GPSDefinitions.h -13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h -13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h -13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h -13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvUartMan.h -13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvUartMan.h -13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvUartMan.h -13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvUartMan.h -13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvUartMan.h -13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvUartMan.h -13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvUartMan.h -13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvUartMan.h -13608;0x3528;SUPV_MEM_CHECK_OK;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvUartMan.h -13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvUartMan.h -13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvUartMan.h -13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvUartMan.h -13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h -13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h -13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13632;0x3540;HDLC_CRC_ERROR;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h +13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/acs/archive/GPSDefinitions.h +13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/acs/archive/GPSDefinitions.h +13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/power/P60DockHandler.h +13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/power/P60DockHandler.h +13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/power/P60DockHandler.h +13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/payload/PlocSupvUartMan.h +13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/payload/PlocSupvUartMan.h +13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/payload/PlocSupvUartMan.h +13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/payload/PlocSupvUartMan.h +13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/payload/PlocSupvUartMan.h +13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/payload/PlocSupvUartMan.h +13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/payload/PlocSupvUartMan.h +13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/payload/PlocSupvUartMan.h +13608;0x3528;SUPV_MEM_CHECK_OK;INFO;No description;linux/payload/PlocSupvUartMan.h +13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;No description;linux/payload/PlocSupvUartMan.h +13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocSupvUartMan.h +13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocSupvUartMan.h +13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/payload/PlocSupvUartMan.h +13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/payload/PlocSupvUartMan.h +13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/payload/PlocSupvUartMan.h +13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/payload/PlocSupvUartMan.h +13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;No description;linux/payload/PlocSupvUartMan.h +13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;No description;linux/payload/PlocSupvUartMan.h +13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/payload/PlocSupvUartMan.h +13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h +13632;0x3540;HDLC_CRC_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h 13701;0x3585;TX_ON;INFO;Transmitter is on now. P1: Submode, P2: Current default datarate.;mission/com/syrlinksDefs.h 13702;0x3586;TX_OFF;INFO;Transmitter is off now.;mission/com/syrlinksDefs.h -13800;0x35e8;MISSING_PACKET;LOW;No description;mission/devices/devicedefinitions/ScexDefinitions.h -13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/devices/devicedefinitions/ScexDefinitions.h -13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/devices/devicedefinitions/ScexDefinitions.h +13800;0x35e8;MISSING_PACKET;LOW;No description;mission/payload/scexHelpers.h +13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/payload/scexHelpers.h +13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/payload/scexHelpers.h 13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h 13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h 13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h diff --git a/generators/bsp_hosted_returnvalues.csv b/generators/bsp_hosted_returnvalues.csv index 2a1ed108..09429179 100644 --- a/generators/bsp_hosted_returnvalues.csv +++ b/generators/bsp_hosted_returnvalues.csv @@ -291,8 +291,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x2e02;HPA_InvalidDomainId;No description;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h 0x2e03;HPA_InvalidValue;No description;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h 0x2e05;HPA_ReadOnly;No description;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h -0x2f01;ASC_TooLongForTargetType;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h -0x2f02;ASC_InvalidCharacters;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h +0x2f01;ASC_NoPacketFound;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h +0x2f02;ASC_PossiblePacketLoss;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h 0x2f03;ASC_BufferTooSmall;No description;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h 0x3001;POS_InPowerTransition;No description;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h 0x3002;POS_SwitchStateMismatch;No description;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h @@ -371,8 +371,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x3e03;HKM_PeriodicHelperInvalid;No description;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h 0x3e04;HKM_PoolobjectNotFound;No description;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h -0x3f01;DLEE_NoPacketFound;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h -0x3f02;DLEE_PossiblePacketLoss;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h +0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h +0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h @@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h -0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h -0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h -0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h +0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h +0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h +0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h 0x4601;HURT_UartReadFailure;No description;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h 0x4602;HURT_UartReadSizeMissmatch;No description;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h 0x4603;HURT_UartRxBufferTooSmall;No description;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h @@ -415,13 +415,19 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4805;HGIO_GpioDuplicateDetected;No description;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h 0x4806;HGIO_GpioInitFailed;No description;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h 0x4807;HGIO_GpioGetValueFailed;No description;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h +0x4aa0;MGMLIS3_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa1;MGMLIS3_InvalidRampTime;Action Message with invalid ramp time was received.;161;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa2;MGMLIS3_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa3;MGMLIS3_ExecutionFailed;Command execution failed;163;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa4;MGMLIS3_CrcError;Reaction wheel reply has invalid crc;164;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa5;MGMLIS3_ValueNotRead;No description;165;MGM_LIS3MDL;mission/acs/RwHandler.h 0x4c00;SPPA_NoPacketFound;No description;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h 0x4c01;SPPA_SplitPacket;No description;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h -0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa2;HEATER_InitFailed;No description;162;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa3;HEATER_InvalidSwitchNr;No description;163;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa4;HEATER_MainSwitchSetTimeout;No description;164;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa5;HEATER_CommandAlreadyWaiting;No description;165;HEATER_HANDLER;mission/devices/HeaterHandler.h +0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa2;HEATER_InitFailed;No description;162;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa3;HEATER_InvalidSwitchNr;No description;163;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa4;HEATER_MainSwitchSetTimeout;No description;164;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa5;HEATER_CommandAlreadyWaiting;No description;165;HEATER_HANDLER;mission/tcs/HeaterHandler.h 0x50a0;SYRLINKS_CrcFailure;No description;160;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a1;SYRLINKS_UartFraminOrParityErrorAck;No description;161;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a2;SYRLINKS_BadCharacterAck;No description;162;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h @@ -449,25 +455,49 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x52b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/acs/rwHelpers.h 0x52b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/acs/rwHelpers.h 0x52b7;RWHA_SpiReadTimeout;Timeout when reading reply;183;RW_HANDLER;mission/acs/rwHelpers.h -0x58a0;SUSS_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SUS_HANDLER;mission/acs/RwHandler.h -0x58a1;SUSS_InvalidRampTime;Action Message with invalid ramp time was received.;161;SUS_HANDLER;mission/acs/RwHandler.h -0x58a2;SUSS_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SUS_HANDLER;mission/acs/RwHandler.h -0x58a3;SUSS_ExecutionFailed;Command execution failed;163;SUS_HANDLER;mission/acs/RwHandler.h -0x58a4;SUSS_CrcError;Reaction wheel reply has invalid crc;164;SUS_HANDLER;mission/acs/RwHandler.h -0x58a5;SUSS_ValueNotRead;No description;165;SUS_HANDLER;mission/acs/RwHandler.h -0x5d00;GOMS_PacketTooLong;No description;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d01;GOMS_InvalidTableId;No description;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d02;GOMS_InvalidAddress;No description;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d03;GOMS_InvalidParamSize;No description;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d04;GOMS_InvalidPayloadSize;No description;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h +0x53a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;160;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a1;STRH_PingFailed;Ping command failed;161;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a2;STRH_VersionReqFailed;Status in version reply signals error;162;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a3;STRH_InterfaceReqFailed;Status in interface reply signals error;163;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a4;STRH_PowerReqFailed;Status in power reply signals error;164;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;165;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a6;STRH_ActionFailed;Status of reply to action command signals error;166;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a7;STRH_FilePathTooLong;Received invalid path string. Exceeds allowed length;167;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a8;STRH_FilenameTooLong;Name of file received with command is too long;168;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a9;STRH_InvalidProgram;Received version reply with invalid program ID;169;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53aa;STRH_ReplyError;Status field reply signals error;170;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ab;STRH_CommandTooShort;Received command which is too short (some data is missing for proper execution);171;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ac;STRH_InvalidLength;Received command with invalid length (too few or too many parameters);172;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ad;STRH_RegionMismatch;Region mismatch between send and received data;173;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ae;STRH_AddressMismatch;Address mismatch between send and received data;174;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53af;STRH_LengthMismatch;Length field mismatch between send and received data;175;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b0;STRH_FileNotExists;Specified file does not exist;176;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b1;STRH_InvalidType;Download blob pixel command has invalid type field;177;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b2;STRH_InvalidId;Received FPGA action command with invalid ID;178;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b3;STRH_ReplyTooShort;Received reply is too short;179;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b4;STRH_CrcFailure;Received reply with invalid CRC;180;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b5;STRH_StrHelperExecuting;Star tracker handler currently executing a command and using the communication interface;181;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h +0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h +0x5d00;GOMS_PacketTooLong;No description;0;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d01;GOMS_InvalidTableId;No description;1;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d02;GOMS_InvalidAddress;No description;2;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d03;GOMS_InvalidParamSize;No description;3;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d04;GOMS_InvalidPayloadSize;No description;4;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h 0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/com/CcsdsIpCoreHandler.h +0x6201;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h +0x6202;JSONBASE_SetNotExists;Requested set does not exist in json file;2;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h +0x6203;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h -0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a3;SADPL_SwitchingDeplSa1Failed;No description;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a4;SADPL_SwitchingDeplSa2Failed;No description;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h +0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a3;SADPL_SwitchingDeplSa1Failed;No description;163;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a4;SADPL_SwitchingDeplSa2Failed;No description;164;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h 0x6900;ACSCTRL_FileDeletionFailed;No description;0;ACS_CTRL;mission/controller/AcsController.h 0x6a02;ACSMEKF_MekfUninitialized;No description;2;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h 0x6a03;ACSMEKF_MekfNoGyrData;No description;3;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 7e543037..19f38913 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -93,33 +93,33 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11204;0x2bc4;MEKF_RECOVERY;INFO;No description;mission/acs/defs.h 11205;0x2bc5;MEKF_INVALID_MODE_VIOLATION;HIGH;No description;mission/acs/defs.h 11206;0x2bc6;SAFE_MODE_CONTROLLER_FAILURE;HIGH;No description;mission/acs/defs.h -11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h -11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h -11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/devices/devicedefinitions/powerDefinitions.h -11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/devices/devicedefinitions/powerDefinitions.h -11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/devices/HeaterHandler.h -11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/devices/HeaterHandler.h -11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/devices/HeaterHandler.h -11403;0x2c8b;HEATER_WENT_OFF;INFO;No description;mission/devices/HeaterHandler.h -11404;0x2c8c;SWITCH_ALREADY_ON;LOW;No description;mission/devices/HeaterHandler.h -11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;No description;mission/devices/HeaterHandler.h -11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;No description;mission/devices/HeaterHandler.h -11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;No description;mission/devices/HeaterHandler.h -11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h -11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h -11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;No description;mission/devices/SolarArrayDeploymentHandler.h -11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;No description;mission/devices/SolarArrayDeploymentHandler.h -11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/devices/SolarArrayDeploymentHandler.h -11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;No description;mission/devices/SolarArrayDeploymentHandler.h -11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h -11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h -11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h -11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h -11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h -11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h +11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.h +11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h +11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h +11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/power/defs.h +11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/tcs/HeaterHandler.h +11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/tcs/HeaterHandler.h +11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/tcs/HeaterHandler.h +11403;0x2c8b;HEATER_WENT_OFF;INFO;No description;mission/tcs/HeaterHandler.h +11404;0x2c8c;SWITCH_ALREADY_ON;LOW;No description;mission/tcs/HeaterHandler.h +11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;No description;mission/tcs/HeaterHandler.h +11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;No description;mission/tcs/HeaterHandler.h +11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;No description;mission/tcs/HeaterHandler.h +11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h +11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h +11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h +11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h +11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h +11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;No description;mission/SolarArrayDeploymentHandler.h +11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/payload/PlocMpsocHandler.h +11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/payload/PlocMpsocHandler.h +11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/payload/PlocMpsocHandler.h +11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/payload/PlocMpsocHandler.h +11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHandler.h +11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/payload/PlocMpsocHandler.h 11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h 11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h 11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h @@ -130,21 +130,21 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/acs/ImtqHandler.h 11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/acs/rwHelpers.h 11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/acs/rwHelpers.h -11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;linux/acs/startracker/StarTrackerHandler.h -11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;linux/acs/startracker/StarTrackerHandler.h -12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h -12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/devices/ploc/PlocSupervisorHandler.h -12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/devices/ploc/PlocSupervisorHandler.h -12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h -12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h -12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h -12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h -12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h +11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h +11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h +12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h +12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h +12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h +12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/PlocSupervisorHandler.h +12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/PlocSupervisorHandler.h +12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h +12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h +12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h 12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h 12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;bsp_q7s/fs/SdCardManager.h -12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h -12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h -12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h +12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/payload/PlocMemoryDumper.h +12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/payload/PlocMemoryDumper.h +12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/payload/PlocMemoryDumper.h 12401;0x3071;INVALID_TC_FRAME;HIGH;No description;linux/ipcore/PdecHandler.h 12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/PdecHandler.h 12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/PdecHandler.h @@ -156,49 +156,49 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;HIGH;No description;linux/ipcore/PdecHandler.h 12410;0x307a;PDEC_RESET_FAILED;HIGH;Failed to pull PDEC reset to low;linux/ipcore/PdecHandler.h 12411;0x307b;OPEN_IRQ_FILE_FAILED;HIGH;Failed to open the IRQ uio file;linux/ipcore/PdecHandler.h -12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/startracker/StrComHandler.h -12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/startracker/StrComHandler.h -12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/startracker/StrComHandler.h -12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/acs/startracker/StrComHandler.h -12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/acs/startracker/StrComHandler.h -12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/acs/startracker/StrComHandler.h -12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/acs/startracker/StrComHandler.h -12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/acs/startracker/StrComHandler.h -12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/acs/startracker/StrComHandler.h -12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/startracker/StrComHandler.h -12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/startracker/StrComHandler.h -12511;0x30df;STR_COM_REPLY_TIMEOUT;LOW;Star tracker did not send a valid reply for a certain timeout. P1: Position of upload or download packet for which the packet wa sent. P2: Timeout;linux/acs/startracker/StrComHandler.h -12513;0x30e1;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/acs/startracker/StrComHandler.h -12514;0x30e2;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/acs/startracker/StrComHandler.h -12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/startracker/StrComHandler.h -12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/startracker/StrComHandler.h -12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/startracker/StrComHandler.h -12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h -12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h -12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h -12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h -12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h -12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/devices/ploc/PlocMPSoCHelper.h -12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h -12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h -12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h +12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/StrComHandler.h +12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/StrComHandler.h +12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/StrComHandler.h +12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/acs/StrComHandler.h +12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/acs/StrComHandler.h +12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/acs/StrComHandler.h +12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/acs/StrComHandler.h +12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/acs/StrComHandler.h +12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/acs/StrComHandler.h +12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h +12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h +12511;0x30df;STR_COM_REPLY_TIMEOUT;LOW;Star tracker did not send a valid reply for a certain timeout. P1: Position of upload or download packet for which the packet wa sent. P2: Timeout;linux/acs/StrComHandler.h +12513;0x30e1;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/acs/StrComHandler.h +12514;0x30e2;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/acs/StrComHandler.h +12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/StrComHandler.h +12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/StrComHandler.h +12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/StrComHandler.h +12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/payload/PlocMpsocHelper.h +12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/payload/PlocMpsocHelper.h +12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocMpsocHelper.h +12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h +12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h +12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHelper.h +12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/payload/PlocMpsocHelper.h +12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/payload/PlocMpsocHelper.h +12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/payload/PayloadPcduHandler.h +12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h +12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h 12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/AcsBoardAssembly.h 12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/AcsBoardAssembly.h 12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/AcsBoardAssembly.h @@ -208,43 +208,43 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/SusAssembly.h 12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/acs/SusAssembly.h 13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;No description;mission/system/objects/TcsBoardAssembly.h -13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h -13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/devices/devicedefinitions/GPSDefinitions.h -13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h -13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h -13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h -13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvUartMan.h -13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvUartMan.h -13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvUartMan.h -13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvUartMan.h -13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvUartMan.h -13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvUartMan.h -13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvUartMan.h -13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvUartMan.h -13608;0x3528;SUPV_MEM_CHECK_OK;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvUartMan.h -13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvUartMan.h -13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h -13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvUartMan.h -13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvUartMan.h -13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h -13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;No description;linux/devices/ploc/PlocSupvUartMan.h -13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h -13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h -13632;0x3540;HDLC_CRC_ERROR;INFO;No description;linux/devices/ploc/PlocSupvUartMan.h +13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/acs/archive/GPSDefinitions.h +13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/acs/archive/GPSDefinitions.h +13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/power/P60DockHandler.h +13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/power/P60DockHandler.h +13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/power/P60DockHandler.h +13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/payload/PlocSupvUartMan.h +13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/payload/PlocSupvUartMan.h +13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/payload/PlocSupvUartMan.h +13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/payload/PlocSupvUartMan.h +13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/payload/PlocSupvUartMan.h +13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/payload/PlocSupvUartMan.h +13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/payload/PlocSupvUartMan.h +13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/payload/PlocSupvUartMan.h +13608;0x3528;SUPV_MEM_CHECK_OK;INFO;No description;linux/payload/PlocSupvUartMan.h +13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;No description;linux/payload/PlocSupvUartMan.h +13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocSupvUartMan.h +13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocSupvUartMan.h +13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/payload/PlocSupvUartMan.h +13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h +13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/payload/PlocSupvUartMan.h +13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/payload/PlocSupvUartMan.h +13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/payload/PlocSupvUartMan.h +13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;No description;linux/payload/PlocSupvUartMan.h +13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;No description;linux/payload/PlocSupvUartMan.h +13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/payload/PlocSupvUartMan.h +13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h +13632;0x3540;HDLC_CRC_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h 13701;0x3585;TX_ON;INFO;Transmitter is on now. P1: Submode, P2: Current default datarate.;mission/com/syrlinksDefs.h 13702;0x3586;TX_OFF;INFO;Transmitter is off now.;mission/com/syrlinksDefs.h -13800;0x35e8;MISSING_PACKET;LOW;No description;mission/devices/devicedefinitions/ScexDefinitions.h -13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/devices/devicedefinitions/ScexDefinitions.h -13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/devices/devicedefinitions/ScexDefinitions.h +13800;0x35e8;MISSING_PACKET;LOW;No description;mission/payload/scexHelpers.h +13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/payload/scexHelpers.h +13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/payload/scexHelpers.h 13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h 13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h 13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv index 53106664..d91b080f 100644 --- a/generators/bsp_q7s_returnvalues.csv +++ b/generators/bsp_q7s_returnvalues.csv @@ -291,8 +291,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x2e02;HPA_InvalidDomainId;No description;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h 0x2e03;HPA_InvalidValue;No description;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h 0x2e05;HPA_ReadOnly;No description;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h -0x2f01;ASC_TooLongForTargetType;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h -0x2f02;ASC_InvalidCharacters;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h +0x2f01;ASC_NoPacketFound;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h +0x2f02;ASC_PossiblePacketLoss;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h 0x2f03;ASC_BufferTooSmall;No description;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h 0x3001;POS_InPowerTransition;No description;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h 0x3002;POS_SwitchStateMismatch;No description;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h @@ -371,8 +371,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x3e03;HKM_PeriodicHelperInvalid;No description;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h 0x3e04;HKM_PoolobjectNotFound;No description;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h -0x3f01;DLEE_NoPacketFound;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h -0x3f02;DLEE_PossiblePacketLoss;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h +0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h +0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h @@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h -0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h -0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h -0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h +0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h +0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h +0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h 0x4601;HURT_UartReadFailure;No description;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h 0x4602;HURT_UartReadSizeMissmatch;No description;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h 0x4603;HURT_UartRxBufferTooSmall;No description;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h @@ -415,13 +415,19 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4805;HGIO_GpioDuplicateDetected;No description;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h 0x4806;HGIO_GpioInitFailed;No description;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h 0x4807;HGIO_GpioGetValueFailed;No description;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h +0x4aa0;MGMLIS3_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa1;MGMLIS3_InvalidRampTime;Action Message with invalid ramp time was received.;161;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa2;MGMLIS3_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa3;MGMLIS3_ExecutionFailed;Command execution failed;163;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa4;MGMLIS3_CrcError;Reaction wheel reply has invalid crc;164;MGM_LIS3MDL;mission/acs/RwHandler.h +0x4aa5;MGMLIS3_ValueNotRead;No description;165;MGM_LIS3MDL;mission/acs/RwHandler.h 0x4c00;SPPA_NoPacketFound;No description;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h 0x4c01;SPPA_SplitPacket;No description;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h -0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa2;HEATER_InitFailed;No description;162;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa3;HEATER_InvalidSwitchNr;No description;163;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa4;HEATER_MainSwitchSetTimeout;No description;164;HEATER_HANDLER;mission/devices/HeaterHandler.h -0x4fa5;HEATER_CommandAlreadyWaiting;No description;165;HEATER_HANDLER;mission/devices/HeaterHandler.h +0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa2;HEATER_InitFailed;No description;162;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa3;HEATER_InvalidSwitchNr;No description;163;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa4;HEATER_MainSwitchSetTimeout;No description;164;HEATER_HANDLER;mission/tcs/HeaterHandler.h +0x4fa5;HEATER_CommandAlreadyWaiting;No description;165;HEATER_HANDLER;mission/tcs/HeaterHandler.h 0x50a0;SYRLINKS_CrcFailure;No description;160;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a1;SYRLINKS_UartFraminOrParityErrorAck;No description;161;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a2;SYRLINKS_BadCharacterAck;No description;162;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h @@ -449,73 +455,69 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x52b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/acs/rwHelpers.h 0x52b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/acs/rwHelpers.h 0x52b7;RWHA_SpiReadTimeout;Timeout when reading reply;183;RW_HANDLER;mission/acs/rwHelpers.h -0x53a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;160;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a1;STRH_PingFailed;Ping command failed;161;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a2;STRH_VersionReqFailed;Status in version reply signals error;162;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a3;STRH_InterfaceReqFailed;Status in interface reply signals error;163;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a4;STRH_PowerReqFailed;Status in power reply signals error;164;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;165;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a6;STRH_ActionFailed;Status of reply to action command signals error;166;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a7;STRH_FilePathTooLong;Received invalid path string. Exceeds allowed length;167;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a8;STRH_FilenameTooLong;Name of file received with command is too long;168;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53a9;STRH_InvalidProgram;Received version reply with invalid program ID;169;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53aa;STRH_ReplyError;Status field reply signals error;170;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53ab;STRH_CommandTooShort;Received command which is too short (some data is missing for proper execution);171;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53ac;STRH_InvalidLength;Received command with invalid length (too few or too many parameters);172;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53ad;STRH_RegionMismatch;Region mismatch between send and received data;173;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53ae;STRH_AddressMismatch;Address mismatch between send and received data;174;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53af;STRH_LengthMismatch;Length field mismatch between send and received data;175;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b0;STRH_FileNotExists;Specified file does not exist;176;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b1;STRH_InvalidType;Download blob pixel command has invalid type field;177;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b2;STRH_InvalidId;Received FPGA action command with invalid ID;178;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b3;STRH_ReplyTooShort;Received reply is too short;179;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b4;STRH_CrcFailure;Received reply with invalid CRC;180;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b5;STRH_StrHelperExecuting;Star tracker handler currently executing a command and using the communication interface;181;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;linux/acs/startracker/StarTrackerHandler.h -0x5402;DWLPWRON_InvalidCrc;No description;2;DWLPWRON_CMD;linux/devices/ScexHelper.h -0x54e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);224;DWLPWRON_CMD;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h -0x54e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);225;DWLPWRON_CMD;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h -0x5700;PLSPVhLP_RequestDone;No description;0;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x5701;PLSPVhLP_NoPacketFound;No description;1;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x5702;PLSPVhLP_DecodeBufTooSmall;No description;2;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x5703;PLSPVhLP_PossiblePacketLossConsecutiveStart;No description;3;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x5704;PLSPVhLP_PossiblePacketLossConsecutiveEnd;No description;4;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x5705;PLSPVhLP_HdlcError;No description;5;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x57a0;PLSPVhLP_FileClosedAccidentally;File accidentally close;160;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x57a1;PLSPVhLP_ProcessTerminated;Process has been terminated by command;161;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x57a2;PLSPVhLP_PathNotExists;Received command with invalid pathname;162;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x57a3;PLSPVhLP_EventBufferReplyInvalidApid;Expected event buffer TM but received space packet with other APID;163;PLOC_SUPV_HELPER;linux/devices/ploc/PlocSupvUartMan.h -0x58a0;SUSS_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SUS_HANDLER;mission/acs/RwHandler.h -0x58a1;SUSS_InvalidRampTime;Action Message with invalid ramp time was received.;161;SUS_HANDLER;mission/acs/RwHandler.h -0x58a2;SUSS_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SUS_HANDLER;mission/acs/RwHandler.h -0x58a3;SUSS_ExecutionFailed;Command execution failed;163;SUS_HANDLER;mission/acs/RwHandler.h -0x58a4;SUSS_CrcError;Reaction wheel reply has invalid crc;164;SUS_HANDLER;mission/acs/RwHandler.h -0x58a5;SUSS_ValueNotRead;No description;165;SUS_HANDLER;mission/acs/RwHandler.h +0x53a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;160;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a1;STRH_PingFailed;Ping command failed;161;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a2;STRH_VersionReqFailed;Status in version reply signals error;162;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a3;STRH_InterfaceReqFailed;Status in interface reply signals error;163;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a4;STRH_PowerReqFailed;Status in power reply signals error;164;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;165;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a6;STRH_ActionFailed;Status of reply to action command signals error;166;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a7;STRH_FilePathTooLong;Received invalid path string. Exceeds allowed length;167;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a8;STRH_FilenameTooLong;Name of file received with command is too long;168;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53a9;STRH_InvalidProgram;Received version reply with invalid program ID;169;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53aa;STRH_ReplyError;Status field reply signals error;170;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ab;STRH_CommandTooShort;Received command which is too short (some data is missing for proper execution);171;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ac;STRH_InvalidLength;Received command with invalid length (too few or too many parameters);172;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ad;STRH_RegionMismatch;Region mismatch between send and received data;173;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53ae;STRH_AddressMismatch;Address mismatch between send and received data;174;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53af;STRH_LengthMismatch;Length field mismatch between send and received data;175;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b0;STRH_FileNotExists;Specified file does not exist;176;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b1;STRH_InvalidType;Download blob pixel command has invalid type field;177;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b2;STRH_InvalidId;Received FPGA action command with invalid ID;178;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b3;STRH_ReplyTooShort;Received reply is too short;179;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b4;STRH_CrcFailure;Received reply with invalid CRC;180;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b5;STRH_StrHelperExecuting;Star tracker handler currently executing a command and using the communication interface;181;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;mission/acs/str/StarTrackerHandler.h +0x54e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);224;DWLPWRON_CMD;linux/payload/plocMpscoDefs.h +0x54e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);225;DWLPWRON_CMD;linux/payload/plocMpscoDefs.h +0x5700;PLSPVhLP_RequestDone;No description;0;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x5701;PLSPVhLP_NoPacketFound;No description;1;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x5702;PLSPVhLP_DecodeBufTooSmall;No description;2;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x5703;PLSPVhLP_PossiblePacketLossConsecutiveStart;No description;3;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x5704;PLSPVhLP_PossiblePacketLossConsecutiveEnd;No description;4;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x5705;PLSPVhLP_HdlcError;No description;5;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x57a0;PLSPVhLP_FileClosedAccidentally;File accidentally close;160;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x57a1;PLSPVhLP_ProcessTerminated;Process has been terminated by command;161;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x57a2;PLSPVhLP_PathNotExists;Received command with invalid pathname;162;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x57a3;PLSPVhLP_EventBufferReplyInvalidApid;Expected event buffer TM but received space packet with other APID;163;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h +0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h +0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h 0x5901;IPCI_NoPacketFound;No description;1;CCSDS_IP_CORE_BRIDGE;linux/com/SyrlinksComHandler.h 0x59a0;IPCI_PapbBusy;No description;160;CCSDS_IP_CORE_BRIDGE;linux/ipcore/PapbVcInterface.h 0x5aa0;PTME_UnknownVcId;No description;160;PTME;linux/ipcore/Ptme.h 0x5c00;STRHLP_NoReplyAvailable;No description;0;STR_HELPER;linux/acs/ImtqPollingTask.h -0x5c01;STRHLP_SdNotMounted;SD card specified in path string not mounted;1;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c02;STRHLP_FileNotExists;Specified file does not exist on filesystem;2;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c03;STRHLP_PathNotExists;Specified path does not exist;3;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c04;STRHLP_FileCreationFailed;Failed to create download image or read flash file;4;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c05;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;5;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c06;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;6;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c07;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;7;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c08;STRHLP_StatusError;Status field in reply signals error;8;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c09;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);9;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c0a;STRHLP_ReceptionTimeout;No description;10;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5c0b;STRHLP_DecodingError;No description;11;STR_HELPER;linux/acs/startracker/StrComHandler.h -0x5d00;GOMS_PacketTooLong;No description;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d01;GOMS_InvalidTableId;No description;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d02;GOMS_InvalidAddress;No description;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d03;GOMS_InvalidParamSize;No description;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d04;GOMS_InvalidPayloadSize;No description;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h -0x5ea0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;160;PLOC_MEMORY_DUMPER;linux/devices/ploc/PlocMemoryDumper.h -0x5ea1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;161;PLOC_MEMORY_DUMPER;linux/devices/ploc/PlocMemoryDumper.h +0x5c01;STRHLP_SdNotMounted;SD card specified in path string not mounted;1;STR_HELPER;linux/acs/StrComHandler.h +0x5c02;STRHLP_FileNotExists;Specified file does not exist on filesystem;2;STR_HELPER;linux/acs/StrComHandler.h +0x5c03;STRHLP_PathNotExists;Specified path does not exist;3;STR_HELPER;linux/acs/StrComHandler.h +0x5c04;STRHLP_FileCreationFailed;Failed to create download image or read flash file;4;STR_HELPER;linux/acs/StrComHandler.h +0x5c05;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;5;STR_HELPER;linux/acs/StrComHandler.h +0x5c06;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;6;STR_HELPER;linux/acs/StrComHandler.h +0x5c07;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;7;STR_HELPER;linux/acs/StrComHandler.h +0x5c08;STRHLP_StatusError;Status field in reply signals error;8;STR_HELPER;linux/acs/StrComHandler.h +0x5c09;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);9;STR_HELPER;linux/acs/StrComHandler.h +0x5c0a;STRHLP_ReceptionTimeout;No description;10;STR_HELPER;linux/acs/StrComHandler.h +0x5c0b;STRHLP_DecodingError;No description;11;STR_HELPER;linux/acs/StrComHandler.h +0x5d00;GOMS_PacketTooLong;No description;0;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d01;GOMS_InvalidTableId;No description;1;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d02;GOMS_InvalidAddress;No description;2;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d03;GOMS_InvalidParamSize;No description;3;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d04;GOMS_InvalidPayloadSize;No description;4;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h +0x5e02;PLMEMDUMP_InvalidCrc;No description;2;PLOC_MEMORY_DUMPER;linux/payload/ScexHelper.h +0x5ea0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;160;PLOC_MEMORY_DUMPER;linux/payload/PlocMemoryDumper.h +0x5ea1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;161;PLOC_MEMORY_DUMPER;linux/payload/PlocMemoryDumper.h 0x5fa0;PDEC_AbandonedCltuRetval;No description;160;PDEC_HANDLER;linux/ipcore/PdecHandler.h 0x5fa1;PDEC_FrameDirtyRetval;No description;161;PDEC_HANDLER;linux/ipcore/PdecHandler.h 0x5fa2;PDEC_FrameIllegalMultipleReasons;No description;162;PDEC_HANDLER;linux/ipcore/PdecHandler.h @@ -536,52 +538,52 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x61a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);161;RATE_SETTER;linux/ipcore/PtmeConfig.h 0x61a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;162;RATE_SETTER;linux/ipcore/PtmeConfig.h 0x61a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;163;RATE_SETTER;linux/ipcore/PtmeConfig.h -0x6201;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;ARCSEC_JSON_BASE;linux/acs/startracker/ArcsecJsonParamBase.h -0x6202;JSONBASE_SetNotExists;Requested set does not exist in json file;2;ARCSEC_JSON_BASE;linux/acs/startracker/ArcsecJsonParamBase.h -0x6203;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;ARCSEC_JSON_BASE;linux/acs/startracker/ArcsecJsonParamBase.h +0x6201;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h +0x6202;JSONBASE_SetNotExists;Requested set does not exist in json file;2;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h +0x6203;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;ARCSEC_JSON_BASE;mission/acs/str/ArcsecJsonParamBase.h 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h 0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h 0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h -0x65a0;PLMPHLP_FileClosedAccidentally;File accidentally close;160;PLOC_MPSOC_HELPER;linux/devices/ploc/PlocMPSoCHelper.h -0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a3;SADPL_SwitchingDeplSa1Failed;No description;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x66a4;SADPL_SwitchingDeplSa2Failed;No description;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h -0x67a0;MPSOCRTVIF_CrcFailure;Space Packet received from PLOC has invalid CRC;160;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a1;MPSOCRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC;161;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a2;MPSOCRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC;162;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a3;MPSOCRTVIF_InvalidApid;Received space packet with invalid APID from PLOC;163;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a4;MPSOCRTVIF_InvalidLength;Received command with invalid length;164;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a5;MPSOCRTVIF_FilenameTooLong;Filename of file in OBC filesystem is too long;165;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;166;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);167;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;168;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x67a9;MPSOCRTVIF_NameTooLong;Received command has file string with invalid length;169;MPSOC_RETURN_VALUES_IF;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h -0x68a0;SPVRTVIF_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;160;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a1;SPVRTVIF_InvalidServiceId;No description;161;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a2;SPVRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;162;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a3;SPVRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;163;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a4;SPVRTVIF_InvalidApid;Received space packet with invalid APID from PLOC supervisor;164;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a5;SPVRTVIF_GetTimeFailure;Failed to read current system time;165;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a6;SPVRTVIF_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;166;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a7;SPVRTVIF_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;167;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a8;SPVRTVIF_InvalidLatchupId;Received latchup config command with invalid latchup ID;168;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68a9;SPVRTVIF_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;169;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68aa;SPVRTVIF_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;170;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68ab;SPVRTVIF_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;171;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68ac;SPVRTVIF_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM wipe commands are invalid (e.g. start address bigger than stop address);172;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68ad;SPVRTVIF_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;173;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68ae;SPVRTVIF_PathDoesNotExist;Path to PLOC directory on SD card does not exist;174;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68af;SPVRTVIF_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;175;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b0;SPVRTVIF_InvalidReplyLength;No description;176;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b1;SPVRTVIF_InvalidLength;Received action command has invalid length;177;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b2;SPVRTVIF_FilenameTooLong;Filename too long;178;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b3;SPVRTVIF_UpdateStatusReportInvalidLength;Received update status report with invalid packet length field;179;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b4;SPVRTVIF_UpdateCrcFailure;Update status report does not contain expected CRC. There might be a bit flip in the update memory region.;180;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68b5;SPVRTVIF_SupvHelperExecuting;Supervisor helper task ist currently executing a command (wait until helper tas has finished or interrupt by sending the terminate command);181;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68c0;SPVRTVIF_BufTooSmall;No description;192;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h -0x68c1;SPVRTVIF_NoReplyTimeout;No description;193;SUPV_RETURN_VALUES_IF;linux/devices/devicedefinitions/PlocSupervisorDefinitions.h +0x65a0;PLMPHLP_FileClosedAccidentally;File accidentally close;160;PLOC_MPSOC_HELPER;linux/payload/PlocMpsocHelper.h +0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a3;SADPL_SwitchingDeplSa1Failed;No description;163;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x66a4;SADPL_SwitchingDeplSa2Failed;No description;164;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h +0x67a0;MPSOCRTVIF_CrcFailure;Space Packet received from PLOC has invalid CRC;160;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a1;MPSOCRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC;161;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a2;MPSOCRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC;162;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a3;MPSOCRTVIF_InvalidApid;Received space packet with invalid APID from PLOC;163;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a4;MPSOCRTVIF_InvalidLength;Received command with invalid length;164;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a5;MPSOCRTVIF_FilenameTooLong;Filename of file in OBC filesystem is too long;165;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;166;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);167;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;168;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x67a9;MPSOCRTVIF_NameTooLong;Received command has file string with invalid length;169;MPSOC_RETURN_VALUES_IF;linux/payload/mpsocRetvals.h +0x68a0;SPVRTVIF_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;160;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a1;SPVRTVIF_InvalidServiceId;No description;161;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a2;SPVRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;162;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a3;SPVRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;163;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a4;SPVRTVIF_InvalidApid;Received space packet with invalid APID from PLOC supervisor;164;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a5;SPVRTVIF_GetTimeFailure;Failed to read current system time;165;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a6;SPVRTVIF_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;166;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a7;SPVRTVIF_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;167;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a8;SPVRTVIF_InvalidLatchupId;Received latchup config command with invalid latchup ID;168;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68a9;SPVRTVIF_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;169;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68aa;SPVRTVIF_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;170;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68ab;SPVRTVIF_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;171;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68ac;SPVRTVIF_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM wipe commands are invalid (e.g. start address bigger than stop address);172;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68ad;SPVRTVIF_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;173;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68ae;SPVRTVIF_PathDoesNotExist;Path to PLOC directory on SD card does not exist;174;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68af;SPVRTVIF_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;175;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b0;SPVRTVIF_InvalidReplyLength;No description;176;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b1;SPVRTVIF_InvalidLength;Received action command has invalid length;177;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b2;SPVRTVIF_FilenameTooLong;Filename too long;178;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b3;SPVRTVIF_UpdateStatusReportInvalidLength;Received update status report with invalid packet length field;179;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b4;SPVRTVIF_UpdateCrcFailure;Update status report does not contain expected CRC. There might be a bit flip in the update memory region.;180;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68b5;SPVRTVIF_SupvHelperExecuting;Supervisor helper task ist currently executing a command (wait until helper tas has finished or interrupt by sending the terminate command);181;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68c0;SPVRTVIF_BufTooSmall;No description;192;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h +0x68c1;SPVRTVIF_NoReplyTimeout;No description;193;SUPV_RETURN_VALUES_IF;linux/payload/plocSupvDefs.h 0x6900;ACSCTRL_FileDeletionFailed;No description;0;ACS_CTRL;mission/controller/AcsController.h 0x6a02;ACSMEKF_MekfUninitialized;No description;2;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h 0x6a03;ACSMEKF_MekfNoGyrData;No description;3;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 66d9ff92..45bee897 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 279 translations. * @details - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 7a02b93a..8d3455e3 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 173 translations. - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateObjects.h" diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index dafdb9d8..7a627d18 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,10 +1,11 @@ add_subdirectory(utility) add_subdirectory(callbacks) add_subdirectory(boardtest) -add_subdirectory(devices) add_subdirectory(ipcore) add_subdirectory(com) add_subdirectory(acs) +add_subdirectory(tcs) +add_subdirectory(payload) if(EIVE_ADD_LINUX_FSFWCONFIG) add_subdirectory(fsfwconfig) @@ -12,7 +13,7 @@ endif() # Dependency on proprietary library if(TGT_BSP MATCHES "arm/q7s") - add_subdirectory(csp) + add_subdirectory(power) endif() target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp scheduling.cpp) diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp index 492bfdcb..20c3e067 100644 --- a/linux/ObjectFactory.cpp +++ b/linux/ObjectFactory.cpp @@ -10,16 +10,16 @@ #include #include #include -#include +#include #include #include -#include -#include -#include +#include +#include #include #include #include #include +#include #include "OBSWConfig.h" #include "devConf.h" diff --git a/linux/ObjectFactory.h b/linux/ObjectFactory.h index a234919f..93c25a86 100644 --- a/linux/ObjectFactory.h +++ b/linux/ObjectFactory.h @@ -5,14 +5,13 @@ #include #include #include +#include #include #include #include #include -#include "mission/devices/HeaterHandler.h" - class GpioIF; class SpiComIF; class PowerSwitchIF; diff --git a/linux/acs/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h index 082853f8..2ce52801 100644 --- a/linux/acs/GpsHyperionLinuxController.h +++ b/linux/acs/GpsHyperionLinuxController.h @@ -2,12 +2,12 @@ #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_ #include +#include #include "eive/eventSubsystemIds.h" #include "fsfw/FSFW.h" #include "fsfw/controller/ExtendedControllerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" -#include "mission/trace.h" #ifdef FSFW_OSAL_LINUX #include diff --git a/linux/acs/SusPolling.cpp b/linux/acs/SusPolling.cpp index dac0255b..aea92ffe 100644 --- a/linux/acs/SusPolling.cpp +++ b/linux/acs/SusPolling.cpp @@ -4,12 +4,11 @@ #include #include #include +#include #include -#include +#include #include -#include "mission/devices/devicedefinitions/susMax1227Helpers.h" - using namespace returnvalue; SusPolling::SusPolling(object_id_t objectId, SpiComIF& spiComIF, GpioIF& gpioIF) diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp index 2521c9a8..1b9b4c65 100644 --- a/linux/boardtest/SpiTestClass.cpp +++ b/linux/boardtest/SpiTestClass.cpp @@ -18,8 +18,9 @@ #if defined(XIPHOS_Q7S) #include "busConf.h" #endif +#include + #include "devices/gpioIds.h" -#include "mission/devices/max1227.h" SpiTestClass::SpiTestClass(object_id_t objectId, GpioIF *gpioIF) : TestTask(objectId), gpioIF(gpioIF) { diff --git a/linux/boardtest/UartTestClass.cpp b/linux/boardtest/UartTestClass.cpp index def7da8b..6522a901 100644 --- a/linux/boardtest/UartTestClass.cpp +++ b/linux/boardtest/UartTestClass.cpp @@ -4,9 +4,10 @@ #include // Contains file controls like O_RDWR #include #include -#include -#include -#include +#include +#include +#include +#include #include // write(), read(), close() #include @@ -18,7 +19,6 @@ #include "fsfw/globalfunctions/DleEncoder.h" #include "fsfw/globalfunctions/arrayprinter.h" #include "fsfw/serviceinterface.h" -#include "mission/devices/devicedefinitions/ScexDefinitions.h" #define GPS_REPLY_WIRETAPPING 0 diff --git a/linux/boardtest/UartTestClass.h b/linux/boardtest/UartTestClass.h index fd20e621..f959f877 100644 --- a/linux/boardtest/UartTestClass.h +++ b/linux/boardtest/UartTestClass.h @@ -6,12 +6,12 @@ #include #include #include +#include #include // Contains POSIX terminal control definitions #include //#include "lwgps/lwgps.h" -#include "mission/devices/devicedefinitions/ScexDefinitions.h" #include "test/TestTask.h" class ScexUartReader; diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt deleted file mode 100644 index 1f027fa2..00000000 --- a/linux/devices/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -target_sources(${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp - ScexDleParser.cpp ScexHelper.cpp) - -add_subdirectory(ploc) diff --git a/linux/devices/ploc/CMakeLists.txt b/linux/devices/ploc/CMakeLists.txt deleted file mode 100644 index 67a0637b..00000000 --- a/linux/devices/ploc/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -target_sources( - ${OBSW_NAME} - PRIVATE PlocSupervisorHandler.cpp PlocMemoryDumper.cpp PlocMPSoCHandler.cpp - PlocMPSoCHelper.cpp PlocSupvUartMan.cpp) diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 1698b6b4..c3d0a8a8 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 279 translations. * @details - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 7a02b93a..8d3455e3 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 173 translations. - * Generated on: 2023-03-24 21:09:31 + * Generated on: 2023-03-26 16:40:57 */ #include "translateObjects.h" diff --git a/linux/payload/CMakeLists.txt b/linux/payload/CMakeLists.txt new file mode 100644 index 00000000..7b2c4486 --- /dev/null +++ b/linux/payload/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources( + ${OBSW_NAME} + PUBLIC PlocMemoryDumper.cpp + PlocMpsocHandler.cpp + PlocMpsocHelper.cpp + PlocSupervisorHandler.cpp + PlocSupvUartMan.cpp + ScexDleParser.cpp + ScexHelper.cpp + ScexUartReader.cpp) diff --git a/linux/devices/ploc/PlocMemoryDumper.cpp b/linux/payload/PlocMemoryDumper.cpp similarity index 99% rename from linux/devices/ploc/PlocMemoryDumper.cpp rename to linux/payload/PlocMemoryDumper.cpp index a5cd04c4..2d61af69 100644 --- a/linux/devices/ploc/PlocMemoryDumper.cpp +++ b/linux/payload/PlocMemoryDumper.cpp @@ -1,6 +1,5 @@ -#include "PlocMemoryDumper.h" - #include +#include #include #include diff --git a/linux/devices/ploc/PlocMemoryDumper.h b/linux/payload/PlocMemoryDumper.h similarity index 96% rename from linux/devices/ploc/PlocMemoryDumper.h rename to linux/payload/PlocMemoryDumper.h index 4a4e05bf..63346d69 100644 --- a/linux/devices/ploc/PlocMemoryDumper.h +++ b/linux/payload/PlocMemoryDumper.h @@ -1,8 +1,8 @@ #ifndef MISSION_DEVICES_PLOCMEMORYDUMPER_H_ #define MISSION_DEVICES_PLOCMEMORYDUMPER_H_ -#include -#include +#include +#include #include "OBSWConfig.h" diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/payload/PlocMpsocHandler.cpp similarity index 99% rename from linux/devices/ploc/PlocMPSoCHandler.cpp rename to linux/payload/PlocMpsocHandler.cpp index 5b53e089..72f2355f 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/payload/PlocMpsocHandler.cpp @@ -1,11 +1,11 @@ -#include "PlocMPSoCHandler.h" +#include +#include #include #include "OBSWConfig.h" #include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/globalfunctions/CRC.h" -#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h" PlocMPSoCHandler::PlocMPSoCHandler(object_id_t objectId, object_id_t uartComIFid, CookieIF* comCookie, PlocMPSoCHelper* plocMPSoCHelper, diff --git a/linux/devices/ploc/PlocMPSoCHandler.h b/linux/payload/PlocMpsocHandler.h similarity index 98% rename from linux/devices/ploc/PlocMPSoCHandler.h rename to linux/payload/PlocMpsocHandler.h index f14fbe9d..10e6bd5d 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.h +++ b/linux/payload/PlocMpsocHandler.h @@ -1,9 +1,13 @@ #ifndef BSP_Q7S_DEVICES_PLOC_PLOCMPSOCHANDLER_H_ #define BSP_Q7S_DEVICES_PLOC_PLOCMPSOCHANDLER_H_ +#include +#include +#include +#include + #include -#include "PlocMPSoCHelper.h" #include "fsfw/action/CommandActionHelper.h" #include "fsfw/action/CommandsActionsIF.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" @@ -11,9 +15,6 @@ #include "fsfw/tmtcservices/SourceSequenceCounter.h" #include "fsfw_hal/linux/gpio/Gpio.h" #include "fsfw_hal/linux/serial/SerialComIF.h" -#include "linux/devices/devicedefinitions/MPSoCReturnValuesIF.h" -#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h" -#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h" /** * @brief This is the device handler for the MPSoC of the payload computer. diff --git a/linux/devices/ploc/PlocMPSoCHelper.cpp b/linux/payload/PlocMpsocHelper.cpp similarity index 99% rename from linux/devices/ploc/PlocMPSoCHelper.cpp rename to linux/payload/PlocMpsocHelper.cpp index fca2e51c..a22462e2 100644 --- a/linux/devices/ploc/PlocMPSoCHelper.cpp +++ b/linux/payload/PlocMpsocHelper.cpp @@ -1,4 +1,4 @@ -#include "PlocMPSoCHelper.h" +#include #include #include diff --git a/linux/devices/ploc/PlocMPSoCHelper.h b/linux/payload/PlocMpsocHelper.h similarity index 98% rename from linux/devices/ploc/PlocMPSoCHelper.h rename to linux/payload/PlocMpsocHelper.h index dea35a82..b74c0844 100644 --- a/linux/devices/ploc/PlocMPSoCHelper.h +++ b/linux/payload/PlocMpsocHelper.h @@ -1,6 +1,9 @@ #ifndef BSP_Q7S_DEVICES_PLOCMPSOCHELPER_H_ #define BSP_Q7S_DEVICES_PLOCMPSOCHELPER_H_ +#include +#include + #include #include "fsfw/devicehandlers/CookieIF.h" @@ -10,8 +13,6 @@ #include "fsfw/tasks/ExecutableObjectIF.h" #include "fsfw/tmtcservices/SourceSequenceCounter.h" #include "fsfw_hal/linux/serial/SerialComIF.h" -#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h" -#include "mission/trace.h" #ifdef XIPHOS_Q7S #include "bsp_q7s/fs/SdCardManager.h" #endif diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/payload/PlocSupervisorHandler.cpp similarity index 100% rename from linux/devices/ploc/PlocSupervisorHandler.cpp rename to linux/payload/PlocSupervisorHandler.cpp diff --git a/linux/devices/ploc/PlocSupervisorHandler.h b/linux/payload/PlocSupervisorHandler.h similarity index 99% rename from linux/devices/ploc/PlocSupervisorHandler.h rename to linux/payload/PlocSupervisorHandler.h index dcad9d09..78c20205 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.h +++ b/linux/payload/PlocSupervisorHandler.h @@ -1,7 +1,8 @@ #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ -#include +#include +#include #include "OBSWConfig.h" #include "devices/powerSwitcherList.h" @@ -10,7 +11,6 @@ #include "fsfw_hal/linux/gpio/Gpio.h" #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" #include "fsfw_hal/linux/serial/SerialComIF.h" -#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h" #ifdef XIPHOS_Q7S #include "bsp_q7s/fs/SdCardManager.h" diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/payload/PlocSupvUartMan.cpp similarity index 99% rename from linux/devices/ploc/PlocSupvUartMan.cpp rename to linux/payload/PlocSupvUartMan.cpp index fe8516b5..e4371be5 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/payload/PlocSupvUartMan.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/linux/devices/ploc/PlocSupvUartMan.h b/linux/payload/PlocSupvUartMan.h similarity index 99% rename from linux/devices/ploc/PlocSupvUartMan.h rename to linux/payload/PlocSupvUartMan.h index 7b32ffac..61d4b284 100644 --- a/linux/devices/ploc/PlocSupvUartMan.h +++ b/linux/payload/PlocSupvUartMan.h @@ -2,6 +2,8 @@ #define BSP_Q7S_DEVICES_PLOCSUPVHELPER_H_ #include +#include +#include #include #include @@ -14,8 +16,6 @@ #include "fsfw/returnvalues/returnvalue.h" #include "fsfw/tasks/ExecutableObjectIF.h" #include "fsfw_hal/linux/serial/SerialComIF.h" -#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h" -#include "mission/trace.h" #include "tas/crc.h" #ifdef XIPHOS_Q7S diff --git a/linux/devices/ScexDleParser.cpp b/linux/payload/ScexDleParser.cpp similarity index 86% rename from linux/devices/ScexDleParser.cpp rename to linux/payload/ScexDleParser.cpp index a2f01396..2de84872 100644 --- a/linux/devices/ScexDleParser.cpp +++ b/linux/payload/ScexDleParser.cpp @@ -1,4 +1,4 @@ -#include "ScexDleParser.h" +#include ScexDleParser::ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder, BufPair encodedBuf, BufPair decodedBuf) diff --git a/linux/devices/ScexDleParser.h b/linux/payload/ScexDleParser.h similarity index 100% rename from linux/devices/ScexDleParser.h rename to linux/payload/ScexDleParser.h diff --git a/linux/devices/ScexHelper.cpp b/linux/payload/ScexHelper.cpp similarity index 98% rename from linux/devices/ScexHelper.cpp rename to linux/payload/ScexHelper.cpp index bce5fbda..73937030 100644 --- a/linux/devices/ScexHelper.cpp +++ b/linux/payload/ScexHelper.cpp @@ -1,6 +1,5 @@ -#include "ScexHelper.h" - #include +#include #include "fsfw/serviceinterface.h" diff --git a/linux/devices/ScexHelper.h b/linux/payload/ScexHelper.h similarity index 88% rename from linux/devices/ScexHelper.h rename to linux/payload/ScexHelper.h index f2adf617..b95c605b 100644 --- a/linux/devices/ScexHelper.h +++ b/linux/payload/ScexHelper.h @@ -1,7 +1,7 @@ -#ifndef LINUX_DEVICES_SCEXHELPER_H_ -#define LINUX_DEVICES_SCEXHELPER_H_ +#ifndef LINUX_PAYLOAD_SCEXHELPER_H_ +#define LINUX_PAYLOAD_SCEXHELPER_H_ #include -#include +#include #include #include @@ -43,4 +43,4 @@ class ScexHelper : public SerializeIF { size_t totalPacketLen = 0; }; -#endif /* LINUX_DEVICES_SCEXHELPER_H_ */ +#endif /* LINUX_PAYLOAD_SCEXHELPER_H_ */ diff --git a/linux/devices/ScexUartReader.cpp b/linux/payload/ScexUartReader.cpp similarity index 99% rename from linux/devices/ScexUartReader.cpp rename to linux/payload/ScexUartReader.cpp index 9aa2287c..ccc629ff 100644 --- a/linux/devices/ScexUartReader.cpp +++ b/linux/payload/ScexUartReader.cpp @@ -1,5 +1,3 @@ -#include "ScexUartReader.h" - #include // Contains file controls like O_RDWR #include #include @@ -7,6 +5,7 @@ #include #include #include +#include #include // write(), read(), close() #include // Error integer and strerror() function diff --git a/linux/devices/ScexUartReader.h b/linux/payload/ScexUartReader.h similarity index 98% rename from linux/devices/ScexUartReader.h rename to linux/payload/ScexUartReader.h index 8f5454b2..5b2bbb8b 100644 --- a/linux/devices/ScexUartReader.h +++ b/linux/payload/ScexUartReader.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include // Contains POSIX terminal control definitions class SemaphoreIF; diff --git a/linux/devices/devicedefinitions/MPSoCReturnValuesIF.h b/linux/payload/mpsocRetvals.h similarity index 100% rename from linux/devices/devicedefinitions/MPSoCReturnValuesIF.h rename to linux/payload/mpsocRetvals.h diff --git a/linux/devices/devicedefinitions/PlocMemDumpDefinitions.h b/linux/payload/plocMemDumpDefs.h similarity index 100% rename from linux/devices/devicedefinitions/PlocMemDumpDefinitions.h rename to linux/payload/plocMemDumpDefs.h diff --git a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h b/linux/payload/plocMpscoDefs.h similarity index 99% rename from linux/devices/devicedefinitions/PlocMPSoCDefinitions.h rename to linux/payload/plocMpscoDefs.h index ef769eef..975dad32 100644 --- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h +++ b/linux/payload/plocMpscoDefs.h @@ -1,12 +1,14 @@ #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_PLOCMPSOCDEFINITIONS_H_ #define MISSION_DEVICES_DEVICEDEFINITIONS_PLOCMPSOCDEFINITIONS_H_ -#include "MPSoCReturnValuesIF.h" +#include +#include +#include + #include "OBSWConfig.h" #include "eive/definitions.h" #include "fsfw/globalfunctions/CRC.h" #include "fsfw/serialize/SerializeAdapter.h" -#include "mission/devices/devicedefinitions/SpBase.h" namespace mpsoc { diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/payload/plocSupvDefs.h similarity index 99% rename from linux/devices/devicedefinitions/PlocSupervisorDefinitions.h rename to linux/payload/plocSupvDefs.h index ffc310f0..d3fda3da 100644 --- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h +++ b/linux/payload/plocSupvDefs.h @@ -8,11 +8,11 @@ #include #include #include +#include #include #include "eive/resultClassIds.h" -#include "mission/devices/devicedefinitions/SpBase.h" namespace supv { diff --git a/linux/csp/CMakeLists.txt b/linux/power/CMakeLists.txt similarity index 100% rename from linux/csp/CMakeLists.txt rename to linux/power/CMakeLists.txt diff --git a/linux/csp/CspComIF.cpp b/linux/power/CspComIF.cpp similarity index 99% rename from linux/csp/CspComIF.cpp rename to linux/power/CspComIF.cpp index 6aef5205..1b1cd0a0 100644 --- a/linux/csp/CspComIF.cpp +++ b/linux/power/CspComIF.cpp @@ -1,8 +1,7 @@ -#include "CspComIF.h" - #include #include #include +#include #include #include #include diff --git a/linux/csp/CspComIF.h b/linux/power/CspComIF.h similarity index 96% rename from linux/csp/CspComIF.h rename to linux/power/CspComIF.h index 47712230..615064c2 100644 --- a/linux/csp/CspComIF.h +++ b/linux/power/CspComIF.h @@ -1,5 +1,5 @@ -#ifndef LINUX_CSP_CSPCOMIF_H_ -#define LINUX_CSP_CSPCOMIF_H_ +#ifndef LINUX_POWER_CSPCOMIF_H_ +#define LINUX_POWER_CSPCOMIF_H_ #include #include @@ -90,4 +90,4 @@ class CspComIF : public DeviceCommunicationIF, public SystemObject { static void *routerWorkWrapper(void *args); }; -#endif /* LINUX_CSP_CSPCOMIF_H_ */ +#endif /* LINUX_POWER_CSPCOMIF_H_ */ diff --git a/linux/tcs/CMakeLists.txt b/linux/tcs/CMakeLists.txt new file mode 100644 index 00000000..3721f02a --- /dev/null +++ b/linux/tcs/CMakeLists.txt @@ -0,0 +1 @@ +target_sources(${OBSW_NAME} PUBLIC Max31865RtdPolling.cpp) diff --git a/linux/devices/Max31865RtdPolling.cpp b/linux/tcs/Max31865RtdPolling.cpp similarity index 99% rename from linux/devices/Max31865RtdPolling.cpp rename to linux/tcs/Max31865RtdPolling.cpp index db13a76c..f8ec7ed9 100644 --- a/linux/devices/Max31865RtdPolling.cpp +++ b/linux/tcs/Max31865RtdPolling.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define OBSW_RTD_AUTO_MODE 1 diff --git a/linux/devices/Max31865RtdPolling.h b/linux/tcs/Max31865RtdPolling.h similarity index 98% rename from linux/devices/Max31865RtdPolling.h rename to linux/tcs/Max31865RtdPolling.h index ef73fb8b..e865d66d 100644 --- a/linux/devices/Max31865RtdPolling.h +++ b/linux/tcs/Max31865RtdPolling.h @@ -6,10 +6,10 @@ #include #include #include +#include #include "devConf.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" struct Max31865ReaderCookie : public CookieIF { Max31865ReaderCookie(){}; diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt index b8d0aaa0..bb7cf140 100644 --- a/mission/CMakeLists.txt +++ b/mission/CMakeLists.txt @@ -1,6 +1,4 @@ add_subdirectory(controller) -add_subdirectory(core) -add_subdirectory(devices) add_subdirectory(utility) add_subdirectory(memory) add_subdirectory(tmtc) @@ -8,7 +6,12 @@ add_subdirectory(system) add_subdirectory(com) add_subdirectory(acs) add_subdirectory(power) +add_subdirectory(tcs) +add_subdirectory(payload) add_subdirectory(cfdp) add_subdirectory(config) -target_sources(${LIB_EIVE_MISSION} PRIVATE payloadDefs.cpp trace.cpp) +target_sources( + ${LIB_EIVE_MISSION} + PRIVATE SolarArrayDeploymentHandler.cpp genericFactory.cpp + pollingSeqTables.cpp scheduling.cpp) diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/SolarArrayDeploymentHandler.cpp similarity index 99% rename from mission/devices/SolarArrayDeploymentHandler.cpp rename to mission/SolarArrayDeploymentHandler.cpp index 81807351..05128d24 100644 --- a/mission/devices/SolarArrayDeploymentHandler.cpp +++ b/mission/SolarArrayDeploymentHandler.cpp @@ -1,7 +1,7 @@ -#include "SolarArrayDeploymentHandler.h" - #include #include +#include +#include #include #include @@ -11,7 +11,6 @@ #include "fsfw/ipc/QueueFactory.h" #include "fsfw/objectmanager/ObjectManager.h" #include "fsfw_hal/common/gpio/GpioCookie.h" -#include "mission/trace.h" static constexpr bool DEBUG_MODE = true; diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/SolarArrayDeploymentHandler.h similarity index 99% rename from mission/devices/SolarArrayDeploymentHandler.h rename to mission/SolarArrayDeploymentHandler.h index 61211ca3..3c15c77e 100644 --- a/mission/devices/SolarArrayDeploymentHandler.h +++ b/mission/SolarArrayDeploymentHandler.h @@ -2,6 +2,7 @@ #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_ #include +#include #include @@ -19,7 +20,6 @@ #include "fsfw/timemanager/Countdown.h" #include "fsfw_hal/common/gpio/GpioIF.h" #include "mission/memory/SdCardMountedIF.h" -#include "mission/trace.h" #include "returnvalues/classIds.h" enum DeploymentChannels : uint8_t { SA_1 = 1, SA_2 = 2 }; diff --git a/mission/acs/SusHandler.cpp b/mission/acs/SusHandler.cpp index 886c7cec..46255165 100644 --- a/mission/acs/SusHandler.cpp +++ b/mission/acs/SusHandler.cpp @@ -1,6 +1,6 @@ #include "SusHandler.h" -#include +#include #include diff --git a/mission/acs/SusHandler.h b/mission/acs/SusHandler.h index 340a1c4c..ad7d7a17 100644 --- a/mission/acs/SusHandler.h +++ b/mission/acs/SusHandler.h @@ -3,11 +3,11 @@ #include #include +#include #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "mission/acs/acsBoardPolling.h" -#include "mission/devices/devicedefinitions/susMax1227Helpers.h" class SusHandler : public DeviceHandlerBase { public: diff --git a/mission/acs/archive/LegacySusHandler.h b/mission/acs/archive/LegacySusHandler.h index 5a16d180..e9968e39 100644 --- a/mission/acs/archive/LegacySusHandler.h +++ b/mission/acs/archive/LegacySusHandler.h @@ -2,11 +2,11 @@ #define MISSION_DEVICES_LEGACYSUSHANDLER_H_ #include -#include +#include +#include #include "events/subsystemIdRanges.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" -#include "mission/devices/max1227.h" #include "returnvalues/classIds.h" /** diff --git a/mission/devices/devicedefinitions/susMax1227Helpers.h b/mission/acs/susMax1227Helpers.h similarity index 100% rename from mission/devices/devicedefinitions/susMax1227Helpers.h rename to mission/acs/susMax1227Helpers.h diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h index 1215c1ea..6cbc7b2c 100644 --- a/mission/controller/AcsController.h +++ b/mission/controller/AcsController.h @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include "acs/ActuatorCmd.h" #include "acs/Guidance.h" diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 03addc23..14db6c0e 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index 6eddfd76..4624c411 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -11,20 +11,19 @@ #include #include #include +#include #include #include -#include -#include -#include -#include +#include #include #include +#include +#include +#include +#include #include -#include "mission/devices/HeaterHandler.h" -#include "mission/trace.h" - /** * NOP Limit: Hard limit for device, usually from datasheet. Device damage is possible lif NOP limit * is exceeded. diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h index 177354e2..d7da66c0 100644 --- a/mission/controller/acs/SensorValues.h +++ b/mission/controller/acs/SensorValues.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace ACS { diff --git a/mission/core/CMakeLists.txt b/mission/core/CMakeLists.txt deleted file mode 100644 index ce731219..00000000 --- a/mission/core/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp - pollingSeqTables.cpp) diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt deleted file mode 100644 index 42a2c69a..00000000 --- a/mission/devices/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -target_sources( - ${LIB_EIVE_MISSION} - PRIVATE Tmp1075Handler.cpp - Max31865EiveHandler.cpp - HeaterHandler.cpp - RadiationSensorHandler.cpp - max1227.cpp - PayloadPcduHandler.cpp - SolarArrayDeploymentHandler.cpp - ScexDeviceHandler.cpp) - -add_subdirectory(devicedefinitions) diff --git a/mission/devices/devicedefinitions/CMakeLists.txt b/mission/devices/devicedefinitions/CMakeLists.txt deleted file mode 100644 index 0ecd64e6..00000000 --- a/mission/devices/devicedefinitions/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp) diff --git a/mission/core/GenericFactory.cpp b/mission/genericFactory.cpp similarity index 99% rename from mission/core/GenericFactory.cpp rename to mission/genericFactory.cpp index 9e18061c..46a14daf 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/genericFactory.cpp @@ -1,5 +1,3 @@ -#include "GenericFactory.h" - #include #include #include @@ -26,13 +24,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/mission/core/GenericFactory.h b/mission/genericFactory.h similarity index 97% rename from mission/core/GenericFactory.h rename to mission/genericFactory.h index 1c5e9ce6..58edfc02 100644 --- a/mission/core/GenericFactory.h +++ b/mission/genericFactory.h @@ -4,12 +4,12 @@ #include #include #include +#include #include #include "fsfw/objectmanager/SystemObjectIF.h" #include "fsfw/power/PowerSwitchIF.h" #include "fsfw_hal/common/gpio/GpioIF.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" using persTmStore::PersistentTmStores; diff --git a/mission/payload/CMakeLists.txt b/mission/payload/CMakeLists.txt new file mode 100644 index 00000000..f48a594b --- /dev/null +++ b/mission/payload/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources( + ${LIB_EIVE_MISSION} PRIVATE PayloadPcduHandler.cpp RadiationSensorHandler.cpp + ScexDeviceHandler.cpp scexHelpers.cpp defs.cpp) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/payload/PayloadPcduHandler.cpp similarity index 99% rename from mission/devices/PayloadPcduHandler.cpp rename to mission/payload/PayloadPcduHandler.cpp index b93936d7..ff0c8557 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/payload/PayloadPcduHandler.cpp @@ -1,6 +1,5 @@ -#include "PayloadPcduHandler.h" - #include +#include #include "OBSWConfig.h" diff --git a/mission/devices/PayloadPcduHandler.h b/mission/payload/PayloadPcduHandler.h similarity index 99% rename from mission/devices/PayloadPcduHandler.h rename to mission/payload/PayloadPcduHandler.h index 2f86ebf9..b73de353 100644 --- a/mission/devices/PayloadPcduHandler.h +++ b/mission/payload/PayloadPcduHandler.h @@ -4,12 +4,12 @@ #include #include #include +#include #include #include "events/subsystemIdRanges.h" #include "fsfw/FSFW.h" #include "fsfw_hal/common/gpio/GpioIF.h" -#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/memory/SdCardMountedIF.h" #include "mission/power/defs.h" #include "mission/system/DualLanePowerStateMachine.h" diff --git a/mission/devices/RadiationSensorHandler.cpp b/mission/payload/RadiationSensorHandler.cpp similarity index 99% rename from mission/devices/RadiationSensorHandler.cpp rename to mission/payload/RadiationSensorHandler.cpp index f6500ec2..d18fcb2c 100644 --- a/mission/devices/RadiationSensorHandler.cpp +++ b/mission/payload/RadiationSensorHandler.cpp @@ -1,9 +1,9 @@ #include #include #include -#include -#include +#include #include +#include RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie, GpioIF *gpioIF, diff --git a/mission/devices/RadiationSensorHandler.h b/mission/payload/RadiationSensorHandler.h similarity index 90% rename from mission/devices/RadiationSensorHandler.h rename to mission/payload/RadiationSensorHandler.h index b4ad39de..de9bcc93 100644 --- a/mission/devices/RadiationSensorHandler.h +++ b/mission/payload/RadiationSensorHandler.h @@ -1,9 +1,9 @@ -#ifndef MISSION_DEVICES_RADIATIONSENSORHANDLER_H_ -#define MISSION_DEVICES_RADIATIONSENSORHANDLER_H_ +#ifndef MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_ +#define MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_ #include #include -#include +#include #include /** @@ -54,4 +54,4 @@ class RadiationSensorHandler : public DeviceHandlerBase { CommunicationStep communicationStep = CommunicationStep::START_CONVERSION; }; -#endif /* MISSION_DEVICES_RADIATIONSENSORHANDLER_H_ */ +#endif /* MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_ */ diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/payload/ScexDeviceHandler.cpp similarity index 98% rename from mission/devices/ScexDeviceHandler.cpp rename to mission/payload/ScexDeviceHandler.cpp index 9f41c8a0..7ef070a9 100644 --- a/mission/devices/ScexDeviceHandler.cpp +++ b/mission/payload/ScexDeviceHandler.cpp @@ -1,8 +1,8 @@ -#include "ScexDeviceHandler.h" - #include -#include +#include #include +#include +#include #include #include @@ -12,7 +12,6 @@ #include #include "fsfw/globalfunctions/CRC.h" -#include "mission/devices/devicedefinitions/ScexDefinitions.h" using std::ofstream; using namespace returnvalue; diff --git a/mission/devices/ScexDeviceHandler.h b/mission/payload/ScexDeviceHandler.h similarity index 91% rename from mission/devices/ScexDeviceHandler.h rename to mission/payload/ScexDeviceHandler.h index a164c5e2..089a9005 100644 --- a/mission/devices/ScexDeviceHandler.h +++ b/mission/payload/ScexDeviceHandler.h @@ -1,9 +1,9 @@ -#ifndef MISSION_DEVICES_SCEXDEVICEHANDLER_H_ -#define MISSION_DEVICES_SCEXDEVICEHANDLER_H_ +#ifndef MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ +#define MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ #include -#include -#include +#include +#include #include @@ -62,4 +62,4 @@ class ScexDeviceHandler : public DeviceHandlerBase { void modeChanged() override; }; -#endif /* MISSION_DEVICES_SCEXDEVICEHANDLER_H_ */ +#endif /* MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ */ diff --git a/mission/payloadDefs.cpp b/mission/payload/defs.cpp similarity index 94% rename from mission/payloadDefs.cpp rename to mission/payload/defs.cpp index b57f278a..d5d4912e 100644 --- a/mission/payloadDefs.cpp +++ b/mission/payload/defs.cpp @@ -1,4 +1,4 @@ -#include "payloadDefs.h" +#include const char* payload::getModeStr(Mode mode) { static const char* modeStr = "UNKNOWN"; diff --git a/mission/payloadDefs.h b/mission/payload/defs.h similarity index 100% rename from mission/payloadDefs.h rename to mission/payload/defs.h diff --git a/mission/devices/devicedefinitions/payloadPcduDefinitions.h b/mission/payload/payloadPcduDefinitions.h similarity index 99% rename from mission/devices/devicedefinitions/payloadPcduDefinitions.h rename to mission/payload/payloadPcduDefinitions.h index a5c3effd..e6c7b653 100644 --- a/mission/devices/devicedefinitions/payloadPcduDefinitions.h +++ b/mission/payload/payloadPcduDefinitions.h @@ -4,13 +4,13 @@ #include #include #include +#include #include #include #include #include "OBSWConfig.h" -#include "mission/devices/max1227.h" namespace plpcdu { diff --git a/mission/devices/devicedefinitions/SpBase.h b/mission/payload/plocSpBase.h similarity index 95% rename from mission/devices/devicedefinitions/SpBase.h rename to mission/payload/plocSpBase.h index 8678cf9d..e754c7e8 100644 --- a/mission/devices/devicedefinitions/SpBase.h +++ b/mission/payload/plocSpBase.h @@ -1,6 +1,7 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_ +#ifndef MISSION_PAYLOAD_PLOCSPBASE_H_ +#define MISSION_PAYLOAD_PLOCSPBASE_H_ +#include #include #include @@ -117,4 +118,4 @@ class SpTmReader : public SpacePacketReader { } // namespace ploc -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_ */ +#endif /* MISSION_PAYLOAD_PLOCSPBASE_H_ */ diff --git a/mission/devices/devicedefinitions/RadSensorDefinitions.h b/mission/payload/radSensorDefinitions.h similarity index 100% rename from mission/devices/devicedefinitions/RadSensorDefinitions.h rename to mission/payload/radSensorDefinitions.h diff --git a/mission/devices/devicedefinitions/ScexDefinitions.cpp b/mission/payload/scexHelpers.cpp similarity index 97% rename from mission/devices/devicedefinitions/ScexDefinitions.cpp rename to mission/payload/scexHelpers.cpp index c4319876..26f6a139 100644 --- a/mission/devices/devicedefinitions/ScexDefinitions.cpp +++ b/mission/payload/scexHelpers.cpp @@ -1,6 +1,5 @@ -#include "ScexDefinitions.h" - #include +#include #include diff --git a/mission/devices/devicedefinitions/ScexDefinitions.h b/mission/payload/scexHelpers.h similarity index 88% rename from mission/devices/devicedefinitions/ScexDefinitions.h rename to mission/payload/scexHelpers.h index 22e3878b..aa0f320b 100644 --- a/mission/devices/devicedefinitions/ScexDefinitions.h +++ b/mission/payload/scexHelpers.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_ +#ifndef MISSION_PAYLOAD_SCEXHELPERS_H_ +#define MISSION_PAYLOAD_SCEXHELPERS_H_ #include #include @@ -49,4 +49,4 @@ ReturnValue_t prepareScexCmd(Cmds cmd, std::pair cmdBufPair, s } // namespace scex -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_ */ +#endif /* MISSION_PAYLOAD_SCEXHELPERS_H_ */ diff --git a/mission/core/pollingSeqTables.cpp b/mission/pollingSeqTables.cpp similarity index 99% rename from mission/core/pollingSeqTables.cpp rename to mission/pollingSeqTables.cpp index 13506a8c..8d172132 100644 --- a/mission/core/pollingSeqTables.cpp +++ b/mission/pollingSeqTables.cpp @@ -5,10 +5,10 @@ #include #include #include +#include #include "OBSWConfig.h" #include "eive/definitions.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" #ifndef RPI_TEST_ADIS16507 #define RPI_TEST_ADIS16507 0 diff --git a/mission/core/pollingSeqTables.h b/mission/pollingSeqTables.h similarity index 100% rename from mission/core/pollingSeqTables.h rename to mission/pollingSeqTables.h diff --git a/mission/power/BpxBatteryHandler.h b/mission/power/BpxBatteryHandler.h index 9f27ce34..40e98124 100644 --- a/mission/power/BpxBatteryHandler.h +++ b/mission/power/BpxBatteryHandler.h @@ -3,8 +3,7 @@ #include #include - -#include "mission/trace.h" +#include class BpxBatteryHandler : public DeviceHandlerBase { public: diff --git a/mission/core/scheduling.cpp b/mission/scheduling.cpp similarity index 96% rename from mission/core/scheduling.cpp rename to mission/scheduling.cpp index 50b5e473..f89ce711 100644 --- a/mission/core/scheduling.cpp +++ b/mission/scheduling.cpp @@ -1,7 +1,8 @@ #include "scheduling.h" +#include + #include "fsfw/tasks/PeriodicTaskIF.h" -#include "mission/devices/devicedefinitions/Max31865Definitions.h" void scheduling::scheduleTmpTempSensors(PeriodicTaskIF* tmpTask) { const std::array tmpIds = { diff --git a/mission/core/scheduling.h b/mission/scheduling.h similarity index 100% rename from mission/core/scheduling.h rename to mission/scheduling.h diff --git a/mission/system/objects/PayloadSubsystem.cpp b/mission/system/objects/PayloadSubsystem.cpp index 5cbd4459..f8e3b08f 100644 --- a/mission/system/objects/PayloadSubsystem.cpp +++ b/mission/system/objects/PayloadSubsystem.cpp @@ -1,6 +1,6 @@ #include "PayloadSubsystem.h" -#include "mission/payloadDefs.h" +#include PayloadSubsystem::PayloadSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables) diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp index 511cf5f1..ab67852d 100644 --- a/mission/system/tree/payloadModeTree.cpp +++ b/mission/system/tree/payloadModeTree.cpp @@ -4,10 +4,10 @@ #include #include #include +#include +#include #include "eive/objects.h" -#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" -#include "mission/payloadDefs.h" #include "mission/power/defs.h" #include "mission/system/objects/PayloadSubsystem.h" #include "util.h" diff --git a/mission/tcs/CMakeLists.txt b/mission/tcs/CMakeLists.txt new file mode 100644 index 00000000..ea077050 --- /dev/null +++ b/mission/tcs/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources( + ${LIB_EIVE_MISSION} PRIVATE HeaterHandler.cpp max1227.cpp + Max31865EiveHandler.cpp Tmp1075Handler.cpp) diff --git a/mission/devices/HeaterHandler.cpp b/mission/tcs/HeaterHandler.cpp similarity index 99% rename from mission/devices/HeaterHandler.cpp rename to mission/tcs/HeaterHandler.cpp index 150c4778..4ceaa4ee 100644 --- a/mission/devices/HeaterHandler.cpp +++ b/mission/tcs/HeaterHandler.cpp @@ -1,9 +1,8 @@ -#include "HeaterHandler.h" - #include #include #include #include +#include #include diff --git a/mission/devices/HeaterHandler.h b/mission/tcs/HeaterHandler.h similarity index 98% rename from mission/devices/HeaterHandler.h rename to mission/tcs/HeaterHandler.h index 42f42abf..05e7e5d8 100644 --- a/mission/devices/HeaterHandler.h +++ b/mission/tcs/HeaterHandler.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_HEATERHANDLER_H_ -#define MISSION_DEVICES_HEATERHANDLER_H_ +#ifndef MISSION_TCS_HEATERHANDLER_H_ +#define MISSION_TCS_HEATERHANDLER_H_ #include #include @@ -209,4 +209,4 @@ class HeaterHandler : public ExecutableObjectIF, bool allSwitchesOff(); }; -#endif /* MISSION_DEVICES_HEATERHANDLER_H_ */ +#endif /* MISSION_TCS_HEATERHANDLER_H_ */ diff --git a/mission/devices/devicedefinitions/Max31865Definitions.h b/mission/tcs/Max31865Definitions.h similarity index 100% rename from mission/devices/devicedefinitions/Max31865Definitions.h rename to mission/tcs/Max31865Definitions.h diff --git a/mission/devices/Max31865EiveHandler.cpp b/mission/tcs/Max31865EiveHandler.cpp similarity index 99% rename from mission/devices/Max31865EiveHandler.cpp rename to mission/tcs/Max31865EiveHandler.cpp index 3fcd0f32..284a2d0c 100644 --- a/mission/devices/Max31865EiveHandler.cpp +++ b/mission/tcs/Max31865EiveHandler.cpp @@ -1,6 +1,5 @@ -#include "Max31865EiveHandler.h" - #include +#include Max31865EiveHandler::Max31865EiveHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie) diff --git a/mission/devices/Max31865EiveHandler.h b/mission/tcs/Max31865EiveHandler.h similarity index 90% rename from mission/devices/Max31865EiveHandler.h rename to mission/tcs/Max31865EiveHandler.h index 6a030718..aa159ba9 100644 --- a/mission/devices/Max31865EiveHandler.h +++ b/mission/tcs/Max31865EiveHandler.h @@ -1,10 +1,9 @@ -#ifndef MISSION_DEVICES_MAX31865EIVEHANDLER_H_ -#define MISSION_DEVICES_MAX31865EIVEHANDLER_H_ +#ifndef MISSION_TCS_MAX31865EIVEHANDLER_H_ +#define MISSION_TCS_MAX31865EIVEHANDLER_H_ #include #include - -#include "devicedefinitions/Max31865Definitions.h" +#include class Max31865EiveHandler : public DeviceHandlerBase { public: @@ -44,4 +43,4 @@ class Max31865EiveHandler : public DeviceHandlerBase { bool transitionOk = false; }; -#endif /* MISSION_DEVICES_MAX31865EIVEHANDLER_H_ */ +#endif /* MISSION_TCS_MAX31865EIVEHANDLER_H_ */ diff --git a/mission/devices/Max31865PT1000Handler.cpp b/mission/tcs/Max31865PT1000Handler.cpp similarity index 99% rename from mission/devices/Max31865PT1000Handler.cpp rename to mission/tcs/Max31865PT1000Handler.cpp index 75588cbd..7dcb493a 100644 --- a/mission/devices/Max31865PT1000Handler.cpp +++ b/mission/tcs/Max31865PT1000Handler.cpp @@ -1,4 +1,4 @@ -#include "Max31865PT1000Handler.h" +#include #include #include diff --git a/mission/devices/Max31865PT1000Handler.h b/mission/tcs/Max31865PT1000Handler.h similarity index 95% rename from mission/devices/Max31865PT1000Handler.h rename to mission/tcs/Max31865PT1000Handler.h index 5841c7b1..3c7eac29 100644 --- a/mission/devices/Max31865PT1000Handler.h +++ b/mission/tcs/Max31865PT1000Handler.h @@ -1,15 +1,14 @@ -#ifndef MISSION_DEVICES_MAX31865PT1000HANDLER_H_ -#define MISSION_DEVICES_MAX31865PT1000HANDLER_H_ +#ifndef MISSION_TCS_MAX31865PT1000HANDLER_H_ +#define MISSION_TCS_MAX31865PT1000HANDLER_H_ #include #include #include +#include #include #include -#include "devicedefinitions/Max31865Definitions.h" - /** * @brief Device Handler for the thermal sensors * @details @@ -122,4 +121,4 @@ class Max31865PT1000Handler : public DeviceHandlerBase { #endif }; -#endif /* MISSION_DEVICES_MAX31865PT1000HANDLER_H_ */ +#endif /* MISSION_TCS_MAX31865PT1000HANDLER_H_ */ diff --git a/mission/devices/devicedefinitions/Tmp1075Definitions.h b/mission/tcs/Tmp1075Definitions.h similarity index 82% rename from mission/devices/devicedefinitions/Tmp1075Definitions.h rename to mission/tcs/Tmp1075Definitions.h index 6799fd42..946ac82e 100644 --- a/mission/devices/devicedefinitions/Tmp1075Definitions.h +++ b/mission/tcs/Tmp1075Definitions.h @@ -1,5 +1,11 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_ +#ifndef MISSION_TCS_TMP1075DEFINITIONS_H_ +#define MISSION_TCS_TMP1075DEFINITIONS_H_ + +#include + +#include + +#include "fsfw/devicehandlers/DeviceHandlerIF.h" namespace TMP1075 { static const uint8_t TEMP_REG_ADDR = 0x0; @@ -33,4 +39,4 @@ class Tmp1075Dataset : public StaticLocalDataSet { }; } // namespace TMP1075 -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_ */ +#endif /* MISSION_TCS_TMP1075DEFINITIONS_H_ */ diff --git a/mission/devices/Tmp1075Handler.cpp b/mission/tcs/Tmp1075Handler.cpp similarity index 97% rename from mission/devices/Tmp1075Handler.cpp rename to mission/tcs/Tmp1075Handler.cpp index def317e8..d1f144f0 100644 --- a/mission/devices/Tmp1075Handler.cpp +++ b/mission/tcs/Tmp1075Handler.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include Tmp1075Handler::Tmp1075Handler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie) : DeviceHandlerBase(objectId, comIF, comCookie), dataset(this) { diff --git a/mission/devices/Tmp1075Handler.h b/mission/tcs/Tmp1075Handler.h similarity index 91% rename from mission/devices/Tmp1075Handler.h rename to mission/tcs/Tmp1075Handler.h index 6840db0f..8d039446 100644 --- a/mission/devices/Tmp1075Handler.h +++ b/mission/tcs/Tmp1075Handler.h @@ -1,8 +1,8 @@ -#ifndef MISSION_DEVICES_TMP1075HANDLER_H_ -#define MISSION_DEVICES_TMP1075HANDLER_H_ +#ifndef MISSION_TCS_TMP1075HANDLER_H_ +#define MISSION_TCS_TMP1075HANDLER_H_ #include -#include +#include /** * @brief This is the device handler class for the tmp1075 temperature sensor. @@ -59,4 +59,4 @@ class Tmp1075Handler : public DeviceHandlerBase { CommunicationStep communicationStep = CommunicationStep::START_ADC_CONVERSION; }; -#endif /* MISSION_DEVICES_TMP1075HANDLER_H_ */ +#endif /* MISSION_TCS_TMP1075HANDLER_H_ */ diff --git a/mission/devices/max1227.cpp b/mission/tcs/max1227.cpp similarity index 96% rename from mission/devices/max1227.cpp rename to mission/tcs/max1227.cpp index dc04e785..8b49bb53 100644 --- a/mission/devices/max1227.cpp +++ b/mission/tcs/max1227.cpp @@ -1,4 +1,4 @@ -#include "max1227.h" +#include #include diff --git a/mission/devices/max1227.h b/mission/tcs/max1227.h similarity index 95% rename from mission/devices/max1227.h rename to mission/tcs/max1227.h index a9c1e53b..5a0e7683 100644 --- a/mission/devices/max1227.h +++ b/mission/tcs/max1227.h @@ -1,5 +1,5 @@ -#ifndef MISSION_DEVICES_MAX1227_H_ -#define MISSION_DEVICES_MAX1227_H_ +#ifndef MISSION_TCS_MAX1227_H_ +#define MISSION_TCS_MAX1227_H_ #include #include @@ -81,4 +81,4 @@ float getTemperature(uint16_t raw); } // namespace max1227 -#endif /* MISSION_DEVICES_MAX1227_H_ */ +#endif /* MISSION_TCS_MAX1227_H_ */ diff --git a/mission/tmtc/PersistentLogTmStoreTask.h b/mission/tmtc/PersistentLogTmStoreTask.h index 99cb9118..cb87ba6c 100644 --- a/mission/tmtc/PersistentLogTmStoreTask.h +++ b/mission/tmtc/PersistentLogTmStoreTask.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mission/utility/CMakeLists.txt b/mission/utility/CMakeLists.txt index dadce33f..0641f4a0 100644 --- a/mission/utility/CMakeLists.txt +++ b/mission/utility/CMakeLists.txt @@ -1,3 +1,4 @@ target_sources( - ${LIB_EIVE_MISSION} PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp - GlobalConfigHandler.cpp DummySdCardManager.cpp) + ${LIB_EIVE_MISSION} + PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp + GlobalConfigHandler.cpp DummySdCardManager.cpp trace.cpp) diff --git a/mission/trace.cpp b/mission/utility/trace.cpp similarity index 85% rename from mission/trace.cpp rename to mission/utility/trace.cpp index 6c9af0af..6641d087 100644 --- a/mission/trace.cpp +++ b/mission/utility/trace.cpp @@ -1,4 +1,4 @@ -#include "trace.h" +#include #include "fsfw/serviceinterface.h" diff --git a/mission/trace.h b/mission/utility/trace.h similarity index 58% rename from mission/trace.h rename to mission/utility/trace.h index fbc99d37..52eb887a 100644 --- a/mission/trace.h +++ b/mission/utility/trace.h @@ -1,5 +1,5 @@ -#ifndef MISSION_TRACE_H_ -#define MISSION_TRACE_H_ +#ifndef MISSION_UTILITY_TRACE_H_ +#define MISSION_UTILITY_TRACE_H_ #include @@ -11,4 +11,4 @@ void threadTrace(uint32_t& counter, const char* name, unsigned div = 5); } -#endif /* MISSION_TRACE_H_ */ +#endif /* MISSION_UTILITY_TRACE_H_ */ diff --git a/tmtc b/tmtc index 3a602667..3d25a30a 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 3a60266774b3cb7c646d793449a2b2cdb76fb4e0 +Subproject commit 3d25a30a112f8d75c54368c462c17e1fbafc7690 From b92924881bb52897fbb8096bf608aa5869c6645c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Mar 2023 16:43:36 +0200 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b09edc..6121d925 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed + +- Project structure (linux and mission folder) is subsystem centric now. + # [v1.40.0] 2023-03-24 - eive-tmtc: v2.19.4