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

v1.14.0 #304

Merged
muellerr merged 366 commits from develop into main 2022-10-10 17:46:38 +02:00
Conversation 0 Commits 366 Files Changed 420 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b4bb46726c - Show all commits

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 <experimental/filesystem> #include <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::experimental::filesystem::exists(fullName)) { if (std::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::experimental::filesystem::exists(fullName); } bool NVMParameterBase::getJsonFileExists() { return std::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 <experimental/filesystem> #include <filesystem>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>