diff --git a/bsp_linux_board/RPiSdCardManager.cpp b/bsp_linux_board/RPiSdCardManager.cpp index 7913f33a..73111a83 100644 --- a/bsp_linux_board/RPiSdCardManager.cpp +++ b/bsp_linux_board/RPiSdCardManager.cpp @@ -1,14 +1,20 @@ #include "RPiSdCardManager.h" -RPiSdCardManager::RPiSdCardManager() {} +RPiSdCardManager::RPiSdCardManager(const std::string& prefix):prefix(prefix) { -RPiSdCardManager::RPiSdCardManager(std::string prefix) {} +} -const std::string& RPiSdCardManager::getCurrentMountPrefix() const {} +const std::string& RPiSdCardManager::getCurrentMountPrefix() const { + return prefix; +} -bool RPiSdCardManager::isSdCardMounted(sd::SdCard sdCard) {} +bool RPiSdCardManager::isSdCardMounted(sd::SdCard sdCard) { + return true; +} -sd::SdCard RPiSdCardManager::getPreferredSdCard() const {} +sd::SdCard RPiSdCardManager::getPreferredSdCard() const { + +} void RPiSdCardManager::setActiveSdCard(sd::SdCard sdCard) {} diff --git a/bsp_linux_board/RPiSdCardManager.h b/bsp_linux_board/RPiSdCardManager.h index 68e20c78..144cfe0e 100644 --- a/bsp_linux_board/RPiSdCardManager.h +++ b/bsp_linux_board/RPiSdCardManager.h @@ -4,12 +4,14 @@ class RPiSdCardManager: public SdCardMountedIF { public: - RPiSdCardManager(std::string prefix); + RPiSdCardManager(const std::string& prefix); const std::string& getCurrentMountPrefix() const override; bool isSdCardMounted(sd::SdCard sdCard) override; sd::SdCard getPreferredSdCard() const override; void setActiveSdCard(sd::SdCard sdCard) override; sd::SdCard getActiveSdCard() const override; +private: + std::string prefix; }; diff --git a/fsfw b/fsfw index cf8fe7ea..141dcb1f 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e +Subproject commit 141dcb1f149b824b5bd6e5d3339ecb712835751e diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp index 9a5ebf11..5f3f9aa0 100644 --- a/mission/devices/ScexDeviceHandler.cpp +++ b/mission/devices/ScexDeviceHandler.cpp @@ -312,17 +312,21 @@ ReturnValue_t ScexDeviceHandler::initializeLocalDataPool(localpool::DataPool& lo std::string ScexDeviceHandler::date_time_string() { using namespace std; string date_time; + Clock::TimeOfDay_t tod; + Clock::getDateAndTime(&tod); time_t now = time(0); tm* ltm = localtime(&now); ostringstream oss(std::ostringstream::ate); + //TODO mit tod ersetzen if (ltm->tm_hour < 10) { - oss << 1900 + ltm->tm_year << 1 + ltm->tm_mon << ltm->tm_mday << "_0" << ltm->tm_hour; + oss << tod.year << tod.month << ltm->tm_mday << "_0" << ltm->tm_hour; } else { oss << 1900 + ltm->tm_year << 1 + ltm->tm_mon << ltm->tm_mday << "_" << ltm->tm_hour; } if (ltm->tm_min < 10) { oss << 0 << ltm->tm_min; + } else { oss << ltm->tm_min; } diff --git a/tmtc b/tmtc index e1d84c5b..b4d4a511 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e1d84c5b99e99ea9a9687dcd298d815dc4d8d2b6 +Subproject commit b4d4a51164af69a22eedd645775061dbb51702b1