diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f7d11e1..4a93e0b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ will consitute of a breaking change warranting a new major release: - Fine-tuning of various task priorities. - The CSP router now is scheduled with the `SCHED_RR` policy and the same priority as the PCDU handlers as well. +- Change project structure to be more subsystem centric for ACS and COM. # [v1.39.1] 2023-03-22 diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index dde0dd34..2988bffb 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateEvents.h" @@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_ const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900"; const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901"; const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902"; -const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903"; +const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = + "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903"; const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE"; const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE"; const char *CANT_GET_FIX_STRING = "CANT_GET_FIX"; diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index abca6aab..de871583 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateObjects.h" diff --git a/bsp_q7s/callbacks/rwSpiCallback.cpp b/bsp_q7s/callbacks/rwSpiCallback.cpp index fa36744e..311b843e 100644 --- a/bsp_q7s/callbacks/rwSpiCallback.cpp +++ b/bsp_q7s/callbacks/rwSpiCallback.cpp @@ -6,7 +6,7 @@ #include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw_hal/linux/UnixFileGuard.h" #include "fsfw_hal/linux/spi/SpiCookie.h" -#include "mission/devices/RwHandler.h" +#include "mission/acs/RwHandler.h" namespace rwSpiCallback { diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index cd4fb0db..bd3917d5 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -1,17 +1,17 @@ #include "ObjectFactory.h" #include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include #include #include #include @@ -33,6 +33,7 @@ #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" @@ -46,24 +47,23 @@ #include "linux/devices/ploc/PlocMPSoCHelper.h" #include "linux/devices/ploc/PlocMemoryDumper.h" #include "linux/devices/ploc/PlocSupervisorHandler.h" -#include "linux/devices/startracker/StarTrackerHandler.h" #include "linux/ipcore/AxiPtmeConfig.h" #include "linux/ipcore/PapbVcInterface.h" #include "linux/ipcore/PdecHandler.h" #include "linux/ipcore/Ptme.h" #include "linux/ipcore/PtmeConfig.h" -#include "mission/com/SyrlinksFdir.h" -#include "mission/com/comModeTree.h" #include "mission/config/configfile.h" #include "mission/csp/CspCookie.h" -#include "mission/system/fdir/AcsBoardFdir.h" +#include "mission/system/acs/AcsBoardFdir.h" +#include "mission/system/acs/AcsSubsystem.h" +#include "mission/system/acs/RwAssembly.h" +#include "mission/system/acs/SusFdir.h" +#include "mission/system/acs/acsModeTree.h" +#include "mission/system/com/SyrlinksFdir.h" +#include "mission/system/com/comModeTree.h" #include "mission/system/fdir/GomspacePowerFdir.h" #include "mission/system/fdir/RtdFdir.h" -#include "mission/system/fdir/SusFdir.h" -#include "mission/system/objects/AcsSubsystem.h" -#include "mission/system/objects/RwAssembly.h" #include "mission/system/objects/TcsBoardAssembly.h" -#include "mission/system/tree/acsModeTree.h" #include "mission/system/tree/payloadModeTree.h" #include "mission/system/tree/tcsModeTree.h" #include "mission/tmtc/tmFilters.h" @@ -75,13 +75,13 @@ 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 @@ -102,6 +102,7 @@ using gpio::Levels; #include "fsfw_hal/linux/serial/SerialCookie.h" #include "fsfw_hal/linux/spi/SpiComIF.h" #include "fsfw_hal/linux/spi/SpiCookie.h" +#include "mission/acs/RwHandler.h" #include "mission/com/CcsdsIpCoreHandler.h" #include "mission/com/syrlinksDefs.h" #include "mission/core/GenericFactory.h" @@ -112,14 +113,13 @@ using gpio::Levels; #include "mission/devices/P60DockHandler.h" #include "mission/devices/PayloadPcduHandler.h" #include "mission/devices/RadiationSensorHandler.h" -#include "mission/devices/RwHandler.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" -#include "mission/system/objects/AcsBoardAssembly.h" +#include "mission/system/acs/AcsBoardAssembly.h" #include "mission/tmtc/TmFunnelHandler.h" ResetArgs RESET_ARGS_GNSS; diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp index f0732a5c..1ebd3015 100644 --- a/bsp_q7s/em/emObjectFactory.cpp +++ b/bsp_q7s/em/emObjectFactory.cpp @@ -18,7 +18,7 @@ #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" #include "linux/ObjectFactory.h" #include "linux/callbacks/gpioCallbacks.h" -#include "mission/com/comModeTree.h" +#include "mission/system/com/comModeTree.h" #include "mission/core/GenericFactory.h" void ObjectFactory::produce(void* args) { diff --git a/bsp_q7s/obsw.cpp b/bsp_q7s/obsw.cpp index 8f1ea3fd..d2d640f3 100644 --- a/bsp_q7s/obsw.cpp +++ b/bsp_q7s/obsw.cpp @@ -14,7 +14,7 @@ #include "core/scheduling.h" #include "fsfw/tasks/TaskFactory.h" #include "fsfw/version.h" -#include "mission/acsDefs.h" +#include "mission/acs/defs.h" #include "mission/com/defs.h" #include "mission/system/tree/system.h" #include "q7sConfig.h" diff --git a/dummies/GyroAdisDummy.cpp b/dummies/GyroAdisDummy.cpp index c7c40a1a..1caace7a 100644 --- a/dummies/GyroAdisDummy.cpp +++ b/dummies/GyroAdisDummy.cpp @@ -1,6 +1,6 @@ #include "GyroAdisDummy.h" -#include +#include GyroAdisDummy::GyroAdisDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie), dataset(this) {} diff --git a/dummies/GyroAdisDummy.h b/dummies/GyroAdisDummy.h index 21de1eeb..03c69baa 100644 --- a/dummies/GyroAdisDummy.h +++ b/dummies/GyroAdisDummy.h @@ -2,7 +2,7 @@ #define DUMMIES_GYROADISDUMMY_H_ #include -#include +#include class GyroAdisDummy : public DeviceHandlerBase { public: diff --git a/dummies/ImtqDummy.cpp b/dummies/ImtqDummy.cpp index 01ec6457..fc99d321 100644 --- a/dummies/ImtqDummy.cpp +++ b/dummies/ImtqDummy.cpp @@ -1,6 +1,6 @@ #include "ImtqDummy.h" -#include +#include ImtqDummy::ImtqDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie) : DeviceHandlerBase(objectId, comif, comCookie) {} diff --git a/dummies/RwDummy.cpp b/dummies/RwDummy.cpp index d90f3f7c..afc3a54f 100644 --- a/dummies/RwDummy.cpp +++ b/dummies/RwDummy.cpp @@ -1,6 +1,6 @@ #include "RwDummy.h" -#include +#include RwDummy::RwDummy(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 628d148a..0ec1d070 100644 --- a/dummies/helpers.cpp +++ b/dummies/helpers.cpp @@ -25,18 +25,18 @@ #include #include #include +#include #include -#include #include #include #include "TemperatureSensorInserter.h" #include "dummies/Max31865Dummy.h" #include "dummies/Tmp1075Dummy.h" -#include "mission/com/comModeTree.h" #include "mission/core/GenericFactory.h" #include "mission/devices/devicedefinitions/GomspaceDefinitions.h" -#include "mission/system/tree/acsModeTree.h" +#include "mission/system/acs/acsModeTree.h" +#include "mission/system/com/comModeTree.h" #include "mission/system/tree/payloadModeTree.h" #include "mission/system/tree/tcsModeTree.h" diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index 052192b5..7e543037 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -86,13 +86,13 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 10802;0x2a32;SERIALIZATION_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h 10803;0x2a33;FILESTORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h 10804;0x2a34;FILENAME_TOO_LARGE_ERROR;LOW;P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name;fsfw/src/fsfw/cfdp/handler/defs.h -11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;No description;mission/acsDefs.h -11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;No description;mission/acsDefs.h -11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acsDefs.h -11203;0x2bc3;MEKF_INVALID_INFO;INFO;No description;mission/acsDefs.h -11204;0x2bc4;MEKF_RECOVERY;INFO;No description;mission/acsDefs.h -11205;0x2bc5;MEKF_INVALID_MODE_VIOLATION;HIGH;No description;mission/acsDefs.h -11206;0x2bc6;SAFE_MODE_CONTROLLER_FAILURE;HIGH;No description;mission/acsDefs.h +11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;No description;mission/acs/defs.h +11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;No description;mission/acs/defs.h +11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acs/defs.h +11203;0x2bc3;MEKF_INVALID_INFO;INFO;No description;mission/acs/defs.h +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 @@ -120,18 +120,18 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 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 -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/devices/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/devices/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/devices/ImtqHandler.h -11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. 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/devices/ImtqHandler.h -11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system 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/devices/ImtqHandler.h -11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. 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/devices/ImtqHandler.h -11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range 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/devices/ImtqHandler.h -11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/ImtqHandler.h -11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/devicedefinitions/rwHelpers.h -11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/devices/devicedefinitions/rwHelpers.h -11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h -11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.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 +11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. 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 +11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system 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 +11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. 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 +11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range 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 +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 @@ -156,23 +156,23 @@ 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/devices/startracker/StrComHandler.h -12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrComHandler.h -12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrComHandler.h -12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrComHandler.h -12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrComHandler.h -12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrComHandler.h -12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrComHandler.h -12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrComHandler.h -12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/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/devices/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/devices/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/devices/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/devices/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/devices/startracker/StrComHandler.h -12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrComHandler.h -12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/devices/startracker/StrComHandler.h -12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/devices/startracker/StrComHandler.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 @@ -199,14 +199,14 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 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 -12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/objects/AcsBoardAssembly.h -12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/objects/AcsBoardAssembly.h -12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/objects/AcsBoardAssembly.h -12803;0x3203;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/objects/AcsBoardAssembly.h -12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/objects/SusAssembly.h -12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/objects/SusAssembly.h -12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/objects/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/objects/SusAssembly.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 +12803;0x3203;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/AcsBoardAssembly.h +12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/SusAssembly.h +12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/SusAssembly.h +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 @@ -267,8 +267,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 14104;0x3718;OBC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h 14105;0x3719;HPA_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h 14106;0x371a;PLPCDU_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h -14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/com/ComSubsystem.h -14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/com/ComSubsystem.h +14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h +14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h 14301;0x37dd;FILE_TOO_LARGE;LOW;File in store too large. P1: Detected file size P2: Allowed file size;mission/persistentTmStoreDefs.h 14302;0x37de;BUSY_DUMPING_EVENT;INFO;No description;mission/persistentTmStoreDefs.h diff --git a/generators/bsp_hosted_returnvalues.csv b/generators/bsp_hosted_returnvalues.csv index b84b7351..2a1ed108 100644 --- a/generators/bsp_hosted_returnvalues.csv +++ b/generators/bsp_hosted_returnvalues.csv @@ -431,26 +431,30 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x50a6;SYRLINKS_BadCrcAck;No description;166;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a7;SYRLINKS_ReplyWrongSize;No description;167;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a8;SYRLINKS_MissingStartFrameCharacter;No description;168;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h -0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5103;IMTQ_ParameterMissing;No description;3;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5104;IMTQ_ParameterInvalid;No description;4;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5105;IMTQ_CcUnavailable;No description;5;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5106;IMTQ_InternalProcessingError;No description;6;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5107;IMTQ_RejectedWithoutReason;No description;7;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5108;IMTQ_CmdErrUnknown;No description;8;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x52b0;RWHA_SpiWriteFailure;No description;176;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b3;RWHA_InvalidSubstitute;Can be used by the HDLC decoding mechanism to inform about an invalid substitution combination;179;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b4;RWHA_MissingEndSign;HDLC decoding mechanism never receives the end sign 0x7E;180;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b7;RWHA_SpiReadTimeout;Timeout when reading reply;183;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/devices/LegacySusHandler.h -0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/devices/LegacySusHandler.h +0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5103;IMTQ_ParameterMissing;No description;3;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5104;IMTQ_ParameterInvalid;No description;4;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5105;IMTQ_CcUnavailable;No description;5;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5106;IMTQ_InternalProcessingError;No description;6;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5107;IMTQ_RejectedWithoutReason;No description;7;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5108;IMTQ_CmdErrUnknown;No description;8;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x52b0;RWHA_SpiWriteFailure;No description;176;RW_HANDLER;mission/acs/rwHelpers.h +0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/acs/rwHelpers.h +0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/acs/rwHelpers.h +0x52b3;RWHA_InvalidSubstitute;Can be used by the HDLC decoding mechanism to inform about an invalid substitution combination;179;RW_HANDLER;mission/acs/rwHelpers.h +0x52b4;RWHA_MissingEndSign;HDLC decoding mechanism never receives the end sign 0x7E;180;RW_HANDLER;mission/acs/rwHelpers.h +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 @@ -459,12 +463,11 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h 0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/com/CcsdsIpCoreHandler.h 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h -0x66a0;SADPL_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a1;SADPL_InvalidRampTime;Action Message with invalid ramp time was received.;161;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a2;SADPL_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a3;SADPL_ExecutionFailed;Command execution failed;163;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a4;SADPL_CrcError;Reaction wheel reply has invalid crc;164;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a5;SADPL_ValueNotRead;No description;165;SA_DEPL_HANDLER;mission/devices/RwHandler.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 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 052192b5..7e543037 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -86,13 +86,13 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 10802;0x2a32;SERIALIZATION_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h 10803;0x2a33;FILESTORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h 10804;0x2a34;FILENAME_TOO_LARGE_ERROR;LOW;P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name;fsfw/src/fsfw/cfdp/handler/defs.h -11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;No description;mission/acsDefs.h -11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;No description;mission/acsDefs.h -11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acsDefs.h -11203;0x2bc3;MEKF_INVALID_INFO;INFO;No description;mission/acsDefs.h -11204;0x2bc4;MEKF_RECOVERY;INFO;No description;mission/acsDefs.h -11205;0x2bc5;MEKF_INVALID_MODE_VIOLATION;HIGH;No description;mission/acsDefs.h -11206;0x2bc6;SAFE_MODE_CONTROLLER_FAILURE;HIGH;No description;mission/acsDefs.h +11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;No description;mission/acs/defs.h +11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;No description;mission/acs/defs.h +11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acs/defs.h +11203;0x2bc3;MEKF_INVALID_INFO;INFO;No description;mission/acs/defs.h +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 @@ -120,18 +120,18 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 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 -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/devices/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/devices/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/devices/ImtqHandler.h -11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. 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/devices/ImtqHandler.h -11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system 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/devices/ImtqHandler.h -11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. 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/devices/ImtqHandler.h -11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range 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/devices/ImtqHandler.h -11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/ImtqHandler.h -11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/devicedefinitions/rwHelpers.h -11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/devices/devicedefinitions/rwHelpers.h -11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h -11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.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 +11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. 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 +11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system 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 +11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. 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 +11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range 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 +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 @@ -156,23 +156,23 @@ 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/devices/startracker/StrComHandler.h -12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrComHandler.h -12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrComHandler.h -12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrComHandler.h -12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrComHandler.h -12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrComHandler.h -12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrComHandler.h -12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrComHandler.h -12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/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/devices/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/devices/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/devices/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/devices/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/devices/startracker/StrComHandler.h -12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrComHandler.h -12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/devices/startracker/StrComHandler.h -12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/devices/startracker/StrComHandler.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 @@ -199,14 +199,14 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 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 -12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/objects/AcsBoardAssembly.h -12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/objects/AcsBoardAssembly.h -12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/objects/AcsBoardAssembly.h -12803;0x3203;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/objects/AcsBoardAssembly.h -12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/objects/SusAssembly.h -12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/objects/SusAssembly.h -12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/objects/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/objects/SusAssembly.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 +12803;0x3203;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/AcsBoardAssembly.h +12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/SusAssembly.h +12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/SusAssembly.h +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 @@ -267,8 +267,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 14104;0x3718;OBC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h 14105;0x3719;HPA_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h 14106;0x371a;PLPCDU_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h -14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/com/ComSubsystem.h -14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/com/ComSubsystem.h +14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h +14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h 14301;0x37dd;FILE_TOO_LARGE;LOW;File in store too large. P1: Detected file size P2: Allowed file size;mission/persistentTmStoreDefs.h 14302;0x37de;BUSY_DUMPING_EVENT;INFO;No description;mission/persistentTmStoreDefs.h diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv index cb298e27..53106664 100644 --- a/generators/bsp_q7s_returnvalues.csv +++ b/generators/bsp_q7s_returnvalues.csv @@ -431,49 +431,50 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x50a6;SYRLINKS_BadCrcAck;No description;166;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a7;SYRLINKS_ReplyWrongSize;No description;167;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h 0x50a8;SYRLINKS_MissingStartFrameCharacter;No description;168;SYRLINKS_HANDLER;mission/com/SyrlinksHandler.h -0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5103;IMTQ_ParameterMissing;No description;3;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5104;IMTQ_ParameterInvalid;No description;4;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5105;IMTQ_CcUnavailable;No description;5;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5106;IMTQ_InternalProcessingError;No description;6;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5107;IMTQ_RejectedWithoutReason;No description;7;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x5108;IMTQ_CmdErrUnknown;No description;8;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h -0x52b0;RWHA_SpiWriteFailure;No description;176;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b3;RWHA_InvalidSubstitute;Can be used by the HDLC decoding mechanism to inform about an invalid substitution combination;179;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b4;RWHA_MissingEndSign;HDLC decoding mechanism never receives the end sign 0x7E;180;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x52b7;RWHA_SpiReadTimeout;Timeout when reading reply;183;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h -0x53a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;160;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a1;STRH_PingFailed;Ping command failed;161;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a2;STRH_VersionReqFailed;Status in version reply signals error;162;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a3;STRH_InterfaceReqFailed;Status in interface reply signals error;163;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a4;STRH_PowerReqFailed;Status in power reply signals error;164;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;165;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a6;STRH_ActionFailed;Status of reply to action command signals error;166;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a7;STRH_FilePathTooLong;Received invalid path string. Exceeds allowed length;167;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a8;STRH_FilenameTooLong;Name of file received with command is too long;168;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53a9;STRH_InvalidProgram;Received version reply with invalid program ID;169;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53aa;STRH_ReplyError;Status field reply signals error;170;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53ab;STRH_CommandTooShort;Received command which is too short (some data is missing for proper execution);171;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53ac;STRH_InvalidLength;Received command with invalid length (too few or too many parameters);172;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53ad;STRH_RegionMismatch;Region mismatch between send and received data;173;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53ae;STRH_AddressMismatch;Address mismatch between send and received data;174;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53af;STRH_LengthMismatch;Length field mismatch between send and received data;175;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b0;STRH_FileNotExists;Specified file does not exist;176;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b1;STRH_InvalidType;Download blob pixel command has invalid type field;177;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b2;STRH_InvalidId;Received FPGA action command with invalid ID;178;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b3;STRH_ReplyTooShort;Received reply is too short;179;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b4;STRH_CrcFailure;Received reply with invalid CRC;180;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b5;STRH_StrHelperExecuting;Star tracker handler currently executing a command and using the communication interface;181;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h -0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h +0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5103;IMTQ_ParameterMissing;No description;3;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5104;IMTQ_ParameterInvalid;No description;4;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5105;IMTQ_CcUnavailable;No description;5;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5106;IMTQ_InternalProcessingError;No description;6;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5107;IMTQ_RejectedWithoutReason;No description;7;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x5108;IMTQ_CmdErrUnknown;No description;8;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/acs/imtqHelpers.h +0x52b0;RWHA_SpiWriteFailure;No description;176;RW_HANDLER;mission/acs/rwHelpers.h +0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/acs/rwHelpers.h +0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/acs/rwHelpers.h +0x52b3;RWHA_InvalidSubstitute;Can be used by the HDLC decoding mechanism to inform about an invalid substitution combination;179;RW_HANDLER;mission/acs/rwHelpers.h +0x52b4;RWHA_MissingEndSign;HDLC decoding mechanism never receives the end sign 0x7E;180;RW_HANDLER;mission/acs/rwHelpers.h +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 @@ -486,23 +487,27 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 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_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/devices/LegacySusHandler.h -0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/devices/LegacySusHandler.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 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/devices/ImtqPollingTask.h -0x5c01;STRHLP_SdNotMounted;SD card specified in path string not mounted;1;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c02;STRHLP_InvalidCrc;No description;2;STR_HELPER;linux/devices/ScexHelper.h -0x5c03;STRHLP_PathNotExists;Specified path does not exist;3;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c04;STRHLP_FileCreationFailed;Failed to create download image or read flash file;4;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c05;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;5;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c06;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;6;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c07;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;7;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c08;STRHLP_StatusError;Status field in reply signals error;8;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c09;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);9;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c0a;STRHLP_ReceptionTimeout;No description;10;STR_HELPER;linux/devices/startracker/StrComHandler.h -0x5c0b;STRHLP_DecodingError;No description;11;STR_HELPER;linux/devices/startracker/StrComHandler.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 @@ -531,19 +536,18 @@ 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/devices/startracker/ArcsecJsonParamBase.h -0x6202;JSONBASE_SetNotExists;Requested set does not exist in json file;2;ARCSEC_JSON_BASE;linux/devices/startracker/ArcsecJsonParamBase.h -0x6203;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;ARCSEC_JSON_BASE;linux/devices/startracker/ArcsecJsonParamBase.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 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_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a1;SADPL_InvalidRampTime;Action Message with invalid ramp time was received.;161;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a2;SADPL_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a3;SADPL_ExecutionFailed;Command execution failed;163;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a4;SADPL_CrcError;Reaction wheel reply has invalid crc;164;SA_DEPL_HANDLER;mission/devices/RwHandler.h -0x66a5;SADPL_ValueNotRead;No description;165;SA_DEPL_HANDLER;mission/devices/RwHandler.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 diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index dde0dd34..83d1c6d8 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 761490b8..972bbb87 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateObjects.h" diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index a0f46524..dafdb9d8 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(boardtest) add_subdirectory(devices) add_subdirectory(ipcore) add_subdirectory(com) +add_subdirectory(acs) if(EIVE_ADD_LINUX_FSFWCONFIG) add_subdirectory(fsfwconfig) diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp index 2a788898..492bfdcb 100644 --- a/linux/ObjectFactory.cpp +++ b/linux/ObjectFactory.cpp @@ -8,18 +8,17 @@ #include #include #include +#include #include #include -#include +#include #include #include -#include #include #include -#include +#include +#include #include -#include -#include #include #include "OBSWConfig.h" @@ -27,7 +26,7 @@ #include "devices/addresses.h" #include "devices/gpioIds.h" #include "eive/definitions.h" -#include "mission/system/tree/acsModeTree.h" +#include "mission/system/acs/acsModeTree.h" #include "mission/system/tree/payloadModeTree.h" #include "mission/system/tree/tcsModeTree.h" diff --git a/linux/devices/AcsBoardPolling.cpp b/linux/acs/AcsBoardPolling.cpp similarity index 99% rename from linux/devices/AcsBoardPolling.cpp rename to linux/acs/AcsBoardPolling.cpp index 04fe92df..1013f24b 100644 --- a/linux/devices/AcsBoardPolling.cpp +++ b/linux/acs/AcsBoardPolling.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "devices/gpioIds.h" diff --git a/linux/devices/AcsBoardPolling.h b/linux/acs/AcsBoardPolling.h similarity index 96% rename from linux/devices/AcsBoardPolling.h rename to linux/acs/AcsBoardPolling.h index 73195527..794c9c47 100644 --- a/linux/devices/AcsBoardPolling.h +++ b/linux/acs/AcsBoardPolling.h @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include class AcsBoardPolling : public SystemObject, public ExecutableObjectIF, diff --git a/linux/acs/CMakeLists.txt b/linux/acs/CMakeLists.txt new file mode 100644 index 00000000..532dced3 --- /dev/null +++ b/linux/acs/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp + RwPollingTask.cpp SusPolling.cpp) + +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(startracker) +endif() diff --git a/linux/devices/ImtqPollingTask.cpp b/linux/acs/ImtqPollingTask.cpp similarity index 100% rename from linux/devices/ImtqPollingTask.cpp rename to linux/acs/ImtqPollingTask.cpp diff --git a/linux/devices/ImtqPollingTask.h b/linux/acs/ImtqPollingTask.h similarity index 98% rename from linux/devices/ImtqPollingTask.h rename to linux/acs/ImtqPollingTask.h index 32497753..50778ffa 100644 --- a/linux/devices/ImtqPollingTask.h +++ b/linux/acs/ImtqPollingTask.h @@ -9,7 +9,7 @@ #include "fsfw/devicehandlers/DeviceCommunicationIF.h" #include "fsfw/objectmanager/SystemObject.h" #include "fsfw/tasks/ExecutableObjectIF.h" -#include "mission/devices/devicedefinitions/imtqHelpers.h" +#include "mission/acs/imtqHelpers.h" class ImtqPollingTask : public SystemObject, public ExecutableObjectIF, diff --git a/linux/devices/RwPollingTask.cpp b/linux/acs/RwPollingTask.cpp similarity index 99% rename from linux/devices/RwPollingTask.cpp rename to linux/acs/RwPollingTask.cpp index 45528178..07958d8b 100644 --- a/linux/devices/RwPollingTask.cpp +++ b/linux/acs/RwPollingTask.cpp @@ -11,7 +11,7 @@ #include #include "devConf.h" -#include "mission/devices/devicedefinitions/rwHelpers.h" +#include "mission/acs/rwHelpers.h" RwPollingTask::RwPollingTask(object_id_t objectId, const char* spiDev, GpioIF& gpioIF) : SystemObject(objectId), spiDev(spiDev), gpioIF(gpioIF) { diff --git a/linux/devices/RwPollingTask.h b/linux/acs/RwPollingTask.h similarity index 98% rename from linux/devices/RwPollingTask.h rename to linux/acs/RwPollingTask.h index 0131f2b4..5fb25d1d 100644 --- a/linux/devices/RwPollingTask.h +++ b/linux/acs/RwPollingTask.h @@ -9,7 +9,7 @@ #include #include -#include "mission/devices/devicedefinitions/rwHelpers.h" +#include "mission/acs/rwHelpers.h" class RwCookie : public SpiCookie { friend class RwPollingTask; diff --git a/linux/devices/SusPolling.cpp b/linux/acs/SusPolling.cpp similarity index 100% rename from linux/devices/SusPolling.cpp rename to linux/acs/SusPolling.cpp diff --git a/linux/devices/SusPolling.h b/linux/acs/SusPolling.h similarity index 96% rename from linux/devices/SusPolling.h rename to linux/acs/SusPolling.h index e9bcf59d..470f11d5 100644 --- a/linux/devices/SusPolling.h +++ b/linux/acs/SusPolling.h @@ -8,7 +8,7 @@ #include #include "devices/addresses.h" -#include "mission/devices/devicedefinitions/acsPolling.h" +#include "mission/acs/acsBoardPolling.h" class SusPolling : public SystemObject, public ExecutableObjectIF, public DeviceCommunicationIF { public: diff --git a/linux/devices/startracker/ArcsecDatalinkLayer.cpp b/linux/acs/startracker/ArcsecDatalinkLayer.cpp similarity index 100% rename from linux/devices/startracker/ArcsecDatalinkLayer.cpp rename to linux/acs/startracker/ArcsecDatalinkLayer.cpp diff --git a/linux/devices/startracker/ArcsecDatalinkLayer.h b/linux/acs/startracker/ArcsecDatalinkLayer.h similarity index 100% rename from linux/devices/startracker/ArcsecDatalinkLayer.h rename to linux/acs/startracker/ArcsecDatalinkLayer.h diff --git a/linux/devices/startracker/ArcsecJsonParamBase.cpp b/linux/acs/startracker/ArcsecJsonParamBase.cpp similarity index 100% rename from linux/devices/startracker/ArcsecJsonParamBase.cpp rename to linux/acs/startracker/ArcsecJsonParamBase.cpp diff --git a/linux/devices/startracker/ArcsecJsonParamBase.h b/linux/acs/startracker/ArcsecJsonParamBase.h similarity index 100% rename from linux/devices/startracker/ArcsecJsonParamBase.h rename to linux/acs/startracker/ArcsecJsonParamBase.h diff --git a/linux/devices/startracker/CMakeLists.txt b/linux/acs/startracker/CMakeLists.txt similarity index 100% rename from linux/devices/startracker/CMakeLists.txt rename to linux/acs/startracker/CMakeLists.txt diff --git a/linux/devices/startracker/StarTrackerHandler.cpp b/linux/acs/startracker/StarTrackerHandler.cpp similarity index 100% rename from linux/devices/startracker/StarTrackerHandler.cpp rename to linux/acs/startracker/StarTrackerHandler.cpp diff --git a/linux/devices/startracker/StarTrackerHandler.h b/linux/acs/startracker/StarTrackerHandler.h similarity index 100% rename from linux/devices/startracker/StarTrackerHandler.h rename to linux/acs/startracker/StarTrackerHandler.h diff --git a/linux/devices/startracker/StrComHandler.cpp b/linux/acs/startracker/StrComHandler.cpp similarity index 99% rename from linux/devices/startracker/StrComHandler.cpp rename to linux/acs/startracker/StrComHandler.cpp index 7a9055d8..3dfa2169 100644 --- a/linux/devices/startracker/StrComHandler.cpp +++ b/linux/acs/startracker/StrComHandler.cpp @@ -1,8 +1,9 @@ +#include "StrComHandler.h" + #include #include #include #include -#include #include #include diff --git a/linux/devices/startracker/StrComHandler.h b/linux/acs/startracker/StrComHandler.h similarity index 100% rename from linux/devices/startracker/StrComHandler.h rename to linux/acs/startracker/StrComHandler.h diff --git a/linux/devices/startracker/arcsecJsonKeys.h b/linux/acs/startracker/arcsecJsonKeys.h similarity index 100% rename from linux/devices/startracker/arcsecJsonKeys.h rename to linux/acs/startracker/arcsecJsonKeys.h diff --git a/linux/devices/startracker/helpers.cpp b/linux/acs/startracker/helpers.cpp similarity index 100% rename from linux/devices/startracker/helpers.cpp rename to linux/acs/startracker/helpers.cpp diff --git a/linux/devices/startracker/helpers.h b/linux/acs/startracker/helpers.h similarity index 100% rename from linux/devices/startracker/helpers.h rename to linux/acs/startracker/helpers.h diff --git a/linux/devices/startracker/strJsonCommands.cpp b/linux/acs/startracker/strJsonCommands.cpp similarity index 100% rename from linux/devices/startracker/strJsonCommands.cpp rename to linux/acs/startracker/strJsonCommands.cpp diff --git a/linux/devices/startracker/strJsonCommands.h b/linux/acs/startracker/strJsonCommands.h similarity index 100% rename from linux/devices/startracker/strJsonCommands.h rename to linux/acs/startracker/strJsonCommands.h diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt index 8b23566b..2530b1cd 100644 --- a/linux/devices/CMakeLists.txt +++ b/linux/devices/CMakeLists.txt @@ -2,20 +2,7 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER) target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp) endif() -target_sources( - ${OBSW_NAME} - PRIVATE Max31865RtdPolling.cpp - ScexUartReader.cpp - ImtqPollingTask.cpp - SusPolling.cpp - ScexDleParser.cpp - ScexHelper.cpp - RwPollingTask.cpp - AcsBoardPolling.cpp) +target_sources(${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp + ScexDleParser.cpp ScexHelper.cpp) add_subdirectory(ploc) - -# Dependency on proprietary library -if(TGT_BSP MATCHES "arm/q7s") - add_subdirectory(startracker) -endif() diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index dde0dd34..2988bffb 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateEvents.h" @@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_ const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900"; const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901"; const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902"; -const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903"; +const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = + "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903"; const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE"; const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE"; const char *CANT_GET_FIX_STRING = "CANT_GET_FIX"; diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 761490b8..972bbb87 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 19:52:40 + * Generated on: 2023-03-24 20:58:22 */ #include "translateObjects.h" diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt index 7d858415..f1495899 100644 --- a/mission/CMakeLists.txt +++ b/mission/CMakeLists.txt @@ -6,9 +6,9 @@ add_subdirectory(memory) add_subdirectory(tmtc) add_subdirectory(system) add_subdirectory(com) +add_subdirectory(acs) add_subdirectory(csp) add_subdirectory(cfdp) add_subdirectory(config) -target_sources(${LIB_EIVE_MISSION} PRIVATE acsDefs.cpp payloadDefs.cpp - trace.cpp) +target_sources(${LIB_EIVE_MISSION} PRIVATE payloadDefs.cpp trace.cpp) diff --git a/mission/acs/CMakeLists.txt b/mission/acs/CMakeLists.txt new file mode 100644 index 00000000..3702df28 --- /dev/null +++ b/mission/acs/CMakeLists.txt @@ -0,0 +1,13 @@ +target_sources( + ${LIB_EIVE_MISSION} + PRIVATE GyrAdis1650XHandler.cpp + GyrL3gCustomHandler.cpp + ImtqHandler.cpp + MgmLis3CustomHandler.cpp + MgmRm3100CustomHandler.cpp + RwHandler.cpp + SusHandler.cpp + gyroAdisHelpers.cpp + imtqHelpers.cpp + rwHelpers.cpp + defs.cpp) diff --git a/mission/devices/GyrAdis1650XHandler.cpp b/mission/acs/GyrAdis1650XHandler.cpp similarity index 98% rename from mission/devices/GyrAdis1650XHandler.cpp rename to mission/acs/GyrAdis1650XHandler.cpp index 7d576238..dd30775e 100644 --- a/mission/devices/GyrAdis1650XHandler.cpp +++ b/mission/acs/GyrAdis1650XHandler.cpp @@ -1,8 +1,8 @@ -#include "mission/devices/GyrAdis1650XHandler.h" +#include "GyrAdis1650XHandler.h" #include "fsfw/action/HasActionsIF.h" #include "fsfw/datapool/PoolReadGuard.h" -#include "mission/devices/devicedefinitions/acsPolling.h" +#include "mission/acs/acsBoardPolling.h" GyrAdis1650XHandler::GyrAdis1650XHandler(object_id_t objectId, object_id_t deviceCommunication, CookieIF *comCookie, adis1650x::Type type) diff --git a/mission/devices/GyrAdis1650XHandler.h b/mission/acs/GyrAdis1650XHandler.h similarity index 95% rename from mission/devices/GyrAdis1650XHandler.h rename to mission/acs/GyrAdis1650XHandler.h index 020dcd6e..5a2a2842 100644 --- a/mission/devices/GyrAdis1650XHandler.h +++ b/mission/acs/GyrAdis1650XHandler.h @@ -1,8 +1,8 @@ #ifndef MISSION_DEVICES_GYROADIS16507HANDLER_H_ #define MISSION_DEVICES_GYROADIS16507HANDLER_H_ -#include -#include +#include +#include #include "FSFWConfig.h" #include "OBSWConfig.h" diff --git a/mission/devices/GyrL3gCustomHandler.cpp b/mission/acs/GyrL3gCustomHandler.cpp similarity index 98% rename from mission/devices/GyrL3gCustomHandler.cpp rename to mission/acs/GyrL3gCustomHandler.cpp index d3624bdf..b235a2ef 100644 --- a/mission/devices/GyrL3gCustomHandler.cpp +++ b/mission/acs/GyrL3gCustomHandler.cpp @@ -1,10 +1,10 @@ -#include +#include +#include #include #include "fsfw/datapool/PoolReadGuard.h" -#include "mission/devices/devicedefinitions/acsPolling.h" GyrL3gCustomHandler::GyrL3gCustomHandler(object_id_t objectId, object_id_t deviceCommunication, CookieIF *comCookie, uint32_t transitionDelayMs) diff --git a/mission/devices/GyrL3gCustomHandler.h b/mission/acs/GyrL3gCustomHandler.h similarity index 98% rename from mission/devices/GyrL3gCustomHandler.h rename to mission/acs/GyrL3gCustomHandler.h index 5f840cfc..44ddd826 100644 --- a/mission/devices/GyrL3gCustomHandler.h +++ b/mission/acs/GyrL3gCustomHandler.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include /** * @brief Device Handler for the L3GD20H gyroscope sensor diff --git a/mission/devices/ImtqHandler.cpp b/mission/acs/ImtqHandler.cpp similarity index 99% rename from mission/devices/ImtqHandler.cpp rename to mission/acs/ImtqHandler.cpp index 46a2c53a..f5791abd 100644 --- a/mission/devices/ImtqHandler.cpp +++ b/mission/acs/ImtqHandler.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/mission/devices/ImtqHandler.h b/mission/acs/ImtqHandler.h similarity index 99% rename from mission/devices/ImtqHandler.h rename to mission/acs/ImtqHandler.h index e337f40c..c276d166 100644 --- a/mission/devices/ImtqHandler.h +++ b/mission/acs/ImtqHandler.h @@ -2,7 +2,7 @@ #define MISSION_DEVICES_IMTQHANDLER_H_ #include -#include +#include #include #include "events/subsystemIdRanges.h" diff --git a/mission/devices/MgmLis3CustomHandler.cpp b/mission/acs/MgmLis3CustomHandler.cpp similarity index 99% rename from mission/devices/MgmLis3CustomHandler.cpp rename to mission/acs/MgmLis3CustomHandler.cpp index 151d321d..f081cd7e 100644 --- a/mission/devices/MgmLis3CustomHandler.cpp +++ b/mission/acs/MgmLis3CustomHandler.cpp @@ -1,4 +1,4 @@ -#include +#include "MgmLis3CustomHandler.h" #include diff --git a/mission/devices/MgmLis3CustomHandler.h b/mission/acs/MgmLis3CustomHandler.h similarity index 98% rename from mission/devices/MgmLis3CustomHandler.h rename to mission/acs/MgmLis3CustomHandler.h index 15c87e0f..06ab6d73 100644 --- a/mission/devices/MgmLis3CustomHandler.h +++ b/mission/acs/MgmLis3CustomHandler.h @@ -5,7 +5,7 @@ #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" -#include "mission/devices/devicedefinitions/acsPolling.h" +#include "mission/acs/acsBoardPolling.h" class PeriodicOperationDivider; diff --git a/mission/devices/MgmRm3100CustomHandler.cpp b/mission/acs/MgmRm3100CustomHandler.cpp similarity index 98% rename from mission/devices/MgmRm3100CustomHandler.cpp rename to mission/acs/MgmRm3100CustomHandler.cpp index f6f86950..891fad0f 100644 --- a/mission/devices/MgmRm3100CustomHandler.cpp +++ b/mission/acs/MgmRm3100CustomHandler.cpp @@ -1,4 +1,4 @@ -#include +#include "MgmRm3100CustomHandler.h" #include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/devicehandlers/DeviceHandlerMessage.h" diff --git a/mission/devices/MgmRm3100CustomHandler.h b/mission/acs/MgmRm3100CustomHandler.h similarity index 98% rename from mission/devices/MgmRm3100CustomHandler.h rename to mission/acs/MgmRm3100CustomHandler.h index 4c0c98b3..3cb4559e 100644 --- a/mission/devices/MgmRm3100CustomHandler.h +++ b/mission/acs/MgmRm3100CustomHandler.h @@ -5,7 +5,7 @@ #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" -#include "mission/devices/devicedefinitions/acsPolling.h" +#include "mission/acs/acsBoardPolling.h" /** * @brief Device Handler for the RM3100 geomagnetic magnetometer sensor diff --git a/mission/devices/RwHandler.cpp b/mission/acs/RwHandler.cpp similarity index 100% rename from mission/devices/RwHandler.cpp rename to mission/acs/RwHandler.cpp diff --git a/mission/devices/RwHandler.h b/mission/acs/RwHandler.h similarity index 98% rename from mission/devices/RwHandler.h rename to mission/acs/RwHandler.h index cdb72de1..0537ef8c 100644 --- a/mission/devices/RwHandler.h +++ b/mission/acs/RwHandler.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include "events/subsystemIdRanges.h" diff --git a/mission/devices/SusHandler.cpp b/mission/acs/SusHandler.cpp similarity index 100% rename from mission/devices/SusHandler.cpp rename to mission/acs/SusHandler.cpp diff --git a/mission/devices/SusHandler.h b/mission/acs/SusHandler.h similarity index 97% rename from mission/devices/SusHandler.h rename to mission/acs/SusHandler.h index 6eb781db..340a1c4c 100644 --- a/mission/devices/SusHandler.h +++ b/mission/acs/SusHandler.h @@ -6,7 +6,7 @@ #include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" -#include "mission/devices/devicedefinitions/acsPolling.h" +#include "mission/acs/acsBoardPolling.h" #include "mission/devices/devicedefinitions/susMax1227Helpers.h" class SusHandler : public DeviceHandlerBase { diff --git a/mission/devices/devicedefinitions/acsPolling.h b/mission/acs/acsBoardPolling.h similarity index 100% rename from mission/devices/devicedefinitions/acsPolling.h rename to mission/acs/acsBoardPolling.h diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/acs/archive/GPSHyperionHandler.cpp similarity index 100% rename from mission/devices/GPSHyperionHandler.cpp rename to mission/acs/archive/GPSHyperionHandler.cpp diff --git a/mission/devices/GPSHyperionHandler.h b/mission/acs/archive/GPSHyperionHandler.h similarity index 100% rename from mission/devices/GPSHyperionHandler.h rename to mission/acs/archive/GPSHyperionHandler.h diff --git a/mission/devices/LegacySusHandler.cpp b/mission/acs/archive/LegacySusHandler.cpp similarity index 100% rename from mission/devices/LegacySusHandler.cpp rename to mission/acs/archive/LegacySusHandler.cpp diff --git a/mission/devices/LegacySusHandler.h b/mission/acs/archive/LegacySusHandler.h similarity index 100% rename from mission/devices/LegacySusHandler.h rename to mission/acs/archive/LegacySusHandler.h diff --git a/mission/acsDefs.cpp b/mission/acs/defs.cpp similarity index 97% rename from mission/acsDefs.cpp rename to mission/acs/defs.cpp index 4027896c..f90df9a3 100644 --- a/mission/acsDefs.cpp +++ b/mission/acs/defs.cpp @@ -1,4 +1,4 @@ -#include "acsDefs.h" +#include "defs.h" const char* acs::getModeStr(AcsMode mode) { static const char* modeStr = "UNKNOWN"; diff --git a/mission/acsDefs.h b/mission/acs/defs.h similarity index 100% rename from mission/acsDefs.h rename to mission/acs/defs.h diff --git a/mission/devices/devicedefinitions/gyroAdisHelpers.cpp b/mission/acs/gyroAdisHelpers.cpp similarity index 100% rename from mission/devices/devicedefinitions/gyroAdisHelpers.cpp rename to mission/acs/gyroAdisHelpers.cpp diff --git a/mission/devices/devicedefinitions/gyroAdisHelpers.h b/mission/acs/gyroAdisHelpers.h similarity index 100% rename from mission/devices/devicedefinitions/gyroAdisHelpers.h rename to mission/acs/gyroAdisHelpers.h diff --git a/mission/devices/devicedefinitions/imtqHelpers.cpp b/mission/acs/imtqHelpers.cpp similarity index 100% rename from mission/devices/devicedefinitions/imtqHelpers.cpp rename to mission/acs/imtqHelpers.cpp diff --git a/mission/devices/devicedefinitions/imtqHelpers.h b/mission/acs/imtqHelpers.h similarity index 100% rename from mission/devices/devicedefinitions/imtqHelpers.h rename to mission/acs/imtqHelpers.h diff --git a/mission/devices/devicedefinitions/rwHelpers.cpp b/mission/acs/rwHelpers.cpp similarity index 100% rename from mission/devices/devicedefinitions/rwHelpers.cpp rename to mission/acs/rwHelpers.cpp diff --git a/mission/devices/devicedefinitions/rwHelpers.h b/mission/acs/rwHelpers.h similarity index 100% rename from mission/devices/devicedefinitions/rwHelpers.h rename to mission/acs/rwHelpers.h diff --git a/mission/com/CMakeLists.txt b/mission/com/CMakeLists.txt index 1eb05a6f..94d3e7f0 100644 --- a/mission/com/CMakeLists.txt +++ b/mission/com/CMakeLists.txt @@ -1,4 +1,2 @@ -target_sources( - ${LIB_EIVE_MISSION} - PRIVATE SyrlinksHandler.cpp ComSubsystem.cpp SyrlinksFdir.cpp comModeTree.cpp - CcsdsIpCoreHandler.cpp) +target_sources(${LIB_EIVE_MISSION} PRIVATE SyrlinksHandler.cpp + CcsdsIpCoreHandler.cpp) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 4b865ee3..6db48340 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -1,7 +1,7 @@ #include "AcsController.h" #include -#include +#include #include AcsController::AcsController(object_id_t objectId) diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h index fd17d606..1215c1ea 100644 --- a/mission/controller/AcsController.h +++ b/mission/controller/AcsController.h @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 285628e8..3879339d 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -3,16 +3,16 @@ #include #include #include +#include #include #include +#include +#include +#include #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 b162d71b..e091042b 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -8,15 +8,15 @@ #include #include #include +#include +#include +#include #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 25946d0b..03bc22c4 100644 --- a/mission/controller/acs/SensorValues.h +++ b/mission/controller/acs/SensorValues.h @@ -3,12 +3,12 @@ #include #include +#include #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 53ca6904..433b4191 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/core/GenericFactory.cpp @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -46,8 +46,8 @@ #include "eive/definitions.h" #include "fsfw/pus/Service11TelecommandScheduling.h" #include "mission/cfdp/Config.h" -#include "mission/system/objects/RwAssembly.h" -#include "mission/system/tree/acsModeTree.h" +#include "mission/system/acs/RwAssembly.h" +#include "mission/system/acs/acsModeTree.h" #include "mission/system/tree/tcsModeTree.h" #include "mission/tmtc/tmFilters.h" #include "objects/systemObjectList.h" diff --git a/mission/core/pollingSeqTables.cpp b/mission/core/pollingSeqTables.cpp index 1b8f6e89..13506a8c 100644 --- a/mission/core/pollingSeqTables.cpp +++ b/mission/core/pollingSeqTables.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "OBSWConfig.h" #include "eive/definitions.h" diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt index a9ce70b8..1c1717e4 100644 --- a/mission/devices/CMakeLists.txt +++ b/mission/devices/CMakeLists.txt @@ -8,18 +8,10 @@ target_sources( Pdu1Handler.cpp Pdu2Handler.cpp ACUHandler.cpp - Max31865PT1000Handler.cpp Max31865EiveHandler.cpp - ImtqHandler.cpp HeaterHandler.cpp RadiationSensorHandler.cpp - GyrAdis1650XHandler.cpp - GyrL3gCustomHandler.cpp - MgmRm3100CustomHandler.cpp - MgmLis3CustomHandler.cpp - RwHandler.cpp max1227.cpp - SusHandler.cpp PayloadPcduHandler.cpp SolarArrayDeploymentHandler.cpp ScexDeviceHandler.cpp) diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h index 0fd78887..ea98b0ff 100644 --- a/mission/devices/PayloadPcduHandler.h +++ b/mission/devices/PayloadPcduHandler.h @@ -11,8 +11,8 @@ #include "fsfw_hal/common/gpio/GpioIF.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/memory/SdCardMountedIF.h" -#include "mission/system/objects/DualLanePowerStateMachine.h" -#include "mission/system/objects/definitions.h" +#include "mission/powerDefs.h" +#include "mission/system/DualLanePowerStateMachine.h" #ifdef FSFW_OSAL_LINUX class SpiComIF; diff --git a/mission/devices/devicedefinitions/CMakeLists.txt b/mission/devices/devicedefinitions/CMakeLists.txt index eab4d4cb..0ecd64e6 100644 --- a/mission/devices/devicedefinitions/CMakeLists.txt +++ b/mission/devices/devicedefinitions/CMakeLists.txt @@ -1,2 +1 @@ -target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp rwHelpers.cpp - imtqHelpers.cpp gyroAdisHelpers.cpp) +target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp) diff --git a/mission/devices/devicedefinitions/GyroL3GD20Definitions.h b/mission/devices/devicedefinitions/GyroL3GD20Definitions.h deleted file mode 100644 index 43783c82..00000000 --- a/mission/devices/devicedefinitions/GyroL3GD20Definitions.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_ -#define MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_ - -#include -#include - -#include - -namespace l3gd20h { - -/* Actual size is 15 but we round up a bit */ -static constexpr size_t MAX_BUFFER_SIZE = 16; - -static constexpr uint8_t READ_MASK = 0b1000'0000; - -static constexpr uint8_t AUTO_INCREMENT_MASK = 0b0100'0000; - -static constexpr uint8_t WHO_AM_I_REG = 0b0000'1111; -static constexpr uint8_t WHO_AM_I_VAL = 0b1101'0111; - -/*------------------------------------------------------------------------*/ -/* Control registers */ -/*------------------------------------------------------------------------*/ -static constexpr uint8_t CTRL_REG_1 = 0b0010'0000; -static constexpr uint8_t CTRL_REG_2 = 0b0010'0001; -static constexpr uint8_t CTRL_REG_3 = 0b0010'0010; -static constexpr uint8_t CTRL_REG_4 = 0b0010'0011; -static constexpr uint8_t CTRL_REG_5 = 0b0010'0100; - -/* Register 1 */ -static constexpr uint8_t SET_DR_1 = 1 << 7; -static constexpr uint8_t SET_DR_0 = 1 << 6; -static constexpr uint8_t SET_BW_1 = 1 << 5; -static constexpr uint8_t SET_BW_0 = 1 << 4; -static constexpr uint8_t SET_POWER_NORMAL_MODE = 1 << 3; -static constexpr uint8_t SET_Z_ENABLE = 1 << 2; -static constexpr uint8_t SET_X_ENABLE = 1 << 1; -static constexpr uint8_t SET_Y_ENABLE = 1; - -static constexpr uint8_t CTRL_REG_1_VAL = - SET_POWER_NORMAL_MODE | SET_Z_ENABLE | SET_Y_ENABLE | SET_X_ENABLE; - -/* Register 2 */ -static constexpr uint8_t EXTERNAL_EDGE_ENB = 1 << 7; -static constexpr uint8_t LEVEL_SENSITIVE_TRIGGER = 1 << 6; -static constexpr uint8_t SET_HPM_1 = 1 << 5; -static constexpr uint8_t SET_HPM_0 = 1 << 4; -static constexpr uint8_t SET_HPCF_3 = 1 << 3; -static constexpr uint8_t SET_HPCF_2 = 1 << 2; -static constexpr uint8_t SET_HPCF_1 = 1 << 1; -static constexpr uint8_t SET_HPCF_0 = 1; - -static constexpr uint8_t CTRL_REG_2_VAL = 0b0000'0000; - -/* Register 3 */ -static constexpr uint8_t CTRL_REG_3_VAL = 0b0000'0000; - -/* Register 4 */ -static constexpr uint8_t SET_BNU = 1 << 7; -static constexpr uint8_t SET_BLE = 1 << 6; -static constexpr uint8_t SET_FS_1 = 1 << 5; -static constexpr uint8_t SET_FS_0 = 1 << 4; -static constexpr uint8_t SET_IMP_ENB = 1 << 3; -static constexpr uint8_t SET_SELF_TEST_ENB_1 = 1 << 2; -static constexpr uint8_t SET_SELF_TEST_ENB_0 = 1 << 1; -static constexpr uint8_t SET_SPI_IF_SELECT = 1; - -/* Enable big endian data format */ -static constexpr uint8_t CTRL_REG_4_VAL = SET_BLE; - -/* Register 5 */ -static constexpr uint8_t SET_REBOOT_MEM = 1 << 7; -static constexpr uint8_t SET_FIFO_ENB = 1 << 6; - -static constexpr uint8_t CTRL_REG_5_VAL = 0b0000'0000; - -/* Possible range values in degrees per second (DPS). */ -static constexpr uint16_t RANGE_DPS_00 = 245; -static constexpr uint16_t RANGE_DPS_01 = 500; -static constexpr uint16_t RANGE_DPS_11 = 2000; - -static constexpr uint8_t READ_START = CTRL_REG_1; -static constexpr size_t READ_LEN = 14; - -/* Indexing */ -static constexpr uint8_t REFERENCE_IDX = 6; -static constexpr uint8_t TEMPERATURE_IDX = 7; -static constexpr uint8_t STATUS_IDX = 8; -static constexpr uint8_t OUT_X_H = 9; -static constexpr uint8_t OUT_X_L = 10; -static constexpr uint8_t OUT_Y_H = 11; -static constexpr uint8_t OUT_Y_L = 12; -static constexpr uint8_t OUT_Z_H = 13; -static constexpr uint8_t OUT_Z_L = 14; - -/*------------------------------------------------------------------------*/ -/* Device Handler specific */ -/*------------------------------------------------------------------------*/ -static constexpr DeviceCommandId_t READ_REGS = 0; -static constexpr DeviceCommandId_t CONFIGURE_CTRL_REGS = 1; -static constexpr DeviceCommandId_t READ_CTRL_REGS = 2; - -static constexpr uint32_t GYRO_DATASET_ID = READ_REGS; - -enum GyroPoolIds : lp_id_t { ANG_VELOC_X, ANG_VELOC_Y, ANG_VELOC_Z, TEMPERATURE }; - -} // namespace l3gd20h - -class GyroPrimaryDataset : public StaticLocalDataSet<5> { - public: - /** Constructor for data users like controllers */ - GyroPrimaryDataset(object_id_t mgmId) - : StaticLocalDataSet(sid_t(mgmId, l3gd20h::GYRO_DATASET_ID)) { - setAllVariablesReadOnly(); - } - - /* Angular velocities in degrees per second (DPS) */ - lp_var_t angVelocX = lp_var_t(sid.objectId, l3gd20h::ANG_VELOC_X, this); - lp_var_t angVelocY = lp_var_t(sid.objectId, l3gd20h::ANG_VELOC_Y, this); - lp_var_t angVelocZ = lp_var_t(sid.objectId, l3gd20h::ANG_VELOC_Z, this); - lp_var_t temperature = lp_var_t(sid.objectId, l3gd20h::TEMPERATURE, this); - - private: - friend class GyroHandlerL3GD20H; - /** Constructor for the data creator */ - GyroPrimaryDataset(HasLocalDataPoolIF* hkOwner) - : StaticLocalDataSet(hkOwner, l3gd20h::GYRO_DATASET_ID) {} -}; - -#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_ */ diff --git a/mission/mission.mk b/mission/mission.mk deleted file mode 100644 index 028b9c13..00000000 --- a/mission/mission.mk +++ /dev/null @@ -1,17 +0,0 @@ -# add main and others -CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp) -CSRC += $(wildcard $(CURRENTPATH)/*.c) - -CSRC += $(wildcard $(CURRENTPATH)/core/*.c) -CXXSRC += $(wildcard $(CURRENTPATH)/core/*.cpp) - -CXXSRC += $(wildcard $(CURRENTPATH)/devices/*.cpp) -CSRC += $(wildcard $(CURRENTPATH)/devices/*.c) - -CXXSRC += $(wildcard $(CURRENTPATH)/utility/*.cpp) -CSRC += $(wildcard $(CURRENTPATH)/utility/*.c) - -CXXSRC += $(wildcard $(CURRENTPATH)/test/*.cpp) -CSRC += $(wildcard $(CURRENTPATH)/test/*.c) - - diff --git a/mission/system/objects/definitions.h b/mission/powerDefs.h similarity index 100% rename from mission/system/objects/definitions.h rename to mission/powerDefs.h diff --git a/mission/sysDefs.h b/mission/sysDefs.h index 1d1db0a8..70ff8138 100644 --- a/mission/sysDefs.h +++ b/mission/sysDefs.h @@ -1,7 +1,8 @@ #ifndef MISSION_SYSDEFS_H_ #define MISSION_SYSDEFS_H_ -#include "acsDefs.h" +#include "acs/defs.h" + namespace satsystem { enum Mode : Mode_t { BOOT = 5, SAFE = acs::AcsMode::SAFE, PTG_IDLE = acs::AcsMode::PTG_IDLE }; diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt index 617e2765..f278bbc9 100644 --- a/mission/system/CMakeLists.txt +++ b/mission/system/CMakeLists.txt @@ -1,3 +1,7 @@ add_subdirectory(objects) add_subdirectory(tree) +add_subdirectory(acs) +add_subdirectory(com) add_subdirectory(fdir) + +target_sources(${LIB_EIVE_MISSION} PRIVATE DualLanePowerStateMachine.cpp) diff --git a/mission/system/objects/DualLanePowerStateMachine.cpp b/mission/system/DualLanePowerStateMachine.cpp similarity index 100% rename from mission/system/objects/DualLanePowerStateMachine.cpp rename to mission/system/DualLanePowerStateMachine.cpp diff --git a/mission/system/objects/DualLanePowerStateMachine.h b/mission/system/DualLanePowerStateMachine.h similarity index 95% rename from mission/system/objects/DualLanePowerStateMachine.h rename to mission/system/DualLanePowerStateMachine.h index 7a6f29b6..7db99c83 100644 --- a/mission/system/objects/DualLanePowerStateMachine.h +++ b/mission/system/DualLanePowerStateMachine.h @@ -5,7 +5,7 @@ #include #include -#include "definitions.h" +#include "mission/powerDefs.h" class AssemblyBase; class PowerSwitchIF; diff --git a/mission/system/objects/AcsBoardAssembly.cpp b/mission/system/acs/AcsBoardAssembly.cpp similarity index 100% rename from mission/system/objects/AcsBoardAssembly.cpp rename to mission/system/acs/AcsBoardAssembly.cpp diff --git a/mission/system/objects/AcsBoardAssembly.h b/mission/system/acs/AcsBoardAssembly.h similarity index 98% rename from mission/system/objects/AcsBoardAssembly.h rename to mission/system/acs/AcsBoardAssembly.h index a07431fe..7427e808 100644 --- a/mission/system/objects/AcsBoardAssembly.h +++ b/mission/system/acs/AcsBoardAssembly.h @@ -6,8 +6,8 @@ #include #include "DualLaneAssemblyBase.h" -#include "DualLanePowerStateMachine.h" #include "eive/eventSubsystemIds.h" +#include "mission/system/DualLanePowerStateMachine.h" struct AcsBoardHelper { AcsBoardHelper(object_id_t mgm0Id, object_id_t mgm1Id, object_id_t mgm2Id, object_id_t mgm3Id, diff --git a/mission/system/fdir/AcsBoardFdir.cpp b/mission/system/acs/AcsBoardFdir.cpp similarity index 100% rename from mission/system/fdir/AcsBoardFdir.cpp rename to mission/system/acs/AcsBoardFdir.cpp diff --git a/mission/system/fdir/AcsBoardFdir.h b/mission/system/acs/AcsBoardFdir.h similarity index 100% rename from mission/system/fdir/AcsBoardFdir.h rename to mission/system/acs/AcsBoardFdir.h diff --git a/mission/system/objects/AcsSubsystem.cpp b/mission/system/acs/AcsSubsystem.cpp similarity index 95% rename from mission/system/objects/AcsSubsystem.cpp rename to mission/system/acs/AcsSubsystem.cpp index 873d88cf..2b1d9ef6 100644 --- a/mission/system/objects/AcsSubsystem.cpp +++ b/mission/system/acs/AcsSubsystem.cpp @@ -4,7 +4,7 @@ #include #include "fsfw/modes/ModeMessage.h" -#include "mission/acsDefs.h" +#include "mission/acs/defs.h" AcsSubsystem::AcsSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables) diff --git a/mission/system/objects/AcsSubsystem.h b/mission/system/acs/AcsSubsystem.h similarity index 100% rename from mission/system/objects/AcsSubsystem.h rename to mission/system/acs/AcsSubsystem.h diff --git a/mission/system/acs/CMakeLists.txt b/mission/system/acs/CMakeLists.txt new file mode 100644 index 00000000..70e11e59 --- /dev/null +++ b/mission/system/acs/CMakeLists.txt @@ -0,0 +1,11 @@ +target_sources( + ${LIB_EIVE_MISSION} + PRIVATE AcsBoardAssembly.cpp + AcsSubsystem.cpp + DualLaneAssemblyBase.cpp + ImtqAssembly.cpp + RwAssembly.cpp + SusAssembly.cpp + AcsBoardFdir.cpp + acsModeTree.cpp + SusFdir.cpp) diff --git a/mission/system/objects/DualLaneAssemblyBase.cpp b/mission/system/acs/DualLaneAssemblyBase.cpp similarity index 100% rename from mission/system/objects/DualLaneAssemblyBase.cpp rename to mission/system/acs/DualLaneAssemblyBase.cpp diff --git a/mission/system/objects/DualLaneAssemblyBase.h b/mission/system/acs/DualLaneAssemblyBase.h similarity index 98% rename from mission/system/objects/DualLaneAssemblyBase.h rename to mission/system/acs/DualLaneAssemblyBase.h index 929ef3f9..c71810d6 100644 --- a/mission/system/objects/DualLaneAssemblyBase.h +++ b/mission/system/acs/DualLaneAssemblyBase.h @@ -2,7 +2,7 @@ #define MISSION_SYSTEM_DUALLANEASSEMBLYBASE_H_ #include -#include +#include /** * @brief Encapsulates assemblies which are also responsible for dual lane power switching diff --git a/mission/system/objects/ImtqAssembly.cpp b/mission/system/acs/ImtqAssembly.cpp similarity index 100% rename from mission/system/objects/ImtqAssembly.cpp rename to mission/system/acs/ImtqAssembly.cpp diff --git a/mission/system/objects/ImtqAssembly.h b/mission/system/acs/ImtqAssembly.h similarity index 100% rename from mission/system/objects/ImtqAssembly.h rename to mission/system/acs/ImtqAssembly.h diff --git a/mission/system/objects/RwAssembly.cpp b/mission/system/acs/RwAssembly.cpp similarity index 100% rename from mission/system/objects/RwAssembly.cpp rename to mission/system/acs/RwAssembly.cpp diff --git a/mission/system/objects/RwAssembly.h b/mission/system/acs/RwAssembly.h similarity index 100% rename from mission/system/objects/RwAssembly.h rename to mission/system/acs/RwAssembly.h diff --git a/mission/system/objects/SusAssembly.cpp b/mission/system/acs/SusAssembly.cpp similarity index 100% rename from mission/system/objects/SusAssembly.cpp rename to mission/system/acs/SusAssembly.cpp diff --git a/mission/system/objects/SusAssembly.h b/mission/system/acs/SusAssembly.h similarity index 100% rename from mission/system/objects/SusAssembly.h rename to mission/system/acs/SusAssembly.h diff --git a/mission/system/fdir/SusFdir.cpp b/mission/system/acs/SusFdir.cpp similarity index 100% rename from mission/system/fdir/SusFdir.cpp rename to mission/system/acs/SusFdir.cpp diff --git a/mission/system/fdir/SusFdir.h b/mission/system/acs/SusFdir.h similarity index 100% rename from mission/system/fdir/SusFdir.h rename to mission/system/acs/SusFdir.h diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/acs/acsModeTree.cpp similarity index 99% rename from mission/system/tree/acsModeTree.cpp rename to mission/system/acs/acsModeTree.cpp index 9b0c573a..cee5445d 100644 --- a/mission/system/tree/acsModeTree.cpp +++ b/mission/system/acs/acsModeTree.cpp @@ -9,9 +9,9 @@ #include #include "eive/objects.h" -#include "mission/acsDefs.h" -#include "mission/system/objects/definitions.h" -#include "util.h" +#include "mission/acs/defs.h" +#include "mission/powerDefs.h" +#include "mission/system/tree/util.h" AcsSubsystem satsystem::acs::ACS_SUBSYSTEM(objects::ACS_SUBSYSTEM, 12, 24); diff --git a/mission/system/tree/acsModeTree.h b/mission/system/acs/acsModeTree.h similarity index 74% rename from mission/system/tree/acsModeTree.h rename to mission/system/acs/acsModeTree.h index 27236fba..da0374e6 100644 --- a/mission/system/tree/acsModeTree.h +++ b/mission/system/acs/acsModeTree.h @@ -1,4 +1,4 @@ -#include +#include namespace satsystem { namespace acs { diff --git a/mission/system/com/CMakeLists.txt b/mission/system/com/CMakeLists.txt new file mode 100644 index 00000000..6d31da88 --- /dev/null +++ b/mission/system/com/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources( + ${LIB_EIVE_MISSION} PRIVATE comModeTree.cpp ComSubsystem.cpp + SyrlinksAssembly.cpp SyrlinksFdir.cpp) diff --git a/mission/com/ComSubsystem.cpp b/mission/system/com/ComSubsystem.cpp similarity index 100% rename from mission/com/ComSubsystem.cpp rename to mission/system/com/ComSubsystem.cpp diff --git a/mission/com/ComSubsystem.h b/mission/system/com/ComSubsystem.h similarity index 100% rename from mission/com/ComSubsystem.h rename to mission/system/com/ComSubsystem.h diff --git a/mission/system/com/SyrlinksAssembly.cpp b/mission/system/com/SyrlinksAssembly.cpp new file mode 100644 index 00000000..b5e50924 --- /dev/null +++ b/mission/system/com/SyrlinksAssembly.cpp @@ -0,0 +1,57 @@ +#include "SyrlinksAssembly.h" + +#include + +using namespace returnvalue; + +SyrlinksAssembly::SyrlinksAssembly(object_id_t objectId) : AssemblyBase(objectId) { + ModeListEntry entry; + entry.setObject(objects::SYRLINKS_HANDLER); + entry.setMode(MODE_OFF); + entry.setSubmode(SUBMODE_NONE); + commandTable.insert(entry); +} + +ReturnValue_t SyrlinksAssembly::commandChildren(Mode_t mode, Submode_t submode) { + commandTable[0].setMode(mode); + commandTable[0].setSubmode(submode); + HybridIterator iter(commandTable.begin(), commandTable.end()); + if (recoveryState == RECOVERY_IDLE) { + ReturnValue_t result = checkAndHandleHealthState(mode, submode); + if (result == NEED_TO_CHANGE_HEALTH) { + return OK; + } + } + executeTable(iter); + return returnvalue::OK; +} + +ReturnValue_t SyrlinksAssembly::checkChildrenStateOn(Mode_t wantedMode, Submode_t wantedSubmode) { + if (childrenMap[objects::SYRLINKS_HANDLER].mode != wantedMode) { + return NOT_ENOUGH_CHILDREN_IN_CORRECT_STATE; + } + return returnvalue::OK; +} + +ReturnValue_t SyrlinksAssembly::isModeCombinationValid(Mode_t mode, Submode_t submode) { + if (mode == MODE_ON or mode == DeviceHandlerIF::MODE_NORMAL or mode == MODE_OFF) { + return returnvalue::OK; + } + return returnvalue::FAILED; +} + +ReturnValue_t SyrlinksAssembly::checkAndHandleHealthState(Mode_t deviceMode, + Submode_t deviceSubmode) { + HealthState health = healthHelper.healthTable->getHealth(objects::SYRLINKS_HANDLER); + if (health == FAULTY or health == PERMANENT_FAULTY) { + overwriteDeviceHealth(objects::SYRLINKS_HANDLER, health); + return NEED_TO_CHANGE_HEALTH; + } else if (health == EXTERNAL_CONTROL) { + modeHelper.setForced(true); + } + return OK; +} + +void SyrlinksAssembly::handleChildrenLostMode(ReturnValue_t result) { + startTransition(mode, submode); +} diff --git a/mission/system/com/SyrlinksAssembly.h b/mission/system/com/SyrlinksAssembly.h new file mode 100644 index 00000000..314474d3 --- /dev/null +++ b/mission/system/com/SyrlinksAssembly.h @@ -0,0 +1,20 @@ +#ifndef MISSION_SYSTEM_OBJECTS_SYRLINKSASSEMBLY_H_ +#define MISSION_SYSTEM_OBJECTS_SYRLINKSASSEMBLY_H_ +#include + +class SyrlinksAssembly : public AssemblyBase { + public: + SyrlinksAssembly(object_id_t objectId); + + private: + FixedArrayList commandTable; + + ReturnValue_t commandChildren(Mode_t mode, Submode_t submode) override; + ReturnValue_t checkChildrenStateOn(Mode_t wantedMode, Submode_t wantedSubmode) override; + ReturnValue_t isModeCombinationValid(Mode_t mode, Submode_t submode) override; + void handleChildrenLostMode(ReturnValue_t result) override; + + ReturnValue_t checkAndHandleHealthState(Mode_t deviceMode, Submode_t deviceSubmode); +}; + +#endif /* MISSION_SYSTEM_OBJECTS_SYRLINKSASSEMBLY_H_ */ diff --git a/mission/com/SyrlinksFdir.cpp b/mission/system/com/SyrlinksFdir.cpp similarity index 100% rename from mission/com/SyrlinksFdir.cpp rename to mission/system/com/SyrlinksFdir.cpp diff --git a/mission/com/SyrlinksFdir.h b/mission/system/com/SyrlinksFdir.h similarity index 100% rename from mission/com/SyrlinksFdir.h rename to mission/system/com/SyrlinksFdir.h diff --git a/mission/com/comModeTree.cpp b/mission/system/com/comModeTree.cpp similarity index 99% rename from mission/com/comModeTree.cpp rename to mission/system/com/comModeTree.cpp index c400ea95..9501262d 100644 --- a/mission/com/comModeTree.cpp +++ b/mission/system/com/comModeTree.cpp @@ -1,7 +1,8 @@ +#include "comModeTree.h" + #include #include #include -#include #include "eive/objects.h" #include "mission/com/defs.h" diff --git a/mission/com/comModeTree.h b/mission/system/com/comModeTree.h similarity index 94% rename from mission/com/comModeTree.h rename to mission/system/com/comModeTree.h index 5adecf8e..bf03bfb4 100644 --- a/mission/com/comModeTree.h +++ b/mission/system/com/comModeTree.h @@ -2,7 +2,8 @@ #define MISSION_SYSTEM_TREE_COMMODETREE_H_ #include -#include + +#include "ComSubsystem.h" namespace satsystem { diff --git a/mission/system/fdir/CMakeLists.txt b/mission/system/fdir/CMakeLists.txt index ae93ed91..fb737a3f 100644 --- a/mission/system/fdir/CMakeLists.txt +++ b/mission/system/fdir/CMakeLists.txt @@ -1,3 +1,2 @@ -target_sources( - ${LIB_EIVE_MISSION} PRIVATE AcsBoardFdir.cpp RtdFdir.cpp StrFdir.cpp - SusFdir.cpp GomspacePowerFdir.cpp) +target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp + GomspacePowerFdir.cpp) diff --git a/mission/system/fdir/StrFdir.cpp b/mission/system/fdir/StrFdir.cpp index 7d0947a9..97a4162a 100644 --- a/mission/system/fdir/StrFdir.cpp +++ b/mission/system/fdir/StrFdir.cpp @@ -1,6 +1,6 @@ #include "StrFdir.h" -#include "mission/acsDefs.h" +#include "mission/acs/defs.h" StrFdir::StrFdir(object_id_t strObject) : DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {} diff --git a/mission/system/objects/CMakeLists.txt b/mission/system/objects/CMakeLists.txt index 544522f9..e23a82c7 100644 --- a/mission/system/objects/CMakeLists.txt +++ b/mission/system/objects/CMakeLists.txt @@ -2,17 +2,9 @@ target_sources( ${LIB_EIVE_MISSION} PRIVATE EiveSystem.cpp CamSwitcher.cpp - AcsSubsystem.cpp TcsSubsystem.cpp PayloadSubsystem.cpp - AcsBoardAssembly.cpp - ImtqAssembly.cpp - SyrlinksAssembly.cpp Stack5VHandler.cpp - SusAssembly.cpp - RwAssembly.cpp - DualLanePowerStateMachine.cpp StrAssembly.cpp PowerStateMachineBase.cpp - DualLaneAssemblyBase.cpp TcsBoardAssembly.cpp) diff --git a/mission/system/objects/EiveSystem.cpp b/mission/system/objects/EiveSystem.cpp index bb2a229d..22af5fb2 100644 --- a/mission/system/objects/EiveSystem.cpp +++ b/mission/system/objects/EiveSystem.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include EiveSystem::EiveSystem(object_id_t setObjectId, uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables) diff --git a/mission/system/objects/PowerStateMachineBase.h b/mission/system/objects/PowerStateMachineBase.h index 12e72b60..25af577b 100644 --- a/mission/system/objects/PowerStateMachineBase.h +++ b/mission/system/objects/PowerStateMachineBase.h @@ -5,7 +5,7 @@ #include #include -#include "definitions.h" +#include "mission/powerDefs.h" class PowerStateMachineBase { public: diff --git a/mission/system/tree/CMakeLists.txt b/mission/system/tree/CMakeLists.txt index 9a48af42..a6764013 100644 --- a/mission/system/tree/CMakeLists.txt +++ b/mission/system/tree/CMakeLists.txt @@ -1,2 +1,2 @@ -target_sources(${LIB_EIVE_MISSION} PRIVATE acsModeTree.cpp payloadModeTree.cpp - tcsModeTree.cpp system.cpp util.cpp) +target_sources(${LIB_EIVE_MISSION} PRIVATE payloadModeTree.cpp tcsModeTree.cpp + system.cpp util.cpp) diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp index 0f955929..283cd761 100644 --- a/mission/system/tree/payloadModeTree.cpp +++ b/mission/system/tree/payloadModeTree.cpp @@ -8,8 +8,8 @@ #include "eive/objects.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/payloadDefs.h" +#include "mission/powerDefs.h" #include "mission/system/objects/PayloadSubsystem.h" -#include "mission/system/objects/definitions.h" #include "util.h" namespace { diff --git a/mission/system/tree/system.cpp b/mission/system/tree/system.cpp index 2ae82802..6e3b3f72 100644 --- a/mission/system/tree/system.cpp +++ b/mission/system/tree/system.cpp @@ -2,13 +2,13 @@ #include #include -#include -#include +#include #include +#include -#include "acsModeTree.h" #include "eive/objects.h" #include "mission/com/defs.h" +#include "mission/system/acs/acsModeTree.h" #include "payloadModeTree.h" #include "tcsModeTree.h" #include "util.h" diff --git a/tmtc b/tmtc index 9bb9a43d..c636c5c3 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 9bb9a43d45f7209874cda93ad7edfa4b86fe125b +Subproject commit c636c5c3e30d4d60cad27f15c53a004b3e946f11 diff --git a/unittest/hdlcEncodingRw.cpp b/unittest/hdlcEncodingRw.cpp index 88587414..10c71bc0 100644 --- a/unittest/hdlcEncodingRw.cpp +++ b/unittest/hdlcEncodingRw.cpp @@ -2,7 +2,7 @@ #include -#include "mission/devices/devicedefinitions/rwHelpers.h" +#include "mission/acs/rwHelpers.h" TEST_CASE("HDLC Encoding RW", "[acs]") { std::array encodedBuffer{};