Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR

2020-08-19 17:26:50 +02:00
parent 6b4fa0cc04 49d4b6ebc7
commit 5b4e49e966
386 changed files with 3147 additions and 1551 deletions
--- a/devicehandlers/AcceptsDeviceResponsesIF.h
+++ b/devicehandlers/AcceptsDeviceResponsesIF.h
@ -8,7 +8,7 @@
 #ifndef ACCEPTSDEVICERESPONSESIF_H_
 #define ACCEPTSDEVICERESPONSESIF_H_

-#include <framework/ipc/MessageQueueSenderIF.h>
+#include "../ipc/MessageQueueSenderIF.h"

 class AcceptsDeviceResponsesIF {
 public:
--- a/devicehandlers/AssemblyBase.cpp
+++ b/devicehandlers/AssemblyBase.cpp
@ -1,4 +1,4 @@
-#include <framework/devicehandlers/AssemblyBase.h>
+#include "AssemblyBase.h"

 AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
 		uint16_t commandQueueDepth) :
--- a/devicehandlers/AssemblyBase.h
+++ b/devicehandlers/AssemblyBase.h
@ -1,9 +1,9 @@
 #ifndef ASSEMBLYBASE_H_
 #define ASSEMBLYBASE_H_

-#include <framework/container/FixedArrayList.h>
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/subsystem/SubsystemBase.h>
+#include "../container/FixedArrayList.h"
+#include "DeviceHandlerBase.h"
+#include "../subsystem/SubsystemBase.h"

 class AssemblyBase: public SubsystemBase {
 public:
--- a/devicehandlers/ChildHandlerBase.cpp
+++ b/devicehandlers/ChildHandlerBase.cpp
@ -1,6 +1,6 @@
-#include <framework/subsystem/SubsystemBase.h>
-#include <framework/devicehandlers/ChildHandlerBase.h>
-#include <framework/subsystem/SubsystemBase.h>
+#include "../subsystem/SubsystemBase.h"
+#include "ChildHandlerBase.h"
+#include "../subsystem/SubsystemBase.h"

 ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
 		object_id_t deviceCommunication, CookieIF * comCookie,
--- a/devicehandlers/ChildHandlerBase.h
+++ b/devicehandlers/ChildHandlerBase.h
@ -1,8 +1,8 @@
 #ifndef PAYLOADHANDLERBASE_H_
 #define PAYLOADHANDLERBASE_H_

-#include <framework/devicehandlers/ChildHandlerFDIR.h>
-#include <framework/devicehandlers/DeviceHandlerBase.h>
+#include "ChildHandlerFDIR.h"
+#include "DeviceHandlerBase.h"

 class ChildHandlerBase: public DeviceHandlerBase {
 public:
--- a/devicehandlers/ChildHandlerFDIR.cpp
+++ b/devicehandlers/ChildHandlerFDIR.cpp
@ -1,4 +1,4 @@
-#include <framework/devicehandlers/ChildHandlerFDIR.h>
+#include "ChildHandlerFDIR.h"

 ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner, object_id_t faultTreeParent, uint32_t recoveryCount) :
 		DeviceHandlerFailureIsolation(owner, faultTreeParent) {
--- a/devicehandlers/ChildHandlerFDIR.h
+++ b/devicehandlers/ChildHandlerFDIR.h
@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_
 #define FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_

-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
+#include "DeviceHandlerFailureIsolation.h"

 /**
 * Very simple extension to normal FDIR.
--- a/devicehandlers/DeviceCommunicationIF.h
+++ b/devicehandlers/DeviceCommunicationIF.h
@ -1,8 +1,8 @@
 #ifndef DEVICECOMMUNICATIONIF_H_
 #define DEVICECOMMUNICATIONIF_H_

-#include <framework/devicehandlers/CookieIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "CookieIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
 #include <cstddef>
 /**
 * @defgroup interfaces Interfaces
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@ -1,16 +1,16 @@
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/objectmanager/ObjectManager.h>
-#include <framework/storagemanager/StorageManagerIF.h>
-#include <framework/thermal/ThermalComponentIF.h>
-#include <framework/devicehandlers/AcceptsDeviceResponsesIF.h>
+#include "DeviceHandlerBase.h"
+#include "../objectmanager/ObjectManager.h"
+#include "../storagemanager/StorageManagerIF.h"
+#include "../thermal/ThermalComponentIF.h"
+#include "AcceptsDeviceResponsesIF.h"

-#include <framework/datapool/DataSet.h>
-#include <framework/datapool/PoolVariable.h>
-#include <framework/devicehandlers/DeviceTmReportingWrapper.h>
-#include <framework/globalfunctions/CRC.h>
-#include <framework/subsystem/SubsystemBase.h>
-#include <framework/ipc/QueueFactory.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../datapool/DataSet.h"
+#include "../datapool/PoolVariable.h"
+#include "DeviceTmReportingWrapper.h"
+#include "../globalfunctions/CRC.h"
+#include "../subsystem/SubsystemBase.h"
+#include "../ipc/QueueFactory.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 #include <iomanip>

--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@ -1,22 +1,22 @@
 #ifndef DEVICEHANDLERBASE_H_
 #define DEVICEHANDLERBASE_H_

-#include <framework/objectmanager/SystemObject.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/devicehandlers/DeviceHandlerIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/action/HasActionsIF.h>
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/devicehandlers/DeviceCommunicationIF.h>
-#include <framework/modes/HasModesIF.h>
-#include <framework/power/PowerSwitchIF.h>
-#include <framework/ipc/MessageQueueIF.h>
+#include "../objectmanager/SystemObject.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "DeviceHandlerIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../action/HasActionsIF.h"
+#include "../datapool/PoolVariableIF.h"
+#include "DeviceCommunicationIF.h"
+#include "../modes/HasModesIF.h"
+#include "../power/PowerSwitchIF.h"
+#include "../ipc/MessageQueueIF.h"

-#include <framework/action/ActionHelper.h>
-#include <framework/health/HealthHelper.h>
-#include <framework/parameters/ParameterHelper.h>
-#include <framework/datapool/HkSwitchHelper.h>
-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
+#include "../action/ActionHelper.h"
+#include "../health/HealthHelper.h"
+#include "../parameters/ParameterHelper.h"
+#include "../datapool/HkSwitchHelper.h"
+#include "DeviceHandlerFailureIsolation.h"

 #include <map>

--- a/devicehandlers/DeviceHandlerFailureIsolation.cpp
+++ b/devicehandlers/DeviceHandlerFailureIsolation.cpp
@ -1,9 +1,9 @@
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
-#include <framework/health/HealthTableIF.h>
-#include <framework/power/Fuse.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/thermal/ThermalComponentIF.h>
+#include "DeviceHandlerBase.h"
+#include "DeviceHandlerFailureIsolation.h"
+#include "../health/HealthTableIF.h"
+#include "../power/Fuse.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../thermal/ThermalComponentIF.h"

 object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = 0;

--- a/devicehandlers/DeviceHandlerFailureIsolation.h
+++ b/devicehandlers/DeviceHandlerFailureIsolation.h
@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_
 #define FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_

-#include <framework/fdir/FaultCounter.h>
-#include <framework/fdir/FailureIsolationBase.h>
+#include "../fdir/FaultCounter.h"
+#include "../fdir/FailureIsolationBase.h"
 namespace Factory{
 void setStaticFrameworkObjectIds();
 }
--- a/devicehandlers/DeviceHandlerIF.h
+++ b/devicehandlers/DeviceHandlerIF.h
@ -1,11 +1,11 @@
 #ifndef DEVICEHANDLERIF_H_
 #define DEVICEHANDLERIF_H_

-#include <framework/action/HasActionsIF.h>
-#include <framework/devicehandlers/DeviceHandlerMessage.h>
-#include <framework/events/Event.h>
-#include <framework/modes/HasModesIF.h>
-#include <framework/ipc/MessageQueueSenderIF.h>
+#include "../action/HasActionsIF.h"
+#include "DeviceHandlerMessage.h"
+#include "../events/Event.h"
+#include "../modes/HasModesIF.h"
+#include "../ipc/MessageQueueSenderIF.h"

 /**
 * @brief 	This is the Interface used to communicate with a device handler.
--- a/devicehandlers/DeviceHandlerMessage.cpp
+++ b/devicehandlers/DeviceHandlerMessage.cpp
@ -1,6 +1,6 @@
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/devicehandlers/DeviceHandlerMessage.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
+#include "../objectmanager/ObjectManagerIF.h"
+#include "DeviceHandlerMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"

 DeviceHandlerMessage::DeviceHandlerMessage() {
 }
--- a/devicehandlers/DeviceHandlerMessage.h
+++ b/devicehandlers/DeviceHandlerMessage.h
@ -1,10 +1,10 @@
 #ifndef DEVICEHANDLERMESSAGE_H_
 #define DEVICEHANDLERMESSAGE_H_

-#include <framework/action/ActionMessage.h>
-#include <framework/ipc/CommandMessage.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/storagemanager/StorageManagerIF.h>
+#include "../action/ActionMessage.h"
+#include "../ipc/CommandMessage.h"
+#include "../objectmanager/SystemObjectIF.h"
+#include "../storagemanager/StorageManagerIF.h"
 //SHOULDDO: rework the static constructors to name the type of command they are building, maybe even hide setting the commandID.

 /**
--- a/devicehandlers/DeviceTmReportingWrapper.cpp
+++ b/devicehandlers/DeviceTmReportingWrapper.cpp
@ -1,6 +1,6 @@
-#include <framework/serialize/SerializeAdapter.h>
-#include <framework/devicehandlers/DeviceTmReportingWrapper.h>
-#include <framework/serialize/SerializeAdapter.h>
+#include "../serialize/SerializeAdapter.h"
+#include "DeviceTmReportingWrapper.h"
+#include "../serialize/SerializeAdapter.h"

 DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
 		ActionId_t actionId, SerializeIF* data) :
--- a/devicehandlers/DeviceTmReportingWrapper.h
+++ b/devicehandlers/DeviceTmReportingWrapper.h
@ -1,9 +1,9 @@
 #ifndef DEVICETMREPORTINGWRAPPER_H_
 #define DEVICETMREPORTINGWRAPPER_H_

-#include <framework/action/HasActionsIF.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/serialize/SerializeIF.h>
+#include "../action/HasActionsIF.h"
+#include "../objectmanager/SystemObjectIF.h"
+#include "../serialize/SerializeIF.h"

 class DeviceTmReportingWrapper: public SerializeIF {
 public:
--- a/devicehandlers/FixedSequenceSlot.cpp
+++ b/devicehandlers/FixedSequenceSlot.cpp
@ -5,8 +5,8 @@
 * @author	baetz
 */

-#include <framework/devicehandlers/FixedSequenceSlot.h>
-#include <framework/objectmanager/SystemObjectIF.h>
+#include "FixedSequenceSlot.h"
+#include "../objectmanager/SystemObjectIF.h"
 #include <cstddef>

 FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,
--- a/devicehandlers/FixedSequenceSlot.h
+++ b/devicehandlers/FixedSequenceSlot.h
@ -8,8 +8,8 @@
 #ifndef FIXEDSEQUENCESLOT_H_
 #define FIXEDSEQUENCESLOT_H_

-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/tasks/ExecutableObjectIF.h>
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../tasks/ExecutableObjectIF.h"
 class PeriodicTaskIF;

 /**
--- a/devicehandlers/FixedSlotSequence.cpp
+++ b/devicehandlers/FixedSlotSequence.cpp
@ -1,5 +1,5 @@
-#include <framework/devicehandlers/FixedSlotSequence.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "FixedSlotSequence.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
 		lengthMs(setLengthMs) {
--- a/devicehandlers/FixedSlotSequence.h
+++ b/devicehandlers/FixedSlotSequence.h
@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
 #define FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_

-#include <framework/devicehandlers/FixedSequenceSlot.h>
-#include <framework/objectmanager/SystemObject.h>
+#include "FixedSequenceSlot.h"
+#include "../objectmanager/SystemObject.h"
 #include <set>

 /**
--- a/devicehandlers/HealthDevice.cpp
+++ b/devicehandlers/HealthDevice.cpp
@ -1,5 +1,5 @@
-#include <framework/devicehandlers/HealthDevice.h>
-#include <framework/ipc/QueueFactory.h>
+#include "HealthDevice.h"
+#include "../ipc/QueueFactory.h"

 HealthDevice::HealthDevice(object_id_t setObjectId,
 		MessageQueueId_t parentQueue) :
--- a/devicehandlers/HealthDevice.h
+++ b/devicehandlers/HealthDevice.h
@ -1,11 +1,11 @@
 #ifndef HEALTHDEVICE_H_
 #define HEALTHDEVICE_H_

-#include <framework/health/HasHealthIF.h>
-#include <framework/health/HealthHelper.h>
-#include <framework/objectmanager/SystemObject.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/ipc/MessageQueueIF.h>
+#include "../health/HasHealthIF.h"
+#include "../health/HealthHelper.h"
+#include "../objectmanager/SystemObject.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "../ipc/MessageQueueIF.h"

 class HealthDevice: public SystemObject,
 		public ExecutableObjectIF,