eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged

Browse Source
This commit is contained in:
Robin Müller
2022-08-24 17:13:41 +02:00
parent 7881f5bab8 a46d8c34d9
commit f91ad84bdc
455 changed files with 2989 additions and 3192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fsfw/devicehandlers/HealthDevice.cpp
View File

@ -18,7 +18,7 @@ HealthDevice::~HealthDevice() { QueueFactory::instance()->deleteMessageQueue(com
ReturnValue_t HealthDevice::performOperation(uint8_t opCode) {
CommandMessage command;
ReturnValue_t result = commandQueue->receiveMessage(&command);
if (result == HasReturnvaluesIF::RETURN_OK) {
if (result == returnvalue::OK) {
result = healthHelper.handleHealthCommand(&command);
}
return result;
@ -26,7 +26,7 @@ ReturnValue_t HealthDevice::performOperation(uint8_t opCode) {
ReturnValue_t HealthDevice::initialize() {
ReturnValue_t result = SystemObject::initialize();
if (result != HasReturnvaluesIF::RETURN_OK) {
if (result != returnvalue::OK) {
return result;
}
if (parentQueue != 0) {
@ -52,7 +52,7 @@ bool HealthDevice::hasHealthChanged() {
ReturnValue_t HealthDevice::setHealth(HealthState health) {
healthHelper.setHealth(health);
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
HasHealthIF::HealthState HealthDevice::getHealth() { return healthHelper.getHealth(); }