Merge remote-tracking branch 'upstream/master' into mueller_MessageNamespaceRenamed
This commit is contained in:
@ -8,10 +8,10 @@
|
||||
#ifndef HASMODESIF_H_
|
||||
#define HASMODESIF_H_
|
||||
|
||||
#include <framework/events/Event.h>
|
||||
#include <framework/modes/ModeHelper.h>
|
||||
#include <framework/modes/ModeMessage.h>
|
||||
#include <framework/returnvalues/HasReturnvaluesIF.h>
|
||||
#include "../events/Event.h"
|
||||
#include "ModeHelper.h"
|
||||
#include "ModeMessage.h"
|
||||
#include "../returnvalues/HasReturnvaluesIF.h"
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <framework/modes/HasModesIF.h>
|
||||
#include <framework/modes/ModeHelper.h>
|
||||
#include <framework/ipc/MessageQueueSenderIF.h>
|
||||
#include "HasModesIF.h"
|
||||
#include "ModeHelper.h"
|
||||
#include "../ipc/MessageQueueSenderIF.h"
|
||||
|
||||
ModeHelper::ModeHelper(HasModesIF *owner) :
|
||||
theOneWhoCommandedAMode(0), commandedMode(HasModesIF::MODE_OFF), commandedSubmode(
|
||||
|
@ -1,9 +1,9 @@
|
||||
#ifndef MODEHELPER_H_
|
||||
#define MODEHELPER_H_
|
||||
|
||||
#include <framework/modes/ModeMessage.h>
|
||||
#include <framework/returnvalues/HasReturnvaluesIF.h>
|
||||
#include <framework/timemanager/Countdown.h>
|
||||
#include "ModeMessage.h"
|
||||
#include "../returnvalues/HasReturnvaluesIF.h"
|
||||
#include "../timemanager/Countdown.h"
|
||||
|
||||
class HasModesIF;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include <framework/modes/ModeMessage.h>
|
||||
#include "ModeMessage.h"
|
||||
|
||||
Mode_t ModeMessage::getMode(const CommandMessage* message) {
|
||||
return message->getParameter();
|
||||
|
@ -8,7 +8,7 @@
|
||||
#ifndef MODEMESSAGE_H_
|
||||
#define MODEMESSAGE_H_
|
||||
|
||||
#include <framework/ipc/CommandMessage.h>
|
||||
#include "../ipc/CommandMessage.h"
|
||||
|
||||
typedef uint32_t Mode_t;
|
||||
typedef uint8_t Submode_t;
|
||||
|
Reference in New Issue
Block a user