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

Minor adaption ti filesystem include and removed arcsect submodule to make it work on my local machine

Browse Source
This commit is contained in:
petriVM18 2022-05-03 08:10:07 +02:00
parent 9dc382706a
commit c413d90b88
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,9 +13,6 @@
[submodule "generators/fsfwgen"] [submodule "generators/fsfwgen"]
path = generators/fsfwgen path = generators/fsfwgen
url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-gen.git url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-gen.git
[submodule "thirdparty/arcsec_star_tracker"]
path = thirdparty/arcsec_star_tracker
url = https://egit.irs.uni-stuttgart.de/eive/arcsec_star_tracker.git
[submodule "thirdparty/json"] [submodule "thirdparty/json"]
path = thirdparty/json path = thirdparty/json
url = https://github.com/nlohmann/json.git url = https://github.com/nlohmann/json.git

2
mission/devices/devicedefinitions/payloadPcduDefinitions.h
View File

@ -5,7 +5,7 @@
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <cstddef> #include <cstddef>
#include <filesystem> #include <experimental/filesystem>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "OBSWConfig.h" #include "OBSWConfig.h"

4
mission/memory/NVMParameterBase.cpp
View File

@ -8,7 +8,7 @@
NVMParameterBase::NVMParameterBase(std::string fullName) : fullName(fullName) {} NVMParameterBase::NVMParameterBase(std::string fullName) : fullName(fullName) {}
ReturnValue_t NVMParameterBase::readJsonFile() { ReturnValue_t NVMParameterBase::readJsonFile() {
if (std::filesystem::exists(fullName)) { if (std::experimental::filesystem::exists(fullName)) {
// Read JSON file content into object // Read JSON file content into object
std::ifstream i(fullName); std::ifstream i(fullName);
try { try {
@ -37,7 +37,7 @@ void NVMParameterBase::setFullName(std::string fullName) { this->fullName = full
std::string NVMParameterBase::getFullName() const { return fullName; } std::string NVMParameterBase::getFullName() const { return fullName; }
bool NVMParameterBase::getJsonFileExists() { return std::filesystem::exists(fullName); } bool NVMParameterBase::getJsonFileExists() { return std::experimental::filesystem::exists(fullName); }
void NVMParameterBase::printKeys() const { void NVMParameterBase::printKeys() const {
sif::info << "Printing keys for JSON file " << fullName << std::endl; sif::info << "Printing keys for JSON file " << fullName << std::endl;

2
mission/memory/NVMParameterBase.h
View File

@ -1,7 +1,7 @@
#ifndef BSP_Q7S_CORE_NVMPARAMS_NVMPARAMIF_H_ #ifndef BSP_Q7S_CORE_NVMPARAMS_NVMPARAMIF_H_
#define BSP_Q7S_CORE_NVMPARAMS_NVMPARAMIF_H_ #define BSP_Q7S_CORE_NVMPARAMS_NVMPARAMIF_H_
#include <filesystem> #include <experimental/filesystem>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>

1
thirdparty/arcsec_star_tracker vendored

@ -1 +0,0 @@
Subproject commit 93e93965e2c6405170b62c523dea1990db02d2ad