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

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2022-08-29 15:50:55 +02:00
parent 89b3b2ff42 04fb2b1261
commit 975f202ddb
331 changed files with 5494 additions and 19776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ class PlPcduParameter : public NVMParameterBase {
ReturnValue_t initialize(std::string mountPrefix) {
setFullName(mountPrefix + "/conf/plpcdu.json");
ReturnValue_t result = readJsonFile();
if (result != HasReturnvaluesIF::RETURN_OK) {
if (result != returnvalue::OK) {
// File does not exist or reading JSON failed for various reason. Rewrite the JSON file
#if OBSW_VERBOSE_LEVEL >= 1
sif::info << "Creating PL PCDU JSON file at " << getFullName() << std::endl;
@ -206,7 +206,7 @@ class PlPcduParameter : public NVMParameterBase {
resetValues();
writeJsonFile();
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
void resetValues() {
insertValue(PARAM_KEY_MAP[SSR_TO_DRO_WAIT_TIME], DFT_SSR_TO_DRO_WAIT_TIME);