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

update to new API
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-09-12 17:23:43 +02:00
parent 002f776bef
commit 4649a75d40
10 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mission/devices/PayloadPcduHandler.cpp
View File

@ -491,8 +491,8 @@ void PayloadPcduHandler::checkAdcValues() {
void PayloadPcduHandler::checkJsonFileInit() {
if (not jsonFileInitComplete) {
sd::SdCard activeSd = sdcMan->getActiveSdCard();
if (sdcMan->isSdCardMounted(activeSd)) {
auto activeSd = sdcMan->getActiveSdCard();
if (activeSd and sdcMan->isSdCardMounted(activeSd.value())) {
params.initialize(sdcMan->getCurrentMountPrefix());
jsonFileInitComplete = true;
}

6
mission/memory/SdCardMountedIF.h
View File

@ -2,7 +2,7 @@
#define MISSION_MEMORY_SDCARDMOUNTERIF_H_
#include <string>
#include <optional>
#include "definitions.h"
class SdCardMountedIF {
@ -10,9 +10,9 @@ class SdCardMountedIF {
virtual ~SdCardMountedIF(){};
virtual const std::string& getCurrentMountPrefix() const = 0;
virtual bool isSdCardMounted(sd::SdCard sdCard) = 0;
virtual sd::SdCard getPreferredSdCard() const = 0;
virtual std::optional<sd::SdCard> getPreferredSdCard() const = 0;
virtual void setActiveSdCard(sd::SdCard sdCard) = 0;
virtual sd::SdCard getActiveSdCard() const = 0;
virtual std::optional<sd::SdCard> getActiveSdCard() const = 0;
private:
};