From 2b327bf3a7f6a12867ef565271f56d16eb4bea76 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 23:09:55 +0100 Subject: [PATCH 1/4] initialize a variable --- linux/devices/ploc/PlocSupvUartMan.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index ee232f47..a246d97c 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -1132,7 +1132,7 @@ int PlocSupvUartManager::removeHdlcFramingWithCrcCheck(const uint8_t* src, size_ } // calc crc16 uint16_t calcCrc = calc_crc16_buff_reflected(dst, tlen - 2); - uint16_t crc; + uint16_t crc = 0; size_t dummy; SerializeAdapter::deSerialize(&crc, dst + tlen - 2, &dummy, SerializeIF::Endianness::LITTLE); if (calcCrc != crc) { From 84a3466b4d6dafa1b5526bc2f653df16ada91de5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 23:24:45 +0100 Subject: [PATCH 2/4] fixed array list min len 1 --- fsfw | 2 +- mission/system/tree/acsModeTree.cpp | 2 +- mission/system/tree/payloadModeTree.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index 8eb869e0..5b0ea912 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 8eb869e073d99e257c6cc62dbf26b4d99422e9b8 +Subproject commit 5b0ea91222a6b8efb2f4562cfecbcb735dfeedd5 diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp index 4e390985..d91c59fc 100644 --- a/mission/system/tree/acsModeTree.cpp +++ b/mission/system/tree/acsModeTree.cpp @@ -30,7 +30,7 @@ static const auto NML = DeviceHandlerIF::MODE_NORMAL; auto ACS_SEQUENCE_OFF = std::make_pair(acs::CtrlModes::OFF << 24, FixedArrayList()); auto ACS_TABLE_OFF_TGT = - std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList()); + std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList()); auto ACS_TABLE_OFF_TRANS = std::make_pair((acs::CtrlModes::OFF << 24) | 2, FixedArrayList()); diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp index 6cbc4004..0396cfc6 100644 --- a/mission/system/tree/payloadModeTree.cpp +++ b/mission/system/tree/payloadModeTree.cpp @@ -28,7 +28,7 @@ static const auto ON = HasModesIF::MODE_ON; static const auto NML = DeviceHandlerIF::MODE_NORMAL; auto PL_SEQUENCE_OFF = std::make_pair(OFF << 24, FixedArrayList()); -auto PL_TABLE_OFF_TGT = std::make_pair((OFF << 24) | 1, FixedArrayList()); +auto PL_TABLE_OFF_TGT = std::make_pair((OFF << 24) | 1, FixedArrayList()); auto PL_TABLE_OFF_TRANS_0 = std::make_pair((OFF << 24) | 2, FixedArrayList()); auto PL_TABLE_OFF_TRANS_1 = std::make_pair((OFF << 24) | 3, FixedArrayList()); From 5f929f6cf805fff498a5d4d49ef4c65f765a1059 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Nov 2022 17:26:33 +0100 Subject: [PATCH 3/4] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 1483dc4d..c421f3f5 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 1483dc4d93898826b1cee645148f88995bbdc7a5 +Subproject commit c421f3f5d78d77d23e42d1ccae79d7c6fc308431 From f73d293cdd72653bef7b3ffe82bb815f9ff3676a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Nov 2022 18:08:16 +0100 Subject: [PATCH 4/4] schedule PL task --- bsp_q7s/core/scheduling.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp index f07eda32..5a8c3827 100644 --- a/bsp_q7s/core/scheduling.cpp +++ b/bsp_q7s/core/scheduling.cpp @@ -365,6 +365,7 @@ void scheduling::initTasks() { #if OBSW_ADD_PLOC_SUPERVISOR == 1 supvHelperTask->startTask(); #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */ + plTask->startTask(); #if OBSW_ADD_TEST_CODE == 1 taskStarter(testTasks, "Test task vector");