From 19093866eeffe96c4f6f454df2dc7e2502f8d2f6 Mon Sep 17 00:00:00 2001 From: meggert Date: Fri, 29 Sep 2023 14:27:54 +0200 Subject: [PATCH 1/3] rtval for non op soc --- src/fsfw/devicehandlers/DeviceHandlerIF.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fsfw/devicehandlers/DeviceHandlerIF.h b/src/fsfw/devicehandlers/DeviceHandlerIF.h index 5e1fdd2f..59fba4d8 100644 --- a/src/fsfw/devicehandlers/DeviceHandlerIF.h +++ b/src/fsfw/devicehandlers/DeviceHandlerIF.h @@ -85,6 +85,7 @@ class DeviceHandlerIF { static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8); static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9); static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA); + static const ReturnValue_t NON_OP_SOC = MAKE_RETURN_CODE(0xAB); // Standard codes used in scanForReply static const ReturnValue_t CHECKSUM_ERROR = MAKE_RETURN_CODE(0xB0); From e3a815444e401fc2fa75f6f19b40a18eceee08a5 Mon Sep 17 00:00:00 2001 From: meggert Date: Fri, 29 Sep 2023 15:26:43 +0200 Subject: [PATCH 2/3] checkModeCommand to protected --- src/fsfw/power/PowerSwitcherComponent.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsfw/power/PowerSwitcherComponent.h b/src/fsfw/power/PowerSwitcherComponent.h index 8c74e76f..f0aac2ee 100644 --- a/src/fsfw/power/PowerSwitcherComponent.h +++ b/src/fsfw/power/PowerSwitcherComponent.h @@ -38,6 +38,8 @@ class PowerSwitcherComponent : public SystemObject, protected: PowerSwitcher switcher; + ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, + uint32_t *msToReachTheMode) override; private: MessageQueueIF *queue = nullptr; @@ -56,8 +58,6 @@ class PowerSwitcherComponent : public SystemObject, [[nodiscard]] MessageQueueId_t getCommandQueue() const override; void getMode(Mode_t *mode, Submode_t *submode) override; - ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, - uint32_t *msToReachTheMode) override; void startTransition(Mode_t mode, Submode_t submode) override; virtual void performFaultyOperation(); void setToExternalControl() override; From 0f604b35c6d3a2518e3c3ce3947825102e9fc4f4 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 9 Oct 2023 09:26:56 +0200 Subject: [PATCH 3/3] improved readability --- src/fsfw/devicehandlers/DeviceHandlerIF.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsfw/devicehandlers/DeviceHandlerIF.h b/src/fsfw/devicehandlers/DeviceHandlerIF.h index 59fba4d8..acdb561c 100644 --- a/src/fsfw/devicehandlers/DeviceHandlerIF.h +++ b/src/fsfw/devicehandlers/DeviceHandlerIF.h @@ -85,7 +85,7 @@ class DeviceHandlerIF { static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8); static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9); static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA); - static const ReturnValue_t NON_OP_SOC = MAKE_RETURN_CODE(0xAB); + static const ReturnValue_t NON_OP_STATE_OF_CHARGE = MAKE_RETURN_CODE(0xAB); // Standard codes used in scanForReply static const ReturnValue_t CHECKSUM_ERROR = MAKE_RETURN_CODE(0xB0);