now hosted should compile again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
This commit is contained in:
parent
d37f48336b
commit
9c217ad91e
@ -8,6 +8,7 @@
|
|||||||
#include <mission/tmtc/TmFunnelHandler.h>
|
#include <mission/tmtc/TmFunnelHandler.h>
|
||||||
#include <objects/systemObjectList.h>
|
#include <objects/systemObjectList.h>
|
||||||
|
|
||||||
|
#include "../mission/utility/DummySdCardManager.h"
|
||||||
#include "OBSWConfig.h"
|
#include "OBSWConfig.h"
|
||||||
#include "devConf.h"
|
#include "devConf.h"
|
||||||
#include "eive/definitions.h"
|
#include "eive/definitions.h"
|
||||||
@ -78,7 +79,8 @@ void ObjectFactory::produce(void* args) {
|
|||||||
Factory::setStaticFrameworkObjectIds();
|
Factory::setStaticFrameworkObjectIds();
|
||||||
PusTmFunnel* pusFunnel;
|
PusTmFunnel* pusFunnel;
|
||||||
CfdpTmFunnel* cfdpFunnel;
|
CfdpTmFunnel* cfdpFunnel;
|
||||||
ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel);
|
auto sdcMan = new DummySdCardManager("/tmp");
|
||||||
|
ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel, *sdcMan);
|
||||||
|
|
||||||
DummyGpioIF* dummyGpioIF = new DummyGpioIF();
|
DummyGpioIF* dummyGpioIF = new DummyGpioIF();
|
||||||
auto* dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
|
auto* dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp gpioInit.cpp
|
target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp gpioInit.cpp
|
||||||
ObjectFactory.cpp RPiSdCardManager.cpp)
|
ObjectFactory.cpp)
|
||||||
|
|
||||||
add_subdirectory(boardconfig)
|
add_subdirectory(boardconfig)
|
||||||
add_subdirectory(boardtest)
|
add_subdirectory(boardtest)
|
||||||
|
@ -82,7 +82,7 @@ void ObjectFactory::produce(void* args) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if OBSW_ADD_SCEX_DEVICE == 1
|
#if OBSW_ADD_SCEX_DEVICE == 1
|
||||||
auto* sdcMan = new RPiSdCardManager("/tmp");
|
auto* sdcMan = new DummySdCardManager("/tmp");
|
||||||
createScexComponents(uart::DEV, pwrSwitcher, *sdcMan, true, std::nullopt);
|
createScexComponents(uart::DEV, pwrSwitcher, *sdcMan, true, std::nullopt);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#include "RPiSdCardManager.h"
|
|
||||||
|
|
||||||
RPiSdCardManager::RPiSdCardManager(std::string prefix) : prefix(std::move(prefix)) {}
|
|
||||||
|
|
||||||
const std::string& RPiSdCardManager::getCurrentMountPrefix() const { return prefix; }
|
|
||||||
|
|
||||||
bool RPiSdCardManager::isSdCardUsable(sd::SdCard sdCard) { return true; }
|
|
||||||
|
|
||||||
std::optional<sd::SdCard> RPiSdCardManager::getPreferredSdCard() const { return std::nullopt; }
|
|
||||||
|
|
||||||
void RPiSdCardManager::setActiveSdCard(sd::SdCard sdCard) {}
|
|
||||||
|
|
||||||
std::optional<sd::SdCard> RPiSdCardManager::getActiveSdCard() const { return std::nullopt; }
|
|
@ -1,3 +1,3 @@
|
|||||||
target_sources(
|
target_sources(
|
||||||
${LIB_EIVE_MISSION} PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp
|
${LIB_EIVE_MISSION} PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp
|
||||||
GlobalConfigHandler.cpp)
|
GlobalConfigHandler.cpp DummySdCardManager.cpp)
|
||||||
|
13
mission/utility/DummySdCardManager.cpp
Normal file
13
mission/utility/DummySdCardManager.cpp
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#include "DummySdCardManager.h"
|
||||||
|
|
||||||
|
DummySdCardManager::DummySdCardManager(std::string prefix) : prefix(std::move(prefix)) {}
|
||||||
|
|
||||||
|
const std::string& DummySdCardManager::getCurrentMountPrefix() const { return prefix; }
|
||||||
|
|
||||||
|
bool DummySdCardManager::isSdCardUsable(std::optional<sd::SdCard> sdCard) { return true; }
|
||||||
|
|
||||||
|
std::optional<sd::SdCard> DummySdCardManager::getPreferredSdCard() const { return std::nullopt; }
|
||||||
|
|
||||||
|
void DummySdCardManager::setActiveSdCard(sd::SdCard sdCard) {}
|
||||||
|
|
||||||
|
std::optional<sd::SdCard> DummySdCardManager::getActiveSdCard() const { return std::nullopt; }
|
@ -2,11 +2,11 @@
|
|||||||
#define BSP_LINUX_BOARD_RPISDCARDMANAGER_H_
|
#define BSP_LINUX_BOARD_RPISDCARDMANAGER_H_
|
||||||
#include <mission/memory/SdCardMountedIF.h>
|
#include <mission/memory/SdCardMountedIF.h>
|
||||||
|
|
||||||
class RPiSdCardManager : public SdCardMountedIF {
|
class DummySdCardManager : public SdCardMountedIF {
|
||||||
public:
|
public:
|
||||||
RPiSdCardManager(std::string prefix);
|
DummySdCardManager(std::string prefix);
|
||||||
const std::string& getCurrentMountPrefix() const override;
|
const std::string& getCurrentMountPrefix() const override;
|
||||||
bool isSdCardUsable(sd::SdCard sdCard) override;
|
bool isSdCardUsable(std::optional<sd::SdCard> sdCard) override;
|
||||||
std::optional<sd::SdCard> getPreferredSdCard() const override;
|
std::optional<sd::SdCard> getPreferredSdCard() const override;
|
||||||
void setActiveSdCard(sd::SdCard sdCard) override;
|
void setActiveSdCard(sd::SdCard sdCard) override;
|
||||||
std::optional<sd::SdCard> getActiveSdCard() const override;
|
std::optional<sd::SdCard> getActiveSdCard() const override;
|
Loading…
Reference in New Issue
Block a user