From 3e3fc20fc6b73f1eb7d86586c821c96684707d80 Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L590 Date: Fri, 25 Mar 2022 12:34:03 +0100 Subject: [PATCH 1/3] correction for transition delay --- mission/devices/PayloadPcduHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index 1d5f4b89..f5c5bc62 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -334,7 +334,7 @@ ReturnValue_t PayloadPcduHandler::interpretDeviceReply(DeviceCommandId_t id, uint32_t PayloadPcduHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { // 20 minutes transition delay is allowed - return 20 * 60 * 60; + return 20 * 60 * 60 * 1000; } ReturnValue_t PayloadPcduHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap, From c949f9f795dff5f42160b7ac517f7a8de82f7d40 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 25 Mar 2022 13:12:27 +0100 Subject: [PATCH 2/3] another fix --- mission/devices/PayloadPcduHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index f5c5bc62..761fa383 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -334,7 +334,7 @@ ReturnValue_t PayloadPcduHandler::interpretDeviceReply(DeviceCommandId_t id, uint32_t PayloadPcduHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { // 20 minutes transition delay is allowed - return 20 * 60 * 60 * 1000; + return 20 * 60 * 1000; } ReturnValue_t PayloadPcduHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap, From c4ea13a5f4f7dd839bc8e8909b9b22a23a85ca48 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 25 Mar 2022 15:04:53 +0100 Subject: [PATCH 3/3] update fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 4b5e3e70..e6130263 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 4b5e3e70f7eb65780b697a81ba95ecc2a74a8b84 +Subproject commit e6130263ef144c5b1f6eafef734a0150a92d6cda