From b992058e00cf2a86c19b781650b5692453acb127 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 8 Mar 2022 11:57:27 +0100 Subject: [PATCH 1/2] hotfix for countdown in SDC manager --- bsp_q7s/memory/SdCardManager.cpp | 2 +- bsp_q7s/memory/scratchApi.h | 2 +- fsfw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp index b76cee12..06072253 100644 --- a/bsp_q7s/memory/SdCardManager.cpp +++ b/bsp_q7s/memory/SdCardManager.cpp @@ -406,7 +406,7 @@ SdCardManager::OpStatus SdCardManager::checkCurrentOp(Operations& currentOp) { bool bytesRead = false; #if OBSW_ENABLE_TIMERS == 1 - Countdown timer(100); + Countdown timer(1000); #endif while (true) { ReturnValue_t result = cmdExecutor.check(bytesRead); diff --git a/bsp_q7s/memory/scratchApi.h b/bsp_q7s/memory/scratchApi.h index babd26dc..96264995 100644 --- a/bsp_q7s/memory/scratchApi.h +++ b/bsp_q7s/memory/scratchApi.h @@ -75,7 +75,7 @@ ReturnValue_t readToFile(std::string name, std::ifstream& file, std::string& fil int result = std::system(oss.str().c_str()); if (result != 0) { - if (result == 256) { + if (WEXITSTATUS(result) == 1) { sif::warning << "scratch::readNumber: Key " << name << " does not exist" << std::endl; // Could not find value std::remove(filename.c_str()); diff --git a/fsfw b/fsfw index 73f0b9c0..47d15815 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 73f0b9c0dc3995e2b1f11694ae1018953e7e62b1 +Subproject commit 47d158156b9efa0edbca9b3a1694f4132b0b30e5 -- 2.43.0 From 15151e0400ed8c56c82ee5d7651365a307fdc1d5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 8 Mar 2022 11:59:06 +0100 Subject: [PATCH 2/2] bump revision --- common/config/OBSWVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index f719a274..71fd3355 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -5,6 +5,6 @@ const char* const SW_NAME = "eive"; #define SW_VERSION 1 #define SW_SUBVERSION 9 -#define SW_REVISION 0 +#define SW_REVISION 1 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */ -- 2.43.0