From b8fb5c289cf45fad71d295160b1114b406066e8f Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 17 Mar 2022 19:51:00 +0100 Subject: [PATCH] fix in mem write command --- bsp_te0720_1cfa/InitMission.cpp | 2 +- bsp_te0720_1cfa/boardconfig/busConf.h | 2 +- generators/bsp_q7s_objects.csv | 1 + generators/objects/translateObjects.cpp | 7 +++++-- linux/devices/devicedefinitions/PlocMPSoCDefinitions.h | 3 ++- linux/devices/ploc/PlocMPSoCHandler.cpp | 1 + linux/fsfwconfig/objects/translateObjects.cpp | 7 +++++-- tmtc | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bsp_te0720_1cfa/InitMission.cpp b/bsp_te0720_1cfa/InitMission.cpp index 22601ea4..6b39cfb6 100644 --- a/bsp_te0720_1cfa/InitMission.cpp +++ b/bsp_te0720_1cfa/InitMission.cpp @@ -91,7 +91,7 @@ void initmission::initTasks() { PeriodicTaskIF* mpsocHelperTask = factory->createPeriodicTask( "PLOC_MPSOC_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc); - result = mpsocHelperTask->addComponent(objects::STR_HELPER); + result = mpsocHelperTask->addComponent(objects::PLOC_MPSOC_HELPER); if (result != HasReturnvaluesIF::RETURN_OK) { initmission::printAddObjectError("PLOC_MPSOC_HELPER", objects::PLOC_MPSOC_HELPER); } diff --git a/bsp_te0720_1cfa/boardconfig/busConf.h b/bsp_te0720_1cfa/boardconfig/busConf.h index 9248fac9..893014c1 100644 --- a/bsp_te0720_1cfa/boardconfig/busConf.h +++ b/bsp_te0720_1cfa/boardconfig/busConf.h @@ -2,7 +2,7 @@ #define BSP_EGSE_BOARDCONFIG_BUSCONF_H_ namespace te0720_1cfa { -static constexpr char MPSOC_UART[] = "/dev/ttyPS2"; +static constexpr char MPSOC_UART[] = "/dev/ttyPS1"; namespace baudrate { } diff --git a/generators/bsp_q7s_objects.csv b/generators/bsp_q7s_objects.csv index ed5271ee..3ee46abb 100644 --- a/generators/bsp_q7s_objects.csv +++ b/generators/bsp_q7s_objects.csv @@ -43,6 +43,7 @@ 0x44330003;PLOC_MPSOC_HELPER 0x44330015;PLOC_MPSOC_HANDLER 0x44330016;PLOC_SUPERVISOR_HANDLER +0x44330017;PLOC_SUPERVISOR_HELPER 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER 0x444100A4;HEATER_HANDLER 0x44420004;TMP1075_HANDLER_1 diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 1d8fee25..df3cafe1 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 113 translations. - * Generated on: 2022-03-14 15:22:29 + * Contains 114 translations. + * Generated on: 2022-03-17 14:31:48 */ #include "translateObjects.h" @@ -51,6 +51,7 @@ const char *STR_HELPER_STRING = "STR_HELPER"; const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER"; const char *PLOC_MPSOC_HANDLER_STRING = "PLOC_MPSOC_HANDLER"; const char *PLOC_SUPERVISOR_HANDLER_STRING = "PLOC_SUPERVISOR_HANDLER"; +const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; @@ -212,6 +213,8 @@ const char *translateObject(object_id_t object) { return PLOC_MPSOC_HANDLER_STRING; case 0x44330016: return PLOC_SUPERVISOR_HANDLER_STRING; + case 0x44330017: + return PLOC_SUPERVISOR_HELPER_STRING; case 0x444100A2: return SOLAR_ARRAY_DEPL_HANDLER_STRING; case 0x444100A4: diff --git a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h index 3b41d794..9348359f 100644 --- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h +++ b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h @@ -253,7 +253,8 @@ private: ReturnValue_t lengthCheck(size_t commandDataLen) { if (commandDataLen < MIN_COMMAND_DATA_LENGTH) { - return INVALID_LENGTH; + sif::warning << "TcMemWrite: Command has invalid length " << commandDataLen << std::endl; + return INVALID_LENGTH; } return RETURN_OK; } diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp index 0f98cca6..e36a7240 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/devices/ploc/PlocMPSoCHandler.cpp @@ -267,6 +267,7 @@ ReturnValue_t PlocMPSoCHandler::prepareTcMemWriteCommand(const uint8_t * command mpsoc::TcMemWrite tcMemWrite(sequenceCount); result = tcMemWrite.createPacket(commandData, commandDataLen); if (result != RETURN_OK) { + sequenceCount--; return result; } copyToCommandBuffer(&tcMemWrite); diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 1d8fee25..df3cafe1 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 113 translations. - * Generated on: 2022-03-14 15:22:29 + * Contains 114 translations. + * Generated on: 2022-03-17 14:31:48 */ #include "translateObjects.h" @@ -51,6 +51,7 @@ const char *STR_HELPER_STRING = "STR_HELPER"; const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER"; const char *PLOC_MPSOC_HANDLER_STRING = "PLOC_MPSOC_HANDLER"; const char *PLOC_SUPERVISOR_HANDLER_STRING = "PLOC_SUPERVISOR_HANDLER"; +const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; @@ -212,6 +213,8 @@ const char *translateObject(object_id_t object) { return PLOC_MPSOC_HANDLER_STRING; case 0x44330016: return PLOC_SUPERVISOR_HANDLER_STRING; + case 0x44330017: + return PLOC_SUPERVISOR_HELPER_STRING; case 0x444100A2: return SOLAR_ARRAY_DEPL_HANDLER_STRING; case 0x444100A4: diff --git a/tmtc b/tmtc index 9005ccab..cf61dfac 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 9005ccab3a07f569c45369f591c12b7613ffcac3 +Subproject commit cf61dfac0d810ef5268c0c7219bd10ac252f5570