From af85c883faaa7dfb1394d00962685333ddecee18 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 17 Mar 2023 16:04:35 +0100 Subject: [PATCH 1/2] bugfix in SD card manager --- bsp_q7s/fs/SdCardManager.cpp | 1 - tmtc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bsp_q7s/fs/SdCardManager.cpp b/bsp_q7s/fs/SdCardManager.cpp index e954e7bb..29225899 100644 --- a/bsp_q7s/fs/SdCardManager.cpp +++ b/bsp_q7s/fs/SdCardManager.cpp @@ -37,7 +37,6 @@ SdCardManager::SdCardManager() : SystemObject(objects::SDC_MANAGER), cmdExecutor sif::warning << "CoreController::sdCardInit: " "Preferred SD card not set. Setting to 0" << std::endl; - setPreferredSdCard(sd::SdCard::SLOT_0); scratch::writeNumber(scratch::PREFERED_SDC_KEY, static_cast(sd::SdCard::SLOT_0)); prefSdRaw = sd::SdCard::SLOT_0; diff --git a/tmtc b/tmtc index 4f48c25b..350e5d77 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 4f48c25bf757b6c056072049fe5965da890b4f5b +Subproject commit 350e5d77b8113cc9e21eb72242fc37536368f541 From 5b84808d7cea0849927c6f746470c366455bec07 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 17 Mar 2023 16:16:53 +0100 Subject: [PATCH 2/2] reset the counter --- mission/controller/AcsController.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 220ba178..e3a5ed5e 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -180,9 +180,11 @@ void AcsController::performSafe() { safeCtrlFailureCounter++; if (safeCtrlFailureCounter > 50) { safeCtrlFailureFlag = false; + safeCtrlFailureCounter = 0; } } else { safeCtrlFailureFlag = false; + safeCtrlFailureCounter = 0; } actuatorCmd.cmdDipolMtq(magMomMtq, cmdDipolMtqs,