eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

start RPiSdCardManager
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou 2022-09-12 17:15:02 +02:00
parent 7bc866a105
commit 002f776bef
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bsp_linux_board/RPiSdCardManager.cpp
View File

@ -1,14 +1,20 @@
#include "RPiSdCardManager.h" #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) {} void RPiSdCardManager::setActiveSdCard(sd::SdCard sdCard) {}

4
bsp_linux_board/RPiSdCardManager.h
View File

@ -4,12 +4,14 @@
class RPiSdCardManager: public SdCardMountedIF { class RPiSdCardManager: public SdCardMountedIF {
public: public:
RPiSdCardManager(std::string prefix); RPiSdCardManager(const std::string& prefix);
const std::string& getCurrentMountPrefix() const override; const std::string& getCurrentMountPrefix() const override;
bool isSdCardMounted(sd::SdCard sdCard) override; bool isSdCardMounted(sd::SdCard sdCard) override;
sd::SdCard getPreferredSdCard() const override; sd::SdCard getPreferredSdCard() const override;
void setActiveSdCard(sd::SdCard sdCard) override; void setActiveSdCard(sd::SdCard sdCard) override;
sd::SdCard getActiveSdCard() const override; sd::SdCard getActiveSdCard() const override;
private:
std::string prefix;
}; };

2
fsfw

@ -1 +1 @@
Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e Subproject commit 141dcb1f149b824b5bd6e5d3339ecb712835751e

6
mission/devices/ScexDeviceHandler.cpp
View File

@ -312,17 +312,21 @@ ReturnValue_t ScexDeviceHandler::initializeLocalDataPool(localpool::DataPool& lo
std::string ScexDeviceHandler::date_time_string() { std::string ScexDeviceHandler::date_time_string() {
using namespace std; using namespace std;
string date_time; string date_time;
Clock::TimeOfDay_t tod;
Clock::getDateAndTime(&tod);
time_t now = time(0); time_t now = time(0);
tm* ltm = localtime(&now); tm* ltm = localtime(&now);
ostringstream oss(std::ostringstream::ate); ostringstream oss(std::ostringstream::ate);
//TODO mit tod ersetzen
if (ltm->tm_hour < 10) { 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 { } else {
oss << 1900 + ltm->tm_year << 1 + ltm->tm_mon << ltm->tm_mday << "_" << ltm->tm_hour; oss << 1900 + ltm->tm_year << 1 + ltm->tm_mon << ltm->tm_mday << "_" << ltm->tm_hour;
} }
if (ltm->tm_min < 10) { if (ltm->tm_min < 10) {
oss << 0 << ltm->tm_min; oss << 0 << ltm->tm_min;
} else { } else {
oss << ltm->tm_min; oss << ltm->tm_min;
} }

2
tmtc

@ -1 +1 @@
Subproject commit e1d84c5b99e99ea9a9687dcd298d815dc4d8d2b6 Subproject commit b4d4a51164af69a22eedd645775061dbb51702b1