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/update-p60-module-code
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2022-08-26 13:45:53 +02:00
parent a7482b657a 440fb4d488
commit 0f553e3431
151 changed files with 2126 additions and 2115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mission/devices/ACUHandler.cpp
View File

@ -25,7 +25,7 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
#if OBSW_VERBOSE_LEVEL >= 1
PoolReadGuard pg0(&auxHk);
PoolReadGuard pg1(&coreHk);
if (pg0.getReadResult() != RETURN_OK or pg1.getReadResult() != RETURN_OK) {
if (pg0.getReadResult() != returnvalue::OK or pg1.getReadResult() != returnvalue::OK) {
return;
}
for (size_t idx = 0; idx < 3; idx++) {
@ -53,10 +53,10 @@ ReturnValue_t ACUHandler::parseHkTableReply(const uint8_t *packet) {
PoolReadGuard pg1(&auxHk);
auto res0 = pg0.getReadResult();
auto res1 = pg1.getReadResult();
if (res0 != RETURN_OK) {
if (res0 != returnvalue::OK) {
return res0;
}
if (res1 != RETURN_OK) {
if (res1 != returnvalue::OK) {
return res1;
}
for (size_t idx = 0; idx < 6; idx++) {
@ -106,7 +106,7 @@ ReturnValue_t ACUHandler::parseHkTableReply(const uint8_t *packet) {
auxHk.wdtGndLeft = as<uint32_t>(packet + 0x78);
coreHk.setValidity(true, true);
auxHk.setValidity(true, true);
return RETURN_OK;
return returnvalue::OK;
}
ReturnValue_t ACUHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
@ -145,7 +145,7 @@ ReturnValue_t ACUHandler::initializeLocalDataPool(localpool::DataPool &localData
subdp::DiagnosticsHkPeriodicParams(coreHk.getSid(), false, 10.0));
poolManager.subscribeForRegularPeriodicPacket(
subdp::RegularHkPeriodicParams(auxHk.getSid(), false, 30.0));
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
void ACUHandler::printChannelStats() {
@ -161,12 +161,12 @@ void ACUHandler::printChannelStats() {
void ACUHandler::setDebugMode(bool enable) { this->debugMode = enable; }
ReturnValue_t ACUHandler::printStatus(DeviceCommandId_t cmd) {
ReturnValue_t result = RETURN_OK;
ReturnValue_t result = returnvalue::OK;
switch (cmd) {
case (GOMSPACE::PRINT_SWITCH_V_I): {
PoolReadGuard pg(&coreHk);
result = pg.getReadResult();
if (result != HasReturnvaluesIF::RETURN_OK) {
if (result != returnvalue::OK) {
break;
}
printChannelStats();
@ -176,7 +176,7 @@ ReturnValue_t ACUHandler::printStatus(DeviceCommandId_t cmd) {
return DeviceHandlerIF::COMMAND_NOT_SUPPORTED;
}
}
if (result != HasReturnvaluesIF::RETURN_OK) {
if (result != returnvalue::OK) {
sif::warning << "Reading PDU1 HK table failed!" << std::endl;
}
return result;