mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

updating code from Flying Laptop

Browse Source 
This is the framework of Flying Laptop OBSW version A.13.0.
This commit is contained in:
Ulrich Mohr
2018-07-12 16:29:32 +02:00
parent 1d22a6c97e
commit 575f70ba03
395 changed files with 12807 additions and 8404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
health/HealthHelper.cpp
View File

@ -1,6 +1,5 @@
#include <framework/ipc/MessageQueueSender.h>
#include <framework/health/HealthHelper.h>
#include <framework/ipc/MessageQueueSender.h>
#include <framework/ipc/MessageQueueSenderIF.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) :
healthTable(NULL), eventSender(NULL), objectId(objectId), parentQueue(
@ -67,11 +66,10 @@ void HealthHelper::informParent(HasHealthIF::HealthState health,
return;
}
CommandMessage message;
MessageQueueSender sender(parentQueue);
HealthMessage::setHealthMessage(&message, HealthMessage::HEALTH_INFO,
health, oldHealth);
if (sender.sendToDefault(&message, owner->getCommandQueue())
!= HasReturnvaluesIF::RETURN_OK) {
if (MessageQueueSenderIF::sendMessage(parentQueue, &message,
owner->getCommandQueue()) != HasReturnvaluesIF::RETURN_OK) {
debug << "HealthHelper::informParent: sending health reply failed."
<< std::endl;
}
@ -89,9 +87,8 @@ void HealthHelper::handleSetHealthCommand(CommandMessage* message) {
} else {
reply.setReplyRejected(result, message->getCommand());
}
MessageQueueSender sender(message->getSender());
if (sender.sendToDefault(&reply, owner->getCommandQueue())
!= HasReturnvaluesIF::RETURN_OK) {
if (MessageQueueSenderIF::sendMessage(message->getSender(), &reply,
owner->getCommandQueue()) != HasReturnvaluesIF::RETURN_OK) {
debug
<< "HealthHelper::handleHealthCommand: sending health reply failed."
<< std::endl;