Clarified some debug messages

action/ActionHelper.cpp

@@ -1,9 +1,9 @@
 #include <framework/action/ActionHelper.h>
 #include <framework/action/HasActionsIF.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
-
 ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) :
-		owner(setOwner), queueToUse(useThisQueue), ipcStore(nullptr) {
+		owner(setOwner), queueToUse(useThisQueue), ipcStore(
+				NULL) {
 }
 
 ActionHelper::~ActionHelper() {
@@ -16,18 +16,16 @@ ReturnValue_t ActionHelper::handleActionMessage(CommandMessage* command) {
 				ActionMessage::getStoreId(command));
 		return HasReturnvaluesIF::RETURN_OK;
 	} else {
-		return CommandMessage::UNKNOWN_COMMAND;
+		return CommandMessage::UNKNOW_COMMAND;
 	}
 }
 
 ReturnValue_t ActionHelper::initialize(MessageQueueIF* queueToUse_) {
 	ipcStore = objectManager->get<StorageManagerIF>(objects::IPC_STORE);
-	if (ipcStore == nullptr) {
+	if (ipcStore == NULL) {
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
-	if(queueToUse_ != nullptr) {
+	setQueueToUse(queueToUse_);
-		setQueueToUse(queueToUse_);
-	}
 
 	return HasReturnvaluesIF::RETURN_OK;
 }
@@ -69,23 +67,22 @@ void ActionHelper::prepareExecution(MessageQueueId_t commandedBy, ActionId_t act
 	}
 }
 
-ReturnValue_t ActionHelper::reportData(MessageQueueId_t reportTo,
+ReturnValue_t ActionHelper::reportData(MessageQueueId_t reportTo, ActionId_t replyId, SerializeIF* data, bool hideSender) {
-		ActionId_t replyId, SerializeIF* data, bool hideSender) {
 	CommandMessage reply;
 	store_address_t storeAddress;
 	uint8_t *dataPtr;
-	size_t maxSize = data->getSerializedSize();
+	uint32_t maxSize = data->getSerializedSize();
 	if (maxSize == 0) {
 		//No error, there's simply nothing to report.
 		return HasReturnvaluesIF::RETURN_OK;
 	}
-	size_t size = 0;
+	uint32_t size = 0;
 	ReturnValue_t result = ipcStore->getFreeElement(&storeAddress, maxSize,
 			&dataPtr);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = data->serialize(&dataPtr, &size, maxSize, SerializeIF::Endianness::BIG);
+	result = data->serialize(&dataPtr, &size, maxSize, true);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		ipcStore->deleteData(storeAddress);
 		return result;

action/ActionHelper.h

@@ -35,10 +35,10 @@ public:
 	ReturnValue_t handleActionMessage(CommandMessage* command);
 	/**
 	 * Helper initialize function. Must be called before use of any other helper function
-	 * @param queueToUse_ Pointer to the messageQueue to be used, optional if queue was set in constructor
+	 * @param queueToUse_ Pointer to the messageQueue to be used
 	 * @return Returns RETURN_OK if successful
 	 */
-	ReturnValue_t initialize(MessageQueueIF* queueToUse_ = nullptr);
+	ReturnValue_t initialize(MessageQueueIF* queueToUse_);
 	/**
 	 * Function to be called from the owner to send a step message. Success or failure will be determined by the result value.
 	 *

action/CommandActionHelper.cpp

@@ -4,31 +4,30 @@
 #include <framework/action/HasActionsIF.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
 
-CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
+CommandActionHelper::CommandActionHelper(CommandsActionsIF* setOwner) :
 		owner(setOwner), queueToUse(NULL), ipcStore(
-		NULL), commandCount(0), lastTarget(0) {
+				NULL), commandCount(0), lastTarget(0) {
 }
 
 CommandActionHelper::~CommandActionHelper() {
 }
 
 ReturnValue_t CommandActionHelper::commandAction(object_id_t commandTo,
-		ActionId_t actionId, SerializeIF *data) {
+		ActionId_t actionId, SerializeIF* data) {
-	HasActionsIF *receiver = objectManager->get<HasActionsIF>(commandTo);
+	HasActionsIF* receiver = objectManager->get<HasActionsIF>(commandTo);
 	if (receiver == NULL) {
 		return CommandsActionsIF::OBJECT_HAS_NO_FUNCTIONS;
 	}
 	store_address_t storeId;
-	uint8_t *storePointer;
+	uint8_t* storePointer;
-	size_t maxSize = data->getSerializedSize();
+	uint32_t maxSize = data->getSerializedSize();
 	ReturnValue_t result = ipcStore->getFreeElement(&storeId, maxSize,
 			&storePointer);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	size_t size = 0;
+	uint32_t size = 0;
-	result = data->serialize(&storePointer, &size, maxSize,
+	result = data->serialize(&storePointer, &size, maxSize, true);
-			SerializeIF::Endianness::BIG);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -36,11 +35,11 @@ ReturnValue_t CommandActionHelper::commandAction(object_id_t commandTo,
 }
 
 ReturnValue_t CommandActionHelper::commandAction(object_id_t commandTo,
-		ActionId_t actionId, const uint8_t *data, uint32_t size) {
+		ActionId_t actionId, const uint8_t* data, uint32_t size) {
 //	if (commandCount != 0) {
 //		return CommandsFunctionsIF::ALREADY_COMMANDING;
 //	}
-	HasActionsIF *receiver = objectManager->get<HasActionsIF>(commandTo);
+	HasActionsIF* receiver = objectManager->get<HasActionsIF>(commandTo);
 	if (receiver == NULL) {
 		return CommandsActionsIF::OBJECT_HAS_NO_FUNCTIONS;
 	}
@@ -72,13 +71,13 @@ ReturnValue_t CommandActionHelper::initialize() {
 	}
 
 	queueToUse = owner->getCommandQueuePtr();
-	if (queueToUse == NULL) {
+	if(queueToUse == NULL){
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-ReturnValue_t CommandActionHelper::handleReply(CommandMessage *reply) {
+ReturnValue_t CommandActionHelper::handleReply(CommandMessage* reply) {
 	if (reply->getSender() != lastTarget) {
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
@@ -89,8 +88,7 @@ ReturnValue_t CommandActionHelper::handleReply(CommandMessage *reply) {
 		return HasReturnvaluesIF::RETURN_OK;
 	case ActionMessage::COMPLETION_FAILED:
 		commandCount--;
-		owner->completionFailedReceived(ActionMessage::getActionId(reply),
+		owner->completionFailedReceived(ActionMessage::getActionId(reply), ActionMessage::getReturnCode(reply));
-				ActionMessage::getReturnCode(reply));
 		return HasReturnvaluesIF::RETURN_OK;
 	case ActionMessage::STEP_SUCCESS:
 		owner->stepSuccessfulReceived(ActionMessage::getActionId(reply),
@@ -98,13 +96,11 @@ ReturnValue_t CommandActionHelper::handleReply(CommandMessage *reply) {
 		return HasReturnvaluesIF::RETURN_OK;
 	case ActionMessage::STEP_FAILED:
 		commandCount--;
-		owner->stepFailedReceived(ActionMessage::getActionId(reply),
+		owner->stepFailedReceived(ActionMessage::getActionId(reply), ActionMessage::getStep(reply),
-				ActionMessage::getStep(reply),
 				ActionMessage::getReturnCode(reply));
 		return HasReturnvaluesIF::RETURN_OK;
 	case ActionMessage::DATA_REPLY:
-		extractDataForOwner(ActionMessage::getActionId(reply),
+		extractDataForOwner(ActionMessage::getActionId(reply), ActionMessage::getStoreId(reply));
-				ActionMessage::getStoreId(reply));
 		return HasReturnvaluesIF::RETURN_OK;
 	default:
 		return HasReturnvaluesIF::RETURN_FAILED;

action/HasActionsIF.h

@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_ACTION_HASACTIONSIF_H_
+#ifndef HASACTIONSIF_H_
-#define FRAMEWORK_ACTION_HASACTIONSIF_H_
+#define HASACTIONSIF_H_
 
 #include <framework/action/ActionHelper.h>
 #include <framework/action/ActionMessage.h>
@@ -7,35 +7,27 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/ipc/MessageQueueIF.h>
 /**
- * @brief
+ * \brief Interface for component which uses actions
- * Interface for component which uses actions
  *
- * @details
+ * This interface is used to execute actions in the component. Actions, in the sense of this interface, are activities with a well-defined beginning and
- * This interface is used to execute actions in the component. Actions, in the
+ * end in time. They may adjust sub-states of components, but are not supposed to change
- * sense of this interface, are activities with a well-defined beginning and
+ * the main mode of operation, which is handled with the HasModesIF described below.
- * end in time. They may adjust sub-states of components, but are not supposed
- * to change the main mode of operation, which is handled with the HasModesIF
- * described below.
  *
- * The HasActionsIF allows components to define such actions and make them
+ * The HasActionsIF allows components to define such actions and make them available
- * available for other components to use. Implementing the interface is
+ * for other components to use. Implementing the interface is straightforward: There’s a
- * straightforward: There’s a single executeAction call, which provides an
+ * single executeAction call, which provides an identifier for the action to execute, as well
- * identifier for the action to execute, as well as arbitrary parameters for
+ * as arbitrary parameters for input. Aside from direct, software-based
- * input.
+ * actions, it is used in device handler components as an interface to forward commands to
- * Aside from direct, software-based actions, it is used in device handler
+ * devices.
- * components as an interface to forward commands to devices.
+ * Implementing components of the interface are supposed to check identifier (ID) and
- * Implementing components of the interface are supposed to check identifier
+ * parameters and immediately start execution of the action. It is, however, not required to
- * (ID) and parameters and immediately start execution of the action.
+ * immediately finish execution. Instead, this may be deferred to a later point in time, at
- * It is, however, not required to immediately finish execution.
+ * which the component needs to inform the caller about finished or failed execution.
- * Instead, this may be deferred to a later point in time, at which the
- * component needs to inform the caller about finished or failed execution.
- *
- * @ingroup interfaces
  */
 class HasActionsIF {
 public:
 	static const uint8_t INTERFACE_ID = CLASS_ID::HAS_ACTIONS_IF;
-	static const ReturnValue_t IS_BUSY = MAKE_RETURN_CODE(1);
+	static const ReturnValue_t IS_BUSY = MAKE_RETURN_CODE(1);//!<
 	static const ReturnValue_t INVALID_PARAMETERS = MAKE_RETURN_CODE(2);
 	static const ReturnValue_t EXECUTION_FINISHED = MAKE_RETURN_CODE(3);
 	static const ReturnValue_t INVALID_ACTION_ID = MAKE_RETURN_CODE(4);
@@ -47,14 +39,12 @@ public:
 	virtual MessageQueueId_t getCommandQueue() const = 0;
 	/**
 	 * Execute or initialize the execution of a certain function.
-	 * Returning #EXECUTION_FINISHED or a failure code, nothing else needs to
+	 * Returning #EXECUTION_FINISHED or a failure code, nothing else needs to be done.
-	 * be done. When needing more steps, return RETURN_OK and issue steps and
+	 * When needing more steps, return RETURN_OK and issue steps and completion manually. One "step failed" or completion report must
-	 * completion manually.
+	 * be issued!
-	 * One "step failed" or completion report must be issued!
 	 */
-	virtual ReturnValue_t executeAction(ActionId_t actionId,
+	virtual ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, const uint8_t* data, uint32_t size) = 0;
-			MessageQueueId_t commandedBy, const uint8_t* data, size_t size) = 0;
 };
 
 
-#endif /* FRAMEWORK_ACTION_HASACTIONSIF_H_ */
+#endif /* HASACTIONSIF_H_ */

container/FixedMap.h

@@ -148,47 +148,47 @@ public:
 		return theMap.maxSize();
 	}
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
-		ReturnValue_t result = SerializeAdapter::serialize(&this->_size,
+		ReturnValue_t result = SerializeAdapter<uint32_t>::serialize(&this->_size,
-				buffer, size, maxSize, streamEndianness);
+				buffer, size, max_size, bigEndian);
 		uint32_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < this->_size)) {
-			result = SerializeAdapter::serialize(&theMap[i].first, buffer,
+			result = SerializeAdapter<key_t>::serialize(&theMap[i].first, buffer,
-					size, maxSize, streamEndianness);
+					size, max_size, bigEndian);
-			result = SerializeAdapter::serialize(&theMap[i].second, buffer, size,
+			result = SerializeAdapter<T>::serialize(&theMap[i].second, buffer, size,
-					maxSize, streamEndianness);
+					max_size, bigEndian);
 			++i;
 		}
 		return result;
 	}
 
-	virtual size_t getSerializedSize() const {
+	virtual uint32_t getSerializedSize() const {
 		uint32_t printSize = sizeof(_size);
 		uint32_t i = 0;
 
 		for (i = 0; i < _size; ++i) {
-			printSize += SerializeAdapter::getSerializedSize(
+			printSize += SerializeAdapter<key_t>::getSerializedSize(
 					&theMap[i].first);
-			printSize += SerializeAdapter::getSerializedSize(&theMap[i].second);
+			printSize += SerializeAdapter<T>::getSerializedSize(&theMap[i].second);
 		}
 
 		return printSize;
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
-		ReturnValue_t result = SerializeAdapter::deSerialize(&this->_size,
+		ReturnValue_t result = SerializeAdapter<uint32_t>::deSerialize(&this->_size,
-				buffer, size, streamEndianness);
+				buffer, size, bigEndian);
 		if (this->_size > theMap.maxSize()) {
 			return SerializeIF::TOO_MANY_ELEMENTS;
 		}
 		uint32_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < this->_size)) {
-			result = SerializeAdapter::deSerialize(&theMap[i].first, buffer,
+			result = SerializeAdapter<key_t>::deSerialize(&theMap[i].first, buffer,
-					size, streamEndianness);
+					size, bigEndian);
-			result = SerializeAdapter::deSerialize(&theMap[i].second, buffer, size,
+			result = SerializeAdapter<T>::deSerialize(&theMap[i].second, buffer, size,
-					streamEndianness);
+					bigEndian);
 			++i;
 		}
 		return result;

container/HybridIterator.h

@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_
+#ifndef HYBRIDITERATOR_H_
-#define FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_
+#define HYBRIDITERATOR_H_
 
 #include <framework/container/ArrayList.h>
 #include <framework/container/SinglyLinkedList.h>
@@ -8,32 +8,34 @@ template<typename T, typename count_t = uint8_t>
 class HybridIterator: public LinkedElement<T>::Iterator,
 		public ArrayList<T, count_t>::Iterator {
 public:
-	HybridIterator() {}
+	HybridIterator() :
+			value(NULL), linked(NULL), end(NULL) {
+	}
 
 	HybridIterator(typename LinkedElement<T>::Iterator *iter) :
-		LinkedElement<T>::Iterator(*iter), value(iter->value),
+		LinkedElement<T>::Iterator(*iter), value(
-		linked(true) {
+					iter->value), linked(true), end(NULL) {
 
 	}
 
 	HybridIterator(LinkedElement<T> *start) :
-		LinkedElement<T>::Iterator(start), value(start->value),
+		LinkedElement<T>::Iterator(start), value(
-		linked(true) {
+					start->value), linked(true), end(NULL) {
 
 	}
 
 	HybridIterator(typename ArrayList<T, count_t>::Iterator start,
 			typename ArrayList<T, count_t>::Iterator end) :
-			ArrayList<T, count_t>::Iterator(start), value(start.value),
+			ArrayList<T, count_t>::Iterator(start), value(start.value), linked(
-			linked(false), end(end.value) {
+					false), end(end.value) {
 		if (value == this->end) {
 			value = NULL;
 		}
 	}
 
 	HybridIterator(T *firstElement, T *lastElement) :
-			ArrayList<T, count_t>::Iterator(firstElement), value(firstElement),
+			ArrayList<T, count_t>::Iterator(firstElement), value(firstElement), linked(
-			linked(false), end(++lastElement) {
+					false), end(++lastElement) {
 		if (value == end) {
 			value = NULL;
 		}
@@ -42,17 +44,17 @@ public:
 	HybridIterator& operator++() {
 		if (linked) {
 			LinkedElement<T>::Iterator::operator++();
-			if (LinkedElement<T>::Iterator::value != nullptr) {
+			if (LinkedElement<T>::Iterator::value != NULL) {
 				value = LinkedElement<T>::Iterator::value->value;
 			} else {
-				value = nullptr;
+				value = NULL;
 			}
 		} else {
 			ArrayList<T, count_t>::Iterator::operator++();
 			value = ArrayList<T, count_t>::Iterator::value;
 
 			if (value == end) {
-				value = nullptr;
+				value = NULL;
 			}
 		}
 		return *this;
@@ -64,11 +66,11 @@ public:
 		return tmp;
 	}
 
-	bool operator==(const HybridIterator& other) const {
+	bool operator==(HybridIterator other) {
-		return value == other.value;
+		return value == other->value;
 	}
 
-	bool operator!=(const HybridIterator& other) const {
+	bool operator!=(HybridIterator other) {
 		return !(*this == other);
 	}
 
@@ -80,11 +82,11 @@ public:
 		return value;
 	}
 
-	T* value = nullptr;
+	T* value;
 
 private:
-	bool linked = false;
+	bool linked;
-	T *end = nullptr;
+	T *end;
 };
 
-#endif /* FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_ */
+#endif /* HYBRIDITERATOR_H_ */

container/IndexedRingMemoryArray.h

@@ -68,50 +68,50 @@ public:
 		return this->storedPackets;
 	}
 
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-				size_t maxSize, Endianness streamEndianness) const {
+				const uint32_t max_size, bool bigEndian) const {
-		ReturnValue_t result = SerializeAdapter::serialize(&blockStartAddress,buffer,size,maxSize,streamEndianness);
+		ReturnValue_t result = AutoSerializeAdapter::serialize(&blockStartAddress,buffer,size,max_size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = indexType.serialize(buffer,size,maxSize,streamEndianness);
+		result = indexType.serialize(buffer,size,max_size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = SerializeAdapter::serialize(&this->size,buffer,size,maxSize,streamEndianness);
+		result = AutoSerializeAdapter::serialize(&this->size,buffer,size,max_size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = SerializeAdapter::serialize(&this->storedPackets,buffer,size,maxSize,streamEndianness);
+		result = AutoSerializeAdapter::serialize(&this->storedPackets,buffer,size,max_size,bigEndian);
 		return result;
 	}
 
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-				Endianness streamEndianness){
+				bool bigEndian){
-		ReturnValue_t result = SerializeAdapter::deSerialize(&blockStartAddress,buffer,size,streamEndianness);
+		ReturnValue_t result = AutoSerializeAdapter::deSerialize(&blockStartAddress,buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = indexType.deSerialize(buffer,size,streamEndianness);
+		result = indexType.deSerialize(buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&this->size,buffer,size,streamEndianness);
+		result = AutoSerializeAdapter::deSerialize(&this->size,buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&this->storedPackets,buffer,size,streamEndianness);
+		result = AutoSerializeAdapter::deSerialize(&this->storedPackets,buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
 		return result;
 	}
 
-	size_t getSerializedSize() const {
+	uint32_t getSerializedSize() const {
-		uint32_t size = SerializeAdapter::getSerializedSize(&blockStartAddress);
+		uint32_t size = AutoSerializeAdapter::getSerializedSize(&blockStartAddress);
 		size += indexType.getSerializedSize();
-		size += SerializeAdapter::getSerializedSize(&this->size);
+		size += AutoSerializeAdapter::getSerializedSize(&this->size);
-		size += SerializeAdapter::getSerializedSize(&this->storedPackets);
+		size += AutoSerializeAdapter::getSerializedSize(&this->storedPackets);
 		return size;
 	}
 
@@ -485,37 +485,37 @@ public:
 	 * Parameters according to HasSerializeIF
 	 * @param buffer
 	 * @param size
-	 * @param maxSize
+	 * @param max_size
-	 * @param streamEndianness
+	 * @param bigEndian
 	 * @return
 	 */
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-				size_t maxSize, Endianness streamEndianness) const{
+				const uint32_t max_size, bool bigEndian) const{
 		uint8_t* crcBuffer = *buffer;
 		uint32_t oldSize = *size;
 		if(additionalInfo!=NULL){
-			additionalInfo->serialize(buffer,size,maxSize,streamEndianness);
+			additionalInfo->serialize(buffer,size,max_size,bigEndian);
 		}
-		ReturnValue_t result = currentWriteBlock->serialize(buffer,size,maxSize,streamEndianness);
+		ReturnValue_t result = currentWriteBlock->serialize(buffer,size,max_size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 					return result;
 		}
-		result = SerializeAdapter::serialize(&this->size,buffer,size,maxSize,streamEndianness);
+		result = AutoSerializeAdapter::serialize(&this->size,buffer,size,max_size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 					return result;
 		}
 
 		uint32_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < this->size)) {
-			result = SerializeAdapter::serialize(&this->entries[i], buffer, size,
+			result = SerializeAdapter<Index<T> >::serialize(&this->entries[i], buffer, size,
-					maxSize, streamEndianness);
+					max_size, bigEndian);
 			++i;
 		}
 		if(result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
 		uint16_t crc = Calculate_CRC(crcBuffer,(*size-oldSize));
-		result = SerializeAdapter::serialize(&crc,buffer,size,maxSize,streamEndianness);
+		result = AutoSerializeAdapter::serialize(&crc,buffer,size,max_size,bigEndian);
 		return result;
 	}
 
@@ -524,17 +524,17 @@ public:
 	 * Get the serialized Size of the index
 	 * @return The serialized size of the index
 	 */
-	size_t getSerializedSize() const {
+	uint32_t getSerializedSize() const {
 
 		uint32_t size = 0;
 		if(additionalInfo!=NULL){
 			size += additionalInfo->getSerializedSize();
 		}
 		size += currentWriteBlock->getSerializedSize();
-		size += SerializeAdapter::getSerializedSize(&this->size);
+		size += AutoSerializeAdapter::getSerializedSize(&this->size);
 		size += (this->entries[0].getSerializedSize()) * this->size;
 		uint16_t crc = 0;
-		size += SerializeAdapter::getSerializedSize(&crc);
+		size += AutoSerializeAdapter::getSerializedSize(&crc);
 		return size;
 	}
 	/**
@@ -542,28 +542,28 @@ public:
 	 * CRC Has to be checked before!
 	 * @param buffer
 	 * @param size
-	 * @param streamEndianness
+	 * @param bigEndian
 	 * @return
 	 */
 
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-				Endianness streamEndianness){
+				bool bigEndian){
 
 		ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 		if(additionalInfo!=NULL){
-			result = additionalInfo->deSerialize(buffer,size,streamEndianness);
+			result = additionalInfo->deSerialize(buffer,size,bigEndian);
 		}
 		if(result != HasReturnvaluesIF::RETURN_OK){
 					return result;
 		}
 
 		Index<T> tempIndex;
-		result = tempIndex.deSerialize(buffer,size,streamEndianness);
+		result = tempIndex.deSerialize(buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 					return result;
 		}
 		uint32_t tempSize = 0;
-		result = SerializeAdapter::deSerialize(&tempSize,buffer,size,streamEndianness);
+		result = AutoSerializeAdapter::deSerialize(&tempSize,buffer,size,bigEndian);
 		if(result != HasReturnvaluesIF::RETURN_OK){
 					return result;
 		}
@@ -572,9 +572,9 @@ public:
 		}
 		uint32_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < this->size)) {
-			result = SerializeAdapter::deSerialize(
+			result = SerializeAdapter<Index<T> >::deSerialize(
 					&this->entries[i], buffer, size,
-					streamEndianness);
+					bigEndian);
 			++i;
 		}
 		if(result != HasReturnvaluesIF::RETURN_OK){

datapool/DataPool.cpp

@@ -39,10 +39,10 @@ PoolEntryIF* DataPool::getRawData( uint32_t data_pool_id ) {
 	}
 }
 
-//uint8_t DataPool::getRawData( uint32_t data_pool_id, uint8_t* address, uint16_t* size, uint32_t maxSize ) {
+//uint8_t DataPool::getRawData( uint32_t data_pool_id, uint8_t* address, uint16_t* size, uint32_t max_size ) {
 //	std::map<uint32_t, PoolEntryIF*>::iterator it = this->data_pool.find( data_pool_id );
 //	if ( it != this->data_pool.end() ) {
-//		if ( it->second->getByteSize() <= maxSize ) {
+//		if ( it->second->getByteSize() <= max_size ) {
 //			*size = it->second->getByteSize();
 //			memcpy( address, it->second->getRawData(), *size );
 //			return DP_SUCCESSFUL;

datapool/DataPoolAdmin.cpp

@@ -26,7 +26,7 @@ MessageQueueId_t DataPoolAdmin::getCommandQueue() const {
 }
 
 ReturnValue_t DataPoolAdmin::executeAction(ActionId_t actionId,
-		MessageQueueId_t commandedBy, const uint8_t* data, size_t size) {
+		MessageQueueId_t commandedBy, const uint8_t* data, uint32_t size) {
 	if (actionId != SET_VALIDITY) {
 		return INVALID_ACTION_ID;
 	}
@@ -91,7 +91,7 @@ void DataPoolAdmin::handleCommand() {
 }
 
 ReturnValue_t DataPoolAdmin::handleMemoryLoad(uint32_t address,
-		const uint8_t* data, size_t size, uint8_t** dataPointer) {
+		const uint8_t* data, uint32_t size, uint8_t** dataPointer) {
 	uint32_t poolId = ::dataPool.PIDToDataPoolId(address);
 	uint8_t arrayIndex = ::dataPool.PIDToArrayIndex(address);
 	DataSet testSet;
@@ -129,7 +129,7 @@ ReturnValue_t DataPoolAdmin::handleMemoryLoad(uint32_t address,
 	return ACTIVITY_COMPLETED;
 }
 
-ReturnValue_t DataPoolAdmin::handleMemoryDump(uint32_t address, size_t size,
+ReturnValue_t DataPoolAdmin::handleMemoryDump(uint32_t address, uint32_t size,
 		uint8_t** dataPointer, uint8_t* copyHere) {
 	uint32_t poolId = ::dataPool.PIDToDataPoolId(address);
 	uint8_t arrayIndex = ::dataPool.PIDToArrayIndex(address);
@@ -151,7 +151,7 @@ ReturnValue_t DataPoolAdmin::handleMemoryDump(uint32_t address, size_t size,
 				PoolVariableIF::VAR_READ);
 		status = rawSet.read();
 		if (status == RETURN_OK) {
-			size_t temp = 0;
+			uint32_t temp = 0;
 			status = variable.getEntryEndianSafe(ptrToCopy, &temp, size);
 			if (status != RETURN_OK) {
 				return RETURN_FAILED;
@@ -261,7 +261,7 @@ ReturnValue_t DataPoolAdmin::handleParameterCommand(CommandMessage* command) {
 //identical to ParameterHelper::sendParameter()
 ReturnValue_t DataPoolAdmin::sendParameter(MessageQueueId_t to, uint32_t id,
 		const DataPoolParameterWrapper* wrapper) {
-	size_t serializedSize = wrapper->getSerializedSize();
+	uint32_t serializedSize = wrapper->getSerializedSize();
 
 	uint8_t *storeElement;
 	store_address_t address;
@@ -272,10 +272,10 @@ ReturnValue_t DataPoolAdmin::sendParameter(MessageQueueId_t to, uint32_t id,
 		return result;
 	}
 
-	size_t storeElementSize = 0;
+	uint32_t storeElementSize = 0;
 
 	result = wrapper->serialize(&storeElement, &storeElementSize,
-			serializedSize, SerializeIF::Endianness::BIG);
+			serializedSize, true);
 
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		storage->deleteData(address);

datapool/DataPoolAdmin.h

@@ -29,12 +29,12 @@ public:
 	MessageQueueId_t getCommandQueue() const;
 
 	ReturnValue_t handleMemoryLoad(uint32_t address, const uint8_t* data,
-			size_t size, uint8_t** dataPointer);
+			uint32_t size, uint8_t** dataPointer);
-	ReturnValue_t handleMemoryDump(uint32_t address, size_t size,
+	ReturnValue_t handleMemoryDump(uint32_t address, uint32_t size,
 			uint8_t** dataPointer, uint8_t* copyHere);
 
 	ReturnValue_t executeAction(ActionId_t actionId,
-			MessageQueueId_t commandedBy, const uint8_t* data, size_t size);
+			MessageQueueId_t commandedBy, const uint8_t* data, uint32_t size);
 
 	//not implemented as ParameterHelper is no used
 	ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId,

datapool/DataPoolParameterWrapper.cpp

@@ -36,22 +36,22 @@ ReturnValue_t DataPoolParameterWrapper::set(uint8_t domainId,
 }
 
 ReturnValue_t DataPoolParameterWrapper::serialize(uint8_t** buffer,
-		size_t* size, size_t maxSize, Endianness streamEndianness) const {
+		uint32_t* size, const uint32_t max_size, bool bigEndian) const {
 	ReturnValue_t result;
 
-	result = SerializeAdapter::serialize(&type, buffer, size, maxSize,
+	result = SerializeAdapter<Type>::serialize(&type, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	result = SerializeAdapter::serialize(&columns, buffer, size,
+	result = SerializeAdapter<uint8_t>::serialize(&columns, buffer, size,
-			maxSize, streamEndianness);
+			max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::serialize(&rows, buffer, size, maxSize,
+	result = SerializeAdapter<uint8_t>::serialize(&rows, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -60,7 +60,7 @@ ReturnValue_t DataPoolParameterWrapper::serialize(uint8_t** buffer,
 		DataSet mySet;
 		PoolRawAccess raw(poolId, index, &mySet,PoolVariableIF::VAR_READ);
 		mySet.read();
-		result = raw.serialize(buffer,size,maxSize,streamEndianness);
+		result = raw.serialize(buffer,size,max_size,bigEndian);
 		if (result != HasReturnvaluesIF::RETURN_OK){
 			return result;
 		}
@@ -69,8 +69,8 @@ ReturnValue_t DataPoolParameterWrapper::serialize(uint8_t** buffer,
 }
 
 //same as ParameterWrapper
-size_t DataPoolParameterWrapper::getSerializedSize() const {
+uint32_t DataPoolParameterWrapper::getSerializedSize() const {
-	size_t serializedSize = 0;
+	uint32_t serializedSize = 0;
 	serializedSize += type.getSerializedSize();
 	serializedSize += sizeof(rows);
 	serializedSize += sizeof(columns);
@@ -80,7 +80,7 @@ size_t DataPoolParameterWrapper::getSerializedSize() const {
 }
 
 ReturnValue_t DataPoolParameterWrapper::deSerialize(const uint8_t** buffer,
-		size_t* size, Endianness streamEndianness) {
+		int32_t* size, bool bigEndian) {
 	return HasReturnvaluesIF::RETURN_FAILED;
 }
 

datapool/DataPoolParameterWrapper.h

@@ -11,13 +11,13 @@ public:
 
 	ReturnValue_t set(uint8_t domainId, uint16_t parameterId);
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 
 	ReturnValue_t copyFrom(const ParameterWrapper *from,
 			uint16_t startWritingAtIndex);

datapool/DataSet.cpp

@@ -106,12 +106,12 @@ uint8_t DataSet::lockDataPool() {
 	return ::dataPool.lockDataPool();
 }
 
-ReturnValue_t DataSet::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t DataSet::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	ReturnValue_t result = RETURN_FAILED;
 	for (uint16_t count = 0; count < fill_count; count++) {
-		result = registeredVariables[count]->serialize(buffer, size, maxSize,
+		result = registeredVariables[count]->serialize(buffer, size, max_size,
-				streamEndianness);
+				bigEndian);
 		if (result != RETURN_OK) {
 			return result;
 		}
@@ -119,8 +119,8 @@ ReturnValue_t DataSet::serialize(uint8_t** buffer, size_t* size,
 	return result;
 }
 
-size_t DataSet::getSerializedSize() const {
+uint32_t DataSet::getSerializedSize() const {
-	size_t size = 0;
+	uint32_t size = 0;
 	for (uint16_t count = 0; count < fill_count; count++) {
 		size += registeredVariables[count]->getSerializedSize();
 	}
@@ -136,12 +136,12 @@ void DataSet::setValid(uint8_t valid) {
 	}
 }
 
-ReturnValue_t DataSet::deSerialize(const uint8_t** buffer, size_t* size,
+ReturnValue_t DataSet::deSerialize(const uint8_t** buffer, int32_t* size,
-		Endianness streamEndianness) {
+		bool bigEndian) {
 	ReturnValue_t result = RETURN_FAILED;
 	for (uint16_t count = 0; count < fill_count; count++) {
 		result = registeredVariables[count]->deSerialize(buffer, size,
-				streamEndianness);
+				bigEndian);
 		if (result != RETURN_OK) {
 			return result;
 		}

datapool/DataSet.h

@@ -146,13 +146,13 @@ public:
 	 */
 	void setValid(uint8_t valid);
 
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	size_t getSerializedSize() const override;
+	uint32_t getSerializedSize() const;
 
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 
 };
 

datapool/PIDReader.h

@@ -17,7 +17,7 @@ protected:
 	uint8_t valid;
 	ReturnValue_t read() {
 		uint8_t arrayIndex = DataPool::PIDToArrayIndex(parameterId);
-		PoolEntry<T> *read_out = ::dataPool.getData<T>(
+		PoolEntry<T>* read_out = ::dataPool.getData<T>(
 				DataPool::PIDToDataPoolId(parameterId), arrayIndex);
 		if (read_out != NULL) {
 			valid = read_out->valid;
@@ -43,8 +43,7 @@ protected:
 	 * Empty ctor for List initialization
 	 */
 	PIDReader() :
-			parameterId(PoolVariableIF::NO_PARAMETER), valid(
+		parameterId(PoolVariableIF::NO_PARAMETER), valid(PoolVariableIF::INVALID), value(0) {
-					PoolVariableIF::INVALID), value(0) {
 
 	}
 public:
@@ -64,9 +63,9 @@ public:
 	 * \param setWritable If this flag is set to true, changes in the value attribute can be
 	 * 					written back to the data pool, otherwise not.
 	 */
-	PIDReader(uint32_t setParameterId, DataSetIF *dataSet) :
+	PIDReader(uint32_t setParameterId, DataSetIF* dataSet) :
-			parameterId(setParameterId), valid(PoolVariableIF::INVALID), value(
+			parameterId(setParameterId), valid(
-					0) {
+					PoolVariableIF::INVALID), value(0) {
 		if (dataSet != NULL) {
 			dataSet->registerVariable(this);
 		}
@@ -75,7 +74,7 @@ public:
 	/**
 	 * Copy ctor to copy classes containing Pool Variables.
 	 */
-	PIDReader(const PIDReader &rhs) :
+	PIDReader(const PIDReader& rhs) :
 			parameterId(rhs.parameterId), valid(rhs.valid), value(rhs.value) {
 	}
 
@@ -122,25 +121,24 @@ public:
 		return value;
 	}
 
-	PIDReader<T>& operator=(T newValue) {
+	PIDReader<T> &operator=(T newValue) {
 		value = newValue;
 		return *this;
 	}
 
-	virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
-		return SerializeAdapter::serialize(&value, buffer, size, maxSize,
+		return SerializeAdapter<T>::serialize(&value, buffer, size, max_size,
-				streamEndianness);
+				bigEndian);
 	}
 
-	virtual size_t getSerializedSize() const override {
+	virtual uint32_t getSerializedSize() const {
-		return SerializeAdapter::getSerializedSize(&value);
+		return SerializeAdapter<T>::getSerializedSize(&value);
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override {
+	bool bigEndian) {
-		return SerializeAdapter::deSerialize(&value, buffer, size,
+		return SerializeAdapter<T>::deSerialize(&value, buffer, size, bigEndian);
-				streamEndianness);
 	}
 };
 

datapool/PoolEntry.cpp

@@ -1,34 +1,13 @@
 #include <framework/datapool/PoolEntry.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/globalfunctions/arrayprinter.h>
-#include <cstring>
 
 template <typename T>
-PoolEntry<T>::PoolEntry(std::initializer_list<T> initValue, uint8_t setLength,
+PoolEntry<T>::PoolEntry( T* initValue, uint8_t set_length, uint8_t set_valid ) : length(set_length), valid(set_valid) {
-		bool setValid ) : length(setLength), valid(setValid) {
 	this->address = new T[this->length];
-	if(initValue.size() == 0) {
+	if (initValue != NULL) {
-		std::memset(this->address, 0, this->getByteSize());
+		memcpy(this->address, initValue, this->getByteSize() );
-	}
-	else if (initValue.size() != setLength){
-		sif::warning << "PoolEntry: setLength is not equal to initializer list"
-				"length! Performing zero initialization with given setLength"
-				<< std::endl;
-		std::memset(this->address, 0, this->getByteSize());
-	}
-	else {
-		std::copy(initValue.begin(), initValue.end(), this->address);
-	}
-}
-
-template <typename T>
-PoolEntry<T>::PoolEntry( T* initValue, uint8_t setLength, bool setValid ) :
-		length(setLength), valid(setValid) {
-	this->address = new T[this->length];
-	if (initValue != nullptr) {
-		std::memcpy(this->address, initValue, this->getByteSize() );
 	} else {
-		std::memset(this->address, 0, this->getByteSize() );
+		memset(this->address, 0, this->getByteSize() );
 	}
 }
 
@@ -55,20 +34,21 @@ void* PoolEntry<T>::getRawData() {
 }
 
 template <typename T>
-void PoolEntry<T>::setValid(bool isValid) {
+void PoolEntry<T>::setValid( uint8_t isValid ) {
 	this->valid = isValid;
 }
 
 template <typename T>
-bool PoolEntry<T>::getValid() {
+uint8_t PoolEntry<T>::getValid() {
 	return valid;
 }
 
 template <typename T>
 void PoolEntry<T>::print() {
-	 sif::debug << "Pool Entry Validity: " <<
+	for (uint8_t size = 0; size < this->length; size++ ) {
-			 (this->valid? " (valid) " : " (invalid) ") << std::endl;
+		sif::debug << "| " << std::hex << (double)this->address[size]
-	arrayprinter::print(reinterpret_cast<uint8_t*>(address), length);
+		           << (this->valid? " (valid) " : " (invalid) ");
+	}
 	sif::debug << std::dec << std::endl;
 }
 

datapool/PoolEntry.h

@@ -1,126 +1,81 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_
+#ifndef POOLENTRY_H_
-#define FRAMEWORK_DATAPOOL_POOLENTRY_H_
+#define POOLENTRY_H_
+
 
 #include <framework/datapool/PoolEntryIF.h>
-
+#include <stddef.h>
-#include <initializer_list>
+#include <cstring>
-#include <type_traits>
-#include <cstddef>
-
 /**
- * @brief	This is a small helper class that defines a single data pool entry.
+ * \brief		This is a small helper class that defines a single data pool entry.
- * @details
- * The helper is used to store all information together with the data as a
- * single data pool entry. The content's type is defined by the template
- * argument.
  *
- * It is prepared for use with plain old data types, but may be
+ * \details		The helper is used to store all information together with the data as a single data pool entry.
- * extended to complex types if necessary. It can be initialized with a
+ * 				The content's type is defined by the template argument.
- * certain value, size and validity flag.
+ * 				It is prepared for use with plain old data types,
+ * 				but may be extended to complex types if necessary.
+ * 				It can be initialized with a certain value, size and validity flag.
+ * 				It holds a pointer to the real data and offers methods to access this data and to acquire
+ * 				additional information (such as validity and array/byte size).
+ * 				It is NOT intended to be used outside the DataPool class.
  *
- * It holds a pointer to the real data and offers methods to access this data
+ *	\ingroup data_pool
- * and to acquire additional information (such as validity and array/byte size).
- * It is NOT intended to be used outside DataPool implementations as it performs
- * dynamic memory allocation.
  *
- * @ingroup data_pool
  */
 template <typename T>
 class PoolEntry : public PoolEntryIF {
 public:
-	static_assert(not std::is_same<T, bool>::value,
-				"Do not use boolean for the PoolEntry type, use uint8_t "
-				"instead! The ECSS standard defines a boolean as a one bit "
-				"field. Therefore it is preferred to store a boolean as an "
-				"uint8_t");
 	/**
-	 * @brief	In the classe's constructor, space is allocated on the heap and
+	 * \brief	In the classe's constructor, space is allocated on the heap and
 	 * 			potential init values are copied to that space.
-	 * @details
+	 * \param initValue		A pointer to the single value or array that holds the init value.
-	 * Not passing any arguments will initialize an non-array pool entry
+	 * 						With the default value (NULL), the entry is initalized with all 0.
-	 * (setLength = 1) with an initial invalid state.
+	 * \param set_length	Defines the array length of this entry.
-	 * Please note that if an initializer list is passed, the correct
+	 * \param set_valid		Sets the initialization flag. It is invalid (0) by default.
-	 * corresponding length should be passed too, otherwise a zero
-	 * initialization will be performed with the given setLength.
-	 * @param initValue
-	 * Initializer list with values to initialize with, for example {0,0} to
-	 * initialize the two entries to zero.
-	 * @param setLength
-	 * Defines the array length of this entry. Should be equal to the
-	 * intializer list length.
-	 * @param setValid
-	 * Sets the initialization flag. It is invalid by default.
 	 */
-	PoolEntry(std::initializer_list<T> initValue = {}, uint8_t setLength = 1,
+	PoolEntry( T* initValue = NULL, uint8_t set_length = 1, uint8_t set_valid = 0 );
-			bool setValid = false);
 	/**
-	 * @brief	In the classe's constructor, space is allocated on the heap and
+	 * \brief	The allocated memory for the variable is freed in the destructor.
-	 * 			potential init values are copied to that space.
+	 * \details	As the data pool is global, this dtor is only called on program exit.
-	 * @param initValue
+	 * 			PoolEntries shall never be copied, as a copy might delete the variable on the heap.
-	 * A pointer to the single value or array that holds the init value.
-	 * With the default value (nullptr), the entry is initalized with all 0.
-	 * @param setLength
-	 * Defines the array length of this entry.
-	 * @param setValid
-	 * Sets the initialization flag. It is invalid by default.
-	 */
-	PoolEntry(T* initValue, uint8_t setLength = 1, bool setValid = false);
-
-	//! Explicitely deleted copy ctor, copying is not allowed!
-	PoolEntry(const PoolEntry&) = delete;
-	//! Explicitely deleted copy assignment, copying is not allowed!
-	PoolEntry& operator=(const PoolEntry&) = delete;
-
-	/**
-	 * @brief	The allocated memory for the variable is freed
-	 * 			in the destructor.
-	 * @details
-	 * As the data pool is global, this dtor is only called on program exit.
-	 * PoolEntries shall never be copied, as a copy might delete the variable
-	 * on the heap.
 	 */
 	~PoolEntry();
-
 	/**
-	 * @brief	This is the address pointing to the allocated memory.
+	 * \brief	This is the address pointing to the allocated memory.
 	 */
 	T* address;
 	/**
-	 * @brief	This attribute stores the length information.
+	 * \brief	This attribute stores the length information.
 	 */
 	uint8_t length;
 	/**
-	 * @brief	Here, the validity information for a variable is stored.
+	 * \brief	Here, the validity information for a variable is stored.
 	 * 			Every entry (single variable or vector) has one valid flag.
 	 */
 	uint8_t valid;
 	/**
-	 * @brief	getSize returns the array size of the entry.
+	 * \brief	getSize returns the array size of the entry.
-	 * @details	A single parameter has size 1.
+	 * \details	A single parameter has size 1.
 	 */
 	uint8_t getSize();
 	/**
-	 * @brief	This operation returns the size in bytes.
+	 * \brief	This operation returns the size in bytes.
-	 * @details	The size is calculated by sizeof(type) * array_size.
+	 * \details	The size is calculated by sizeof(type) * array_size.
 	 */
 	uint16_t getByteSize();
 	/**
-	 * @brief	This operation returns a the address pointer casted to void*.
+	 * \brief	This operation returns a the address pointer casted to void*.
 	 */
 	void* getRawData();
 	/**
-	 * @brief	This method allows to set the valid information
+	 * \brief	This method allows to set the valid information of the pool entry.
-	 * 			of the pool entry.
 	 */
-	void setValid( bool isValid );
+	void setValid( uint8_t isValid );
 	/**
-	 * @brief	This method allows to get the valid information
+	 * \brief	This method allows to get the valid information of the pool entry.
-	 * 			of the pool entry.
 	 */
-	bool getValid();
+	uint8_t getValid();
 	/**
-	 * @brief	This is a debug method that prints all values and the valid
+	 * \brief	This is a debug method that prints all values and the valid information to the screen.
-	 * 			information to the screen. It prints all array entries in a row.
+	 * 			It prints all array entries in a row.
 	 */
 	void print();
 

datapool/PoolEntryIF.h

@@ -1,57 +1,62 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
+/**
-#define FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
+ * \file	PoolEntryIF.h
+ *
+ * \brief	This file holds the class that defines the Interface for Pool Entry elements.
+ *
+ * \date	10/18/2012
+ *
+ * \author	Bastian Baetz
+ */
+
+#ifndef POOLENTRYIF_H_
+#define POOLENTRYIF_H_
 
 #include <framework/globalfunctions/Type.h>
-#include <cstdint>
+#include <stdint.h>
+
+
 
 /**
- * @brief	This interface defines the access possibilities to a
+ * \brief	This interface defines the access possibilities to a single data pool entry.
- * 			single data pool entry.
- * @details
- * The interface provides methods to determine the size and the validity
- * information of a value. It also defines a method to receive a pointer to the
- * raw data content. It is mainly used by DataPool itself, but also as a
- * return pointer.
  *
- * @author	Bastian Baetz
+ * \details	The interface provides methods to determine the size and the validity information of a value.
- * @ingroup data_pool
+ * 			It also defines a method to receive a pointer to the raw data content.
+ * 			It is mainly used by DataPool itself, but also as a return pointer.
+ *
+ *	\ingroup data_pool
  *
  */
 class PoolEntryIF {
 public:
 	/**
-	 * @brief	This is an empty virtual destructor,
+	 * \brief	This is an empty virtual destructor, as it is proposed for C++ interfaces.
-	 * 			as it is required for C++ interfaces.
 	 */
 	virtual ~PoolEntryIF() {
 	}
 	/**
-	 * @brief	getSize returns the array size of the entry.
+	 * \brief	getSize returns the array size of the entry. A single variable parameter has size 1.
-	 * 			A single variable parameter has size 1.
 	 */
 	virtual uint8_t getSize() = 0;
 	/**
-	 * @brief	This operation returns the size in bytes, which is calculated by
+	 * \brief	This operation returns the size in bytes, which is calculated by
 	 * 			sizeof(type) * array_size.
 	 */
 	virtual uint16_t getByteSize() = 0;
 	/**
-	 * @brief	This operation returns a the address pointer casted to void*.
+	 * \brief	This operation returns a the address pointer casted to void*.
 	 */
 	virtual void* getRawData() = 0;
 	/**
-	 * @brief	This method allows to set the valid information of the pool entry.
+	 * \brief	This method allows to set the valid information of the pool entry.
 	 */
-	virtual void setValid(bool isValid) = 0;
+	virtual void setValid(uint8_t isValid) = 0;
 	/**
-	 * @brief	This method allows to set the valid information of the pool entry.
+	 * \brief	This method allows to set the valid information of the pool entry.
 	 */
-	virtual bool getValid() = 0;
+	virtual uint8_t getValid() = 0;
 	/**
-	 * @brief	This is a debug method that prints all values and the valid
+	 * \brief	This is a debug method that prints all values and the valid information to the screen.
-	 * 			information to the screen. It prints all array entries in a row.
+	 * 			It prints all array entries in a row.
-	 * @details
-	 * Also displays whether the pool entry is valid or invalid.
 	 */
 	virtual void print() = 0;
 	/**

datapool/PoolRawAccess.cpp

@@ -2,15 +2,12 @@
 #include <framework/datapool/PoolEntryIF.h>
 #include <framework/datapool/PoolRawAccess.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/serialize/EndianConverter.h>
+#include <framework/osal/Endiness.h>
-
-#include <cstring>
 
 PoolRawAccess::PoolRawAccess(uint32_t set_id, uint8_t setArrayEntry,
-		DataSetIF *data_set, ReadWriteMode_t setReadWriteMode) :
+		DataSetIF* data_set, ReadWriteMode_t setReadWriteMode) :
-		dataPoolId(set_id), arrayEntry(setArrayEntry), valid(false), type(
+		dataPoolId(set_id), arrayEntry(setArrayEntry), valid(false), type(Type::UNKNOWN_TYPE), typeSize(
-				Type::UNKNOWN_TYPE), typeSize(0), arraySize(0), sizeTillEnd(0), readWriteMode(
+				0), arraySize(0), sizeTillEnd(0), readWriteMode(setReadWriteMode) {
-				setReadWriteMode) {
 	memset(value, 0, sizeof(value));
 	if (data_set != NULL) {
 		data_set->registerVariable(this);
@@ -22,7 +19,7 @@ PoolRawAccess::~PoolRawAccess() {
 }
 
 ReturnValue_t PoolRawAccess::read() {
-	PoolEntryIF *read_out = ::dataPool.getRawData(dataPoolId);
+	PoolEntryIF* read_out = ::dataPool.getRawData(dataPoolId);
 	if (read_out != NULL) {
 		valid = read_out->getValid();
 		if (read_out->getSize() > arrayEntry) {
@@ -32,7 +29,7 @@ ReturnValue_t PoolRawAccess::read() {
 			if (typeSize <= sizeof(value)) {
 				uint16_t arrayPosition = arrayEntry * typeSize;
 				sizeTillEnd = read_out->getByteSize() - arrayPosition;
-				uint8_t *ptr =
+				uint8_t* ptr =
 						&((uint8_t*) read_out->getRawData())[arrayPosition];
 				memcpy(value, ptr, typeSize);
 				return HasReturnvaluesIF::RETURN_OK;
@@ -45,8 +42,8 @@ ReturnValue_t PoolRawAccess::read() {
 	} else {
 		//Error entry does not exist.
 	}
-	sif::error << "PoolRawAccess: read of DP Variable 0x" << std::hex
+	sif::error << "PoolRawAccess: read of DP Variable 0x" << std::hex << dataPoolId
-			<< dataPoolId << std::dec << " failed." << std::endl;
+			<< std::dec << " failed." << std::endl;
 	valid = INVALID;
 	typeSize = 0;
 	sizeTillEnd = 0;
@@ -55,11 +52,11 @@ ReturnValue_t PoolRawAccess::read() {
 }
 
 ReturnValue_t PoolRawAccess::commit() {
-	PoolEntryIF *write_back = ::dataPool.getRawData(dataPoolId);
+	PoolEntryIF* write_back = ::dataPool.getRawData(dataPoolId);
 	if ((write_back != NULL) && (readWriteMode != VAR_READ)) {
 		write_back->setValid(valid);
 		uint8_t array_position = arrayEntry * typeSize;
-		uint8_t *ptr = &((uint8_t*) write_back->getRawData())[array_position];
+		uint8_t* ptr = &((uint8_t*) write_back->getRawData())[array_position];
 		memcpy(ptr, value, typeSize);
 		return HasReturnvaluesIF::RETURN_OK;
 	} else {
@@ -71,17 +68,23 @@ uint8_t* PoolRawAccess::getEntry() {
 	return value;
 }
 
-ReturnValue_t PoolRawAccess::getEntryEndianSafe(uint8_t *buffer,
+ReturnValue_t PoolRawAccess::getEntryEndianSafe(uint8_t* buffer,
-		size_t *writtenBytes, size_t maxSize) {
+		uint32_t* writtenBytes, uint32_t max_size) {
-	uint8_t *data_ptr = getEntry();
+	uint8_t* data_ptr = getEntry();
 //	debug << "PoolRawAccess::getEntry: Array position: " << index * size_of_type << " Size of T: " << (int)size_of_type << " ByteSize: " << byte_size << " Position: " << *size << std::endl;
-	if (typeSize == 0) {
+	if (typeSize == 0)
 		return DATA_POOL_ACCESS_FAILED;
-	}
+	if (typeSize > max_size)
-	if (typeSize > maxSize) {
 		return INCORRECT_SIZE;
+#ifndef BYTE_ORDER_SYSTEM
+#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+	for (uint8_t count = 0; count < typeSize; count++) {
+		buffer[count] = data_ptr[typeSize - count - 1];
 	}
-	EndianConverter::convertBigEndian(buffer, data_ptr, typeSize);
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+	memcpy(buffer, data_ptr, typeSize);
+#endif
 	*writtenBytes = typeSize;
 	return HasReturnvaluesIF::RETURN_OK;
 }
@@ -90,11 +93,11 @@ Type PoolRawAccess::getType() {
 	return type;
 }
 
-size_t PoolRawAccess::getSizeOfType() {
+uint8_t PoolRawAccess::getSizeOfType() {
 	return typeSize;
 }
 
-size_t PoolRawAccess::getArraySize() {
+uint8_t PoolRawAccess::getArraySize(){
 	return arraySize;
 }
 
@@ -106,14 +109,21 @@ PoolVariableIF::ReadWriteMode_t PoolRawAccess::getReadWriteMode() const {
 	return readWriteMode;
 }
 
-ReturnValue_t PoolRawAccess::setEntryFromBigEndian(const uint8_t *buffer,
+ReturnValue_t PoolRawAccess::setEntryFromBigEndian(const uint8_t* buffer,
-		size_t setSize) {
+		uint32_t setSize) {
 	if (typeSize == setSize) {
-		EndianConverter::convertBigEndian(value, buffer, typeSize);
+#ifndef BYTE_ORDER_SYSTEM
+#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+		for (uint8_t count = 0; count < typeSize; count++) {
+			value[count] = buffer[typeSize - count - 1];
+		}
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+		memcpy(value, buffer, typeSize);
+#endif
 		return HasReturnvaluesIF::RETURN_OK;
 	} else {
-		sif::error
+		sif::error << "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal"
-				<< "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal"
 				<< (uint32_t) typeSize << ", Requested: " << setSize
 				<< std::endl;
 		return INCORRECT_SIZE;
@@ -131,24 +141,25 @@ void PoolRawAccess::setValid(uint8_t valid) {
 	this->valid = valid;
 }
 
-size_t PoolRawAccess::getSizeTillEnd() const {
+uint16_t PoolRawAccess::getSizeTillEnd() const {
 	return sizeTillEnd;
 }
 
-ReturnValue_t PoolRawAccess::serialize(uint8_t **buffer, size_t *size,
+ReturnValue_t PoolRawAccess::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
-	if (typeSize + *size <= maxSize) {
+	if (typeSize + *size <= max_size) {
-		switch (streamEndianness) {
+		if (bigEndian) {
-		case (Endianness::BIG):
+#ifndef BYTE_ORDER_SYSTEM
-			EndianConverter::convertBigEndian(*buffer, value, typeSize);
+#error BYTE_ORDER_SYSTEM not defined
-			break;
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-		case (Endianness::LITTLE):
+			for (uint8_t count = 0; count < typeSize; count++) {
-			EndianConverter::convertLittleEndian(*buffer, value, typeSize);
+				(*buffer)[count] = value[typeSize - count - 1];
-			break;
+			}
-		default:
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-		case (Endianness::MACHINE):
+			memcpy(*buffer, value, typeSize);
+#endif
+		} else {
 			memcpy(*buffer, value, typeSize);
-			break;
 		}
 		*size += typeSize;
 		(*buffer) += typeSize;
@@ -158,27 +169,28 @@ ReturnValue_t PoolRawAccess::serialize(uint8_t **buffer, size_t *size,
 	}
 }
 
-size_t PoolRawAccess::getSerializedSize() const {
+uint32_t PoolRawAccess::getSerializedSize() const {
 	return typeSize;
 }
 
-ReturnValue_t PoolRawAccess::deSerialize(const uint8_t **buffer, size_t *size,
+ReturnValue_t PoolRawAccess::deSerialize(const uint8_t** buffer, int32_t* size,
-		Endianness streamEndianness) {
+		bool bigEndian) {
+	*size -= typeSize;
+	if (*size >= 0) {
 
-	if (*size >= typeSize) {
+		if (bigEndian) {
-		switch (streamEndianness) {
+#ifndef BYTE_ORDER_SYSTEM
-		case (Endianness::BIG):
+#error BYTE_ORDER_SYSTEM not defined
-			EndianConverter::convertBigEndian(value, *buffer, typeSize);
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-			break;
+			for (uint8_t count = 0; count < typeSize; count++) {
-		case (Endianness::LITTLE):
+				value[count] = (*buffer)[typeSize - count - 1];
-			EndianConverter::convertLittleEndian(value, *buffer, typeSize);
+			}
-			break;
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-		default:
+			memcpy(value, *buffer, typeSize);
-		case (Endianness::MACHINE):
+#endif
+		} else {
 			memcpy(value, *buffer, typeSize);
-			break;
 		}
-		*size -= typeSize;
 		*buffer += typeSize;
 		return HasReturnvaluesIF::RETURN_OK;
 	} else {

datapool/PoolRawAccess.h

@@ -32,15 +32,15 @@ private:
 	/**
 	 * \brief	This value contains the size of the data pool entry in bytes.
 	 */
-	size_t typeSize;
+	uint8_t typeSize;
 	/**
 	 * The size of the DP array (single values return 1)
 	 */
-	size_t arraySize;
+	uint8_t arraySize;
 	/**
 	 * The size (in bytes) from the selected entry till the end of this DataPool variable.
 	 */
-	size_t sizeTillEnd;
+	uint16_t sizeTillEnd;
 	/**
 	 * \brief	The information whether the class is read-write or read-only is stored here.
 	 */
@@ -70,7 +70,7 @@ public:
 	static const ReturnValue_t DATA_POOL_ACCESS_FAILED = MAKE_RETURN_CODE(0x02);
 	uint8_t value[RAW_MAX_SIZE];
 	PoolRawAccess(uint32_t data_pool_id, uint8_t arrayEntry,
-			DataSetIF *data_set, ReadWriteMode_t setReadWriteMode =
+			DataSetIF* data_set, ReadWriteMode_t setReadWriteMode =
 					PoolVariableIF::VAR_READ);
 	/**
 	 * \brief	The classes destructor is empty. If commit() was not called, the local value is
@@ -90,15 +90,15 @@ public:
 	 * \details	It makes use of the getEntry call of this function, but additionally flips the
 	 * 			bytes to big endian, which is the default for external communication (as House-
 	 * 			keeping telemetry). To achieve this, the data is copied directly to the passed
-	 * 			buffer, if it fits in the given maxSize.
+	 * 			buffer, if it fits in the given max_size.
 	 * \param buffer	A pointer to a buffer to write to
 	 * \param writtenBytes	The number of bytes written is returned with this value.
-	 * \param maxSize	The maximum size that the function may write to buffer.
+	 * \param max_size	The maximum size that the function may write to buffer.
 	 * \return	- \c RETURN_OK if entry could be acquired
 	 * 			- \c RETURN_FAILED else.
 	 */
-	ReturnValue_t getEntryEndianSafe(uint8_t *buffer, size_t *size,
+	ReturnValue_t getEntryEndianSafe(uint8_t* buffer, uint32_t* size,
-			size_t maxSize);
+			uint32_t max_size);
 	/**
 	 * With this method, the content can be set from a big endian buffer safely.
 	 * @param buffer	Pointer to the data to set
@@ -106,8 +106,8 @@ public:
 	 * @return	- \c RETURN_OK on success
 	 * 			- \c RETURN_FAILED on failure
 	 */
-	ReturnValue_t setEntryFromBigEndian(const uint8_t *buffer,
+	ReturnValue_t setEntryFromBigEndian(const uint8_t* buffer,
-			size_t setSize);
+			uint32_t setSize);
 	/**
 	 *  \brief This operation returns the type of the entry currently stored.
 	 */
@@ -115,12 +115,12 @@ public:
 	/**
 	 *  \brief This operation returns the size of the entry currently stored.
 	 */
-	size_t getSizeOfType();
+	uint8_t getSizeOfType();
 	/**
 	 *
 	 * @return the size of the datapool array
 	 */
-	size_t getArraySize();
+	uint8_t getArraySize();
 	/**
 	 * \brief	This operation returns the data pool id of the variable.
 	 */
@@ -138,15 +138,15 @@ public:
 	/**
 	 * Getter for the remaining size.
 	 */
-	size_t getSizeTillEnd() const;
+	uint16_t getSizeTillEnd() const;
 
-	ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			 Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	size_t getSerializedSize() const override;
+	uint32_t getSerializedSize() const;
 
-	ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			 Endianness streamEndianness) override;
+			bool bigEndian);
 };
 
 #endif /* POOLRAWACCESS_H_ */

datapool/PoolVariable.h

@@ -58,7 +58,7 @@ protected:
 	 * 			The operation does NOT provide any mutual exclusive protection by itself.
 	 */
 	ReturnValue_t read() {
-		PoolEntry<T> *read_out = ::dataPool.getData < T > (dataPoolId, 1);
+		PoolEntry<T>* read_out = ::dataPool.getData<T>(dataPoolId, 1);
 		if (read_out != NULL) {
 			valid = read_out->valid;
 			value = *(read_out->address);
@@ -79,7 +79,7 @@ protected:
 	 *
 	 */
 	ReturnValue_t commit() {
-		PoolEntry<T> *write_back = ::dataPool.getData < T > (dataPoolId, 1);
+		PoolEntry<T>* write_back = ::dataPool.getData<T>(dataPoolId, 1);
 		if ((write_back != NULL) && (readWriteMode != VAR_READ)) {
 			write_back->valid = valid;
 			*(write_back->address) = value;
@@ -115,7 +115,7 @@ public:
 	 * \param setWritable If this flag is set to true, changes in the value attribute can be
 	 * 					written back to the data pool, otherwise not.
 	 */
-	PoolVariable(uint32_t set_id, DataSetIF *dataSet,
+	PoolVariable(uint32_t set_id, DataSetIF* dataSet,
 			ReadWriteMode_t setReadWriteMode) :
 			dataPoolId(set_id), valid(PoolVariableIF::INVALID), readWriteMode(
 					setReadWriteMode), value(0) {
@@ -126,7 +126,7 @@ public:
 	/**
 	 * Copy ctor to copy classes containing Pool Variables.
 	 */
-	PoolVariable(const PoolVariable &rhs) :
+	PoolVariable(const PoolVariable& rhs) :
 			dataPoolId(rhs.dataPoolId), valid(rhs.valid), readWriteMode(
 					rhs.readWriteMode), value(rhs.value) {
 	}
@@ -184,29 +184,29 @@ public:
 		return value;
 	}
 
-	PoolVariable<T>& operator=(T newValue) {
+	PoolVariable<T> &operator=(T newValue) {
 		value = newValue;
 		return *this;
 	}
 
-	PoolVariable<T>& operator=(PoolVariable<T> newPoolVariable) {
+	PoolVariable<T> &operator=(PoolVariable<T> newPoolVariable) {
 		value = newPoolVariable.value;
 		return *this;
 	}
 
-	virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
-		return SerializeAdapter::serialize<T>(&value, buffer, size, maxSize,
+		return SerializeAdapter<T>::serialize(&value, buffer, size, max_size,
-				streamEndianness);
+				bigEndian);
 	}
 
-	virtual size_t getSerializedSize() const override {
+	virtual uint32_t getSerializedSize() const {
-		return SerializeAdapter::getSerializedSize(&value);
+		return SerializeAdapter<T>::getSerializedSize(&value);
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override {
+			bool bigEndian) {
-		return SerializeAdapter::deSerialize(&value, buffer, size, streamEndianness);
+		return SerializeAdapter<T>::deSerialize(&value, buffer, size, bigEndian);
 	}
 };
 

datapool/PoolVector.h

@@ -197,13 +197,13 @@ public:
 		return *this;
 	}
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
 		uint16_t i;
 		ReturnValue_t result;
 		for (i = 0; i < vector_size; i++) {
-			result = SerializeAdapter::serialize(&(value[i]), buffer, size,
+			result = SerializeAdapter<T>::serialize(&(value[i]), buffer, size,
-					maxSize, streamEndianness);
+					max_size, bigEndian);
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
 			}
@@ -211,17 +211,17 @@ public:
 		return result;
 	}
 
-	virtual size_t getSerializedSize() const {
+	virtual uint32_t getSerializedSize() const {
-		return vector_size * SerializeAdapter::getSerializedSize(value);
+		return vector_size * SerializeAdapter<T>::getSerializedSize(value);
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
 		uint16_t i;
 		ReturnValue_t result;
 		for (i = 0; i < vector_size; i++) {
-			result = SerializeAdapter::deSerialize(&(value[i]), buffer, size,
+			result = SerializeAdapter<T>::deSerialize(&(value[i]), buffer, size,
-					streamEndianness);
+					bigEndian);
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
 			}

devicehandlers/ChildHandlerBase.cpp

@@ -2,16 +2,15 @@
 #include <framework/devicehandlers/ChildHandlerBase.h>
 #include <framework/subsystem/SubsystemBase.h>
 
-ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
+ChildHandlerBase::ChildHandlerBase(uint32_t ioBoardAddress,
-		object_id_t deviceCommunication, CookieIF * comCookie,
+		object_id_t setObjectId, object_id_t deviceCommunication,
-		uint8_t setDeviceSwitch, uint32_t thermalStatePoolId,
+		uint32_t maxDeviceReplyLen, uint8_t setDeviceSwitch,
-		uint32_t thermalRequestPoolId, uint32_t parent,
+		uint32_t thermalStatePoolId, uint32_t thermalRequestPoolId,
-		FailureIsolationBase* customFdir, size_t cmdQueueSize) :
+		uint32_t parent, FailureIsolationBase* customFdir, uint32_t cmdQueueSize) :
-		DeviceHandlerBase(setObjectId, deviceCommunication, comCookie,
+		DeviceHandlerBase(ioBoardAddress, setObjectId, maxDeviceReplyLen,
-				setDeviceSwitch, thermalStatePoolId,thermalRequestPoolId,
+				setDeviceSwitch, deviceCommunication, thermalStatePoolId,
-				(customFdir == nullptr? &childHandlerFdir : customFdir),
+				thermalRequestPoolId, (customFdir == NULL? &childHandlerFdir : customFdir), cmdQueueSize), parentId(
-				cmdQueueSize),
+				parent), childHandlerFdir(setObjectId) {
-		parentId(parent), childHandlerFdir(setObjectId) {
 }
 
 ChildHandlerBase::~ChildHandlerBase() {
@@ -35,7 +34,7 @@ ReturnValue_t ChildHandlerBase::initialize() {
 		parent->registerChild(getObjectId());
 	}
 
-	healthHelper.setParentQueue(parentQueue);
+	healthHelper.setParentQeueue(parentQueue);
 
 	modeHelper.setParentQueue(parentQueue);
 

devicehandlers/ChildHandlerBase.h

@@ -6,12 +6,12 @@
 
 class ChildHandlerBase: public DeviceHandlerBase {
 public:
-	ChildHandlerBase(object_id_t setObjectId,
+	ChildHandlerBase(uint32_t ioBoardAddress, object_id_t setObjectId,
-			object_id_t deviceCommunication, CookieIF * comCookie,
+			object_id_t deviceCommunication, uint32_t maxDeviceReplyLen,
 			uint8_t setDeviceSwitch, uint32_t thermalStatePoolId,
 			uint32_t thermalRequestPoolId, uint32_t parent,
-			FailureIsolationBase* customFdir = nullptr,
+			FailureIsolationBase* customFdir = NULL,
-			size_t cmdQueueSize = 20);
+			uint32_t cmdQueueSize = 20);
 	virtual ~ChildHandlerBase();
 
 	virtual ReturnValue_t initialize();

devicehandlers/Cookie.h

@@ -0,0 +1,10 @@
+#ifndef COOKIE_H_
+#define COOKIE_H_
+
+class Cookie{
+public:
+	virtual ~Cookie(){}
+};
+
+
+#endif /* COOKIE_H_ */

devicehandlers/CookieIF.h

@@ -1,34 +0,0 @@
-#ifndef COOKIE_H_
-#define COOKIE_H_
-#include <cstdint>
-
-/**
- * @brief Physical address type
- */
-typedef std::uint32_t address_t;
-
-/**
- * @brief 	This datatype is used to identify different connection over a
- * 			single interface (like RMAP or I2C)
- * @details
- * To use this class, implement a communication specific child cookie which
- * inherits Cookie. Cookie instances are created in config/Factory.cpp by
- * calling @code{.cpp} CookieIF* childCookie = new ChildCookie(...)
- * @endcode .
- *
- * [not implemented yet]
- * This cookie is then passed to the child device handlers, which stores the
- * pointer and passes it to the communication interface functions.
- *
- * The cookie can be used to store all kinds of information
- * about the communication, like slave addresses, communication status,
- * communication parameters etc.
- *
- * @ingroup comm
- */
-class CookieIF {
-public:
-	virtual ~CookieIF() {};
-};
-
-#endif /* COOKIE_H_ */

devicehandlers/DeviceCommunicationIF.h

@@ -1,131 +1,63 @@
 #ifndef DEVICECOMMUNICATIONIF_H_
 #define DEVICECOMMUNICATIONIF_H_
 
-#include <framework/devicehandlers/CookieIF.h>
+#include <framework/devicehandlers/Cookie.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <cstddef>
-/**
- * @defgroup interfaces Interfaces
- * @brief Interfaces for flight software objects
- */
 
-/**
- * @defgroup comm Communication
- * @brief Communication software components.
- */
-
-/**
- * @brief This is an interface to decouple device communication from
- * the device handler to allow reuse of these components.
- * @details
- * Documentation: Dissertation Baetz p.138.
- * It works with the assumption that received data
- * is polled by a component. There are four generic steps of device communication:
- *
- *   1. Send data to a device
- *   2. Get acknowledgement for sending
- *   3. Request reading data from a device
- *   4. Read received data
- *
- *  To identify different connection over a single interface can return
- *  so-called cookies to components.
- *  The CommunicationMessage message type can be used to extend the
- *  functionality of the ComIF if a separate polling task is required.
- *  @ingroup interfaces
- *  @ingroup comm
- */
 class DeviceCommunicationIF: public HasReturnvaluesIF {
 public:
 	static const uint8_t INTERFACE_ID = CLASS_ID::DEVICE_COMMUNICATION_IF;
 
-	//! Standard Error Codes
+	static const ReturnValue_t INVALID_COOKIE_TYPE = MAKE_RETURN_CODE(0x01);
-	//! General protocol error. Define more concrete errors in child handler
+	static const ReturnValue_t NOT_ACTIVE = MAKE_RETURN_CODE(0x02);
-	static const ReturnValue_t PROTOCOL_ERROR = MAKE_RETURN_CODE(0x01);
+	static const ReturnValue_t INVALID_ADDRESS = MAKE_RETURN_CODE(0x03);
-	//! If cookie is a null pointer
+	static const ReturnValue_t TOO_MUCH_DATA = MAKE_RETURN_CODE(0x04);
-	static const ReturnValue_t NULLPOINTER = MAKE_RETURN_CODE(0x02);
+	static const ReturnValue_t NULLPOINTER = MAKE_RETURN_CODE(0x05);
-	static const ReturnValue_t INVALID_COOKIE_TYPE = MAKE_RETURN_CODE(0x03);
+	static const ReturnValue_t PROTOCOL_ERROR = MAKE_RETURN_CODE(0x06);
-	// is this needed if there is no open/close call?
+	static const ReturnValue_t CANT_CHANGE_REPLY_LEN = MAKE_RETURN_CODE(0x07);
-	static const ReturnValue_t NOT_ACTIVE = MAKE_RETURN_CODE(0x05);
-	static const ReturnValue_t INVALID_ADDRESS = MAKE_RETURN_CODE(0x06);
-	static const ReturnValue_t TOO_MUCH_DATA = MAKE_RETURN_CODE(0x07);
-	static const ReturnValue_t CANT_CHANGE_REPLY_LEN = MAKE_RETURN_CODE(0x08);
 
-	//! Can be used in readReceivedMessage() if no reply was received.
+	virtual ~DeviceCommunicationIF() {
-	static const ReturnValue_t NO_REPLY_RECEIVED = MAKE_RETURN_CODE(0xA1);
 
-	virtual ~DeviceCommunicationIF() {}
+	}
 
+	virtual ReturnValue_t open(Cookie **cookie, uint32_t address,
+			uint32_t maxReplyLen) = 0;
 
 	/**
-	 * @brief Device specific initialization, using the cookie.
+	 * Use an existing cookie to open a connection to a new DeviceCommunication.
-	 * @details
+	 * The previous connection must not be closed.
-	 * The cookie is already prepared in the factory. If the communication
+	 * If the returnvalue is not RETURN_OK, the cookie is unchanged and
-	 * interface needs to be set up in some way and requires cookie information,
+	 * can be used with the previous connection.
-	 * this can be performed in this function, which is called on device handler
-	 * initialization.
-	 * @param cookie
-	 * @return
-	 *  - @c RETURN_OK if initialization was successfull
-	 *  - Everything else triggers failure event with returnvalue as parameter 1
-	 */
-	virtual ReturnValue_t initializeInterface(CookieIF * cookie) = 0;
-
-	/**
-	 * Called by DHB in the SEND_WRITE doSendWrite().
-	 * This function is used to send data to the physical device
-	 * by implementing and calling related drivers or wrapper functions.
-	 * @param cookie
-	 * @param data
-	 * @param len
-	 * @return
-	 *  - @c RETURN_OK for successfull send
-	 *  - Everything else triggers failure event with returnvalue as parameter 1
-	 */
-	virtual ReturnValue_t sendMessage(CookieIF *cookie, const uint8_t * sendData,
-			size_t sendLen) = 0;
-
-	/**
-	 * Called by DHB in the GET_WRITE doGetWrite().
-	 * Get send confirmation that the data in sendMessage() was sent successfully.
-	 * @param cookie
-	 * @return - @c RETURN_OK if data was sent successfull
-	 * 		   - Everything else triggers falure event with
-	 * 		     returnvalue as parameter 1
-	 */
-	virtual ReturnValue_t getSendSuccess(CookieIF *cookie) = 0;
-
-	/**
-	 * Called by DHB in the SEND_WRITE doSendRead().
-	 * It is assumed that it is always possible to request a reply
-	 * from a device. If a requestLen of 0 is supplied, no reply was enabled
-	 * and communication specific action should be taken (e.g. read nothing
-	 * or read everything).
 	 *
 	 * @param cookie
-	 * @param requestLen Size of data to read
+	 * @param address
-	 * @return - @c RETURN_OK to confirm the request for data has been sent.
+	 * @param maxReplyLen
-	 *         - Everything else triggers failure event with
+	 * @return
-	 *           returnvalue as parameter 1
 	 */
-	virtual ReturnValue_t requestReceiveMessage(CookieIF *cookie,
+	virtual ReturnValue_t reOpen(Cookie *cookie, uint32_t address,
-			size_t requestLen) = 0;
+			uint32_t maxReplyLen) = 0;
+
+	virtual void close(Cookie *cookie) = 0;
+
+	//SHOULDDO can data be const?
+	virtual ReturnValue_t sendMessage(Cookie *cookie, uint8_t *data,
+			uint32_t len) = 0;
+
+	virtual ReturnValue_t getSendSuccess(Cookie *cookie) = 0;
+
+	virtual ReturnValue_t requestReceiveMessage(Cookie *cookie) = 0;
+
+	virtual ReturnValue_t readReceivedMessage(Cookie *cookie, uint8_t **buffer,
+			uint32_t *size) = 0;
+
+	virtual ReturnValue_t setAddress(Cookie *cookie, uint32_t address) = 0;
+
+	virtual uint32_t getAddress(Cookie *cookie) = 0;
+
+	virtual ReturnValue_t setParameter(Cookie *cookie, uint32_t parameter) = 0;
+
+	virtual uint32_t getParameter(Cookie *cookie) = 0;
 
-	/**
-	 * Called by DHB in the GET_WRITE doGetRead().
-	 * This function is used to receive data from the physical device
-	 * by implementing and calling related drivers or wrapper functions.
-	 * @param cookie
-	 * @param buffer [out] Set reply here (by using *buffer = ...)
-	 * @param size [out] size pointer to set (by using *size = ...).
-	 * 	           Set to 0 if no reply was received
-	 * @return - @c RETURN_OK for successfull receive
-	 * 		   - @c NO_REPLY_RECEIVED if not reply was received. Setting size to
-	 * 		   	   0 has the same effect
-	 *         - Everything else triggers failure event with
-	 *           returnvalue as parameter 1
-	 */
-	virtual ReturnValue_t readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
-			size_t *size) = 0;
 };
 
 #endif /* DEVICECOMMUNICATIONIF_H_ */

devicehandlers/DeviceHandlerBase.cpp

@@ -1,60 +1,52 @@
-#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 <framework/datapool/DataSet.h>
 #include <framework/datapool/PoolVariable.h>
+#include <framework/datapool/PoolVector.h>
+#include <framework/devicehandlers/AcceptsDeviceResponsesIF.h>
+#include <framework/devicehandlers/DeviceHandlerBase.h>
 #include <framework/devicehandlers/DeviceTmReportingWrapper.h>
 #include <framework/globalfunctions/CRC.h>
+#include <framework/objectmanager/ObjectManager.h>
+#include <framework/storagemanager/StorageManagerIF.h>
 #include <framework/subsystem/SubsystemBase.h>
+#include <framework/thermal/ThermalComponentIF.h>
 #include <framework/ipc/QueueFactory.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-#include <iomanip>
-
 object_id_t DeviceHandlerBase::powerSwitcherId = 0;
 object_id_t DeviceHandlerBase::rawDataReceiverId = 0;
 object_id_t DeviceHandlerBase::defaultFDIRParentId = 0;
 
-DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
+DeviceHandlerBase::DeviceHandlerBase(uint32_t ioBoardAddress,
-		object_id_t deviceCommunication, CookieIF * comCookie,
+		object_id_t setObjectId, uint32_t maxDeviceReplyLen,
-		uint8_t setDeviceSwitch, uint32_t thermalStatePoolId,
+		uint8_t setDeviceSwitch, object_id_t deviceCommunication,
-		uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance,
+		uint32_t thermalStatePoolId, uint32_t thermalRequestPoolId,
-		size_t cmdQueueSize) :
+		FailureIsolationBase* fdirInstance, uint32_t cmdQueueSize) :
-		SystemObject(setObjectId), mode(MODE_OFF), submode(SUBMODE_NONE),
+		SystemObject(setObjectId), rawPacket(0), rawPacketLen(0), mode(
-		wiretappingMode(OFF), storedRawData(StorageManagerIF::INVALID_ADDRESS),
+				MODE_OFF), submode(SUBMODE_NONE), pstStep(0), maxDeviceReplyLen(
-		deviceCommunicationId(deviceCommunication), comCookie(comCookie),
+				maxDeviceReplyLen), wiretappingMode(OFF), defaultRawReceiver(0), storedRawData(
-		deviceThermalStatePoolId(thermalStatePoolId),
+				StorageManagerIF::INVALID_ADDRESS), requestedRawTraffic(0), powerSwitcher(
-		deviceThermalRequestPoolId(thermalRequestPoolId),
+		NULL), IPCStore(NULL), deviceCommunicationId(deviceCommunication), communicationInterface(
-		healthHelper(this,setObjectId), modeHelper(this), parameterHelper(this),
+		NULL), cookie(
-		childTransitionFailure(RETURN_OK), fdirInstance(fdirInstance),
+		NULL), commandQueue(NULL), deviceThermalStatePoolId(thermalStatePoolId), deviceThermalRequestPoolId(
-		hkSwitcher(this), defaultFDIRUsed(fdirInstance == nullptr),
+				thermalRequestPoolId), healthHelper(this, setObjectId), modeHelper(
-		switchOffWasReported(false), actionHelper(this, nullptr),
+				this), parameterHelper(this), childTransitionFailure(RETURN_OK), ignoreMissedRepliesCount(
-		childTransitionDelay(5000),
+				0), fdirInstance(fdirInstance), hkSwitcher(this), defaultFDIRUsed(
-		transitionSourceMode(_MODE_POWER_DOWN), transitionSourceSubMode(
+				fdirInstance == NULL), switchOffWasReported(false),executingTask(NULL), actionHelper(this, NULL), cookieInfo(), ioBoardAddress(
-		SUBMODE_NONE), deviceSwitch(setDeviceSwitch) {
+				ioBoardAddress), timeoutStart(0), childTransitionDelay(5000), transitionSourceMode(
+				_MODE_POWER_DOWN), transitionSourceSubMode(SUBMODE_NONE), deviceSwitch(
+				setDeviceSwitch) {
 	commandQueue = QueueFactory::instance()->createMessageQueue(cmdQueueSize,
 			CommandMessage::MAX_MESSAGE_SIZE);
-	insertInCommandMap(RAW_COMMAND_ID);
 	cookieInfo.state = COOKIE_UNUSED;
-	cookieInfo.pendingCommand = deviceCommandMap.end();
+	insertInCommandMap(RAW_COMMAND_ID);
-	if (comCookie == nullptr) {
+	if (this->fdirInstance == NULL) {
-		sif::error << "DeviceHandlerBase: ObjectID 0x" << std::hex <<
-				std::setw(8) << std::setfill('0') << this->getObjectId() <<
-				std::dec << ": Do not pass nullptr as a cookie, consider "
-				<< std::setfill(' ') << "passing a dummy cookie instead!" <<
-				std::endl;
-	}
-	if (this->fdirInstance == nullptr) {
 		this->fdirInstance = new DeviceHandlerFailureIsolation(setObjectId,
 				defaultFDIRParentId);
 	}
 }
 
 DeviceHandlerBase::~DeviceHandlerBase() {
-	delete comCookie;
+	communicationInterface->close(cookie);
 	if (defaultFDIRUsed) {
 		delete fdirInstance;
 	}
@@ -64,7 +56,7 @@ DeviceHandlerBase::~DeviceHandlerBase() {
 ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) {
 	this->pstStep = counter;
 
-	if (getComAction() == SEND_WRITE) {
+	if (counter == 0) {
 		cookieInfo.state = COOKIE_UNUSED;
 		readCommandQueue();
 		doStateMachine();
@@ -72,12 +64,11 @@ ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) {
 		decrementDeviceReplyMap();
 		fdirInstance->checkForFailures();
 		hkSwitcher.performOperation();
-		performOperationHook();
 	}
 	if (mode == MODE_OFF) {
 		return RETURN_OK;
 	}
-	switch (getComAction()) {
+	switch (getRmapAction()) {
 	case SEND_WRITE:
 		if ((cookieInfo.state == COOKIE_UNUSED)) {
 			buildInternalCommand();
@@ -100,91 +91,13 @@ ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) {
 	return RETURN_OK;
 }
 
-ReturnValue_t DeviceHandlerBase::initialize() {
-	ReturnValue_t result = SystemObject::initialize();
-	if (result != RETURN_OK) {
-		return result;
-	}
-
-	communicationInterface = objectManager->get<DeviceCommunicationIF>(
-			deviceCommunicationId);
-	if (communicationInterface == NULL) {
-		return RETURN_FAILED;
-	}
-
-	result = communicationInterface->initializeInterface(comCookie);
-	if (result != RETURN_OK) {
-		return result;
-	}
-
-	IPCStore = objectManager->get<StorageManagerIF>(objects::IPC_STORE);
-	if (IPCStore == NULL) {
-		return RETURN_FAILED;
-	}
-
-	AcceptsDeviceResponsesIF *rawReceiver = objectManager->get<
-			AcceptsDeviceResponsesIF>(rawDataReceiverId);
-
-	if (rawReceiver == NULL) {
-		return RETURN_FAILED;
-	}
-
-	defaultRawReceiver = rawReceiver->getDeviceQueue();
-
-	powerSwitcher = objectManager->get<PowerSwitchIF>(powerSwitcherId);
-	if (powerSwitcher == NULL) {
-		return RETURN_FAILED;
-	}
-
-	result = healthHelper.initialize();
-	if (result != RETURN_OK) {
-		return result;
-	}
-
-	result = modeHelper.initialize();
-	if (result != RETURN_OK) {
-		return result;
-	}
-	result = actionHelper.initialize(commandQueue);
-	if (result != RETURN_OK) {
-		return result;
-	}
-	result = fdirInstance->initialize();
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		return result;
-	}
-
-	result = parameterHelper.initialize();
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		return result;
-	}
-
-	result = hkSwitcher.initialize();
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		return result;
-	}
-
-	fillCommandAndReplyMap();
-
-	//Set temperature target state to NON_OP.
-	DataSet mySet;
-	PoolVariable<int8_t> thermalRequest(deviceThermalRequestPoolId, &mySet,
-			PoolVariableIF::VAR_WRITE);
-	mySet.read();
-	thermalRequest = ThermalComponentIF::STATE_REQUEST_NON_OPERATIONAL;
-	mySet.commit(PoolVariableIF::VALID);
-
-	return RETURN_OK;
-
-}
-
 void DeviceHandlerBase::decrementDeviceReplyMap() {
 	for (std::map<DeviceCommandId_t, DeviceReplyInfo>::iterator iter =
 			deviceReplyMap.begin(); iter != deviceReplyMap.end(); iter++) {
 		if (iter->second.delayCycles != 0) {
 			iter->second.delayCycles--;
 			if (iter->second.delayCycles == 0) {
-				if (iter->second.periodic) {
+				if (iter->second.periodic != 0) {
 					iter->second.delayCycles = iter->second.maxDelayCycles;
 				}
 				replyToReply(iter, TIMEOUT);
@@ -236,7 +149,7 @@ void DeviceHandlerBase::readCommandQueue() {
 		return;
 	}
 
-	replyReturnvalueToCommand(CommandMessage::UNKNOWN_COMMAND);
+	replyReturnvalueToCommand(CommandMessage::UNKNOW_COMMAND);
 
 }
 
@@ -343,49 +256,55 @@ ReturnValue_t DeviceHandlerBase::isModeCombinationValid(Mode_t mode,
 	}
 }
 
-ReturnValue_t DeviceHandlerBase::insertInCommandAndReplyMap(DeviceCommandId_t deviceCommand,
+ReturnValue_t DeviceHandlerBase::insertInCommandAndReplyMap(
-		uint16_t maxDelayCycles, size_t replyLen, bool periodic,
+		DeviceCommandId_t deviceCommand, uint16_t maxDelayCycles,
-		bool hasDifferentReplyId, DeviceCommandId_t replyId) {
+		uint8_t periodic, bool hasDifferentReplyId, DeviceCommandId_t replyId) {
-	//No need to check, as we may try to insert multiple times.
+//No need to check, as we may try to insert multiple times.
 	insertInCommandMap(deviceCommand);
 	if (hasDifferentReplyId) {
-		return insertInReplyMap(replyId, maxDelayCycles, replyLen, periodic);
+		return insertInReplyMap(replyId, maxDelayCycles, periodic);
 	} else {
-		return insertInReplyMap(deviceCommand, maxDelayCycles, replyLen, periodic);
+		return insertInReplyMap(deviceCommand, maxDelayCycles, periodic);
 	}
 }
 
 ReturnValue_t DeviceHandlerBase::insertInReplyMap(DeviceCommandId_t replyId,
-		uint16_t maxDelayCycles, size_t replyLen, bool periodic) {
+		uint16_t maxDelayCycles, uint8_t periodic) {
 	DeviceReplyInfo info;
 	info.maxDelayCycles = maxDelayCycles;
 	info.periodic = periodic;
 	info.delayCycles = 0;
-	info.replyLen = replyLen;
 	info.command = deviceCommandMap.end();
-	auto resultPair = deviceReplyMap.emplace(replyId, info);
+	std::pair<std::map<DeviceCommandId_t, DeviceReplyInfo>::iterator, bool> returnValue;
-	if (resultPair.second) {
+	returnValue = deviceReplyMap.insert(
+			std::pair<DeviceCommandId_t, DeviceReplyInfo>(replyId, info));
+	if (returnValue.second) {
 		return RETURN_OK;
 	} else {
 		return RETURN_FAILED;
 	}
 }
 
-ReturnValue_t DeviceHandlerBase::insertInCommandMap(DeviceCommandId_t deviceCommand) {
+ReturnValue_t DeviceHandlerBase::insertInCommandMap(
+		DeviceCommandId_t deviceCommand) {
 	DeviceCommandInfo info;
 	info.expectedReplies = 0;
 	info.isExecuting = false;
 	info.sendReplyTo = NO_COMMANDER;
-	auto resultPair = deviceCommandMap.emplace(deviceCommand, info);
+	std::pair<std::map<DeviceCommandId_t, DeviceCommandInfo>::iterator, bool> returnValue;
-	if (resultPair.second) {
+	returnValue = deviceCommandMap.insert(
+			std::pair<DeviceCommandId_t, DeviceCommandInfo>(deviceCommand,
+					info));
+	if (returnValue.second) {
 		return RETURN_OK;
 	} else {
 		return RETURN_FAILED;
 	}
 }
 
-ReturnValue_t DeviceHandlerBase::updateReplyMapEntry(DeviceCommandId_t deviceReply,
+ReturnValue_t DeviceHandlerBase::updateReplyMapEntry(
-		uint16_t delayCycles, uint16_t maxDelayCycles, bool periodic) {
+		DeviceCommandId_t deviceReply, uint16_t delayCycles,
+		uint16_t maxDelayCycles, uint8_t periodic) {
 	std::map<DeviceCommandId_t, DeviceReplyInfo>::iterator iter =
 			deviceReplyMap.find(deviceReply);
 	if (iter == deviceReplyMap.end()) {
@@ -413,6 +332,7 @@ void DeviceHandlerBase::callChildStatemachine() {
 }
 
 void DeviceHandlerBase::setTransition(Mode_t modeTo, Submode_t submodeTo) {
+	sif::debug<<"DeviceHandlerBase::setTransition"<<std::endl;
 	triggerEvent(CHANGING_MODE, modeTo, submodeTo);
 	childTransitionDelay = getTransitionDelayMs(mode, modeTo);
 	transitionSourceMode = mode;
@@ -509,13 +429,15 @@ void DeviceHandlerBase::replyToReply(DeviceReplyMap::iterator iter,
 
 void DeviceHandlerBase::doSendWrite() {
 	if (cookieInfo.state == COOKIE_WRITE_READY) {
-
+		sif::debug<<" DeviceHandlerBase::doSendWrite: Calling sendMessage"<<std::endl;
-		ReturnValue_t result = communicationInterface->sendMessage(comCookie,
+		ReturnValue_t result = communicationInterface->sendMessage(cookie,
 				rawPacket, rawPacketLen);
 
 		if (result == RETURN_OK) {
 			cookieInfo.state = COOKIE_WRITE_SENT;
+			sif::debug<<" DeviceHandlerBase::doSendWrite: Calling sendMessage succeeded"<<std::endl;
 		} else {
+			sif::debug<<" DeviceHandlerBase::doSendWrite: Calling sendMessage failed"<<std::endl;
 			//always generate a failure event, so that FDIR knows what's up
 			triggerEvent(DEVICE_SENDING_COMMAND_FAILED, result,
 					cookieInfo.pendingCommand->first);
@@ -528,17 +450,17 @@ void DeviceHandlerBase::doSendWrite() {
 
 void DeviceHandlerBase::doGetWrite() {
 	if (cookieInfo.state != COOKIE_WRITE_SENT) {
+//		sif::debug<<" DeviceHandlerBase::doGetWrite: COOKIE_WRITE_SENT not set"<<std::endl;
 		return;
 	}
 	cookieInfo.state = COOKIE_UNUSED;
-	ReturnValue_t result = communicationInterface->getSendSuccess(comCookie);
+	sif::debug<<" DeviceHandlerBase::doGetWrite: Calling getSendSuccess"<<std::endl;
+	ReturnValue_t result = communicationInterface->getSendSuccess(cookie);
 	if (result == RETURN_OK) {
 		if (wiretappingMode == RAW) {
 			replyRawData(rawPacket, rawPacketLen, requestedRawTraffic, true);
 		}
-
+		//We need to distinguish here, because a raw command never expects a reply. (Could be done in eRIRM, but then child implementations need to be careful.
-		//We need to distinguish here, because a raw command never expects a reply.
-		//(Could be done in eRIRM, but then child implementations need to be careful.
 		result = enableReplyInReplyMap(cookieInfo.pendingCommand);
 	} else {
 		//always generate a failure event, so that FDIR knows what's up
@@ -553,18 +475,8 @@ void DeviceHandlerBase::doGetWrite() {
 
 void DeviceHandlerBase::doSendRead() {
 	ReturnValue_t result;
-
+//	sif::debug<<" DeviceHandlerBase::doSendRead: Calling requestReceiveMessage"<<std::endl;
-	size_t requestLen = 0;
+	result = communicationInterface->requestReceiveMessage(cookie);
-	if(cookieInfo.pendingCommand != deviceCommandMap.end()) {
-		DeviceReplyIter iter = deviceReplyMap.find(
-				cookieInfo.pendingCommand->first);
-		if(iter != deviceReplyMap.end()) {
-			requestLen = iter->second.replyLen;
-		}
-	}
-
-	result = communicationInterface->requestReceiveMessage(comCookie, requestLen);
-
 	if (result == RETURN_OK) {
 		cookieInfo.state = COOKIE_READ_SENT;
 	} else {
@@ -578,10 +490,10 @@ void DeviceHandlerBase::doSendRead() {
 }
 
 void DeviceHandlerBase::doGetRead() {
-	size_t receivedDataLen;
+	uint32_t receivedDataLen;
 	uint8_t *receivedData;
 	DeviceCommandId_t foundId = 0xFFFFFFFF;
-	size_t foundLen = 0;
+	uint32_t foundLen = 0;
 	ReturnValue_t result;
 
 	if (cookieInfo.state != COOKIE_READ_SENT) {
@@ -590,9 +502,9 @@ void DeviceHandlerBase::doGetRead() {
 	}
 
 	cookieInfo.state = COOKIE_UNUSED;
-
+//	sif::debug<<" DeviceHandlerBase::doGetRead: Calling readReceivedMessage"<<std::endl;
-	result = communicationInterface->readReceivedMessage(comCookie,
+	result = communicationInterface->readReceivedMessage(cookie, &receivedData,
-			&receivedData, &receivedDataLen);
+			&receivedDataLen);
 
 	if (result != RETURN_OK) {
 		triggerEvent(DEVICE_REQUESTING_REPLY_FAILED, result);
@@ -601,7 +513,7 @@ void DeviceHandlerBase::doGetRead() {
 		return;
 	}
 
-	if (receivedDataLen == 0 or result == DeviceCommunicationIF::NO_REPLY_RECEIVED)
+	if (receivedDataLen == 0)
 		return;
 
 	if (wiretappingMode == RAW) {
@@ -615,10 +527,12 @@ void DeviceHandlerBase::doGetRead() {
 		//This approach avoids infinite loops due to buggy scanForReply routines (seen in bug 1077).
 		uint32_t remainingLength = receivedDataLen;
 		for (uint32_t count = 0; count < receivedDataLen; count++) {
+			sif::debug<<" DeviceHandlerBase::doGetRead: Calling scanForReply"<<std::endl;
 			result = scanForReply(receivedData, remainingLength, &foundId,
 					&foundLen);
 			switch (result) {
 			case RETURN_OK:
+				sif::debug<<" DeviceHandlerBase::doGetRead: Calling handle reply"<<std::endl;
 				handleReply(receivedData, foundId, foundLen);
 				break;
 			case APERIODIC_REPLY: {
@@ -632,8 +546,6 @@ void DeviceHandlerBase::doGetRead() {
 				break;
 			case IGNORE_REPLY_DATA:
 				break;
-			case IGNORE_FULL_PACKET:
-				return;
 			default:
 				//We need to wait for timeout.. don't know what command failed and who sent it.
 				replyRawReplyIfnotWiretapped(receivedData, foundLen);
@@ -655,8 +567,8 @@ ReturnValue_t DeviceHandlerBase::getStorageData(store_address_t storageAddress,
 		uint8_t * *data, uint32_t * len) {
 	size_t lenTmp;
 
-	if (IPCStore == nullptr) {
+	if (IPCStore == NULL) {
-		*data = nullptr;
+		*data = NULL;
 		*len = 0;
 		return RETURN_FAILED;
 	}
@@ -667,10 +579,90 @@ ReturnValue_t DeviceHandlerBase::getStorageData(store_address_t storageAddress,
 	} else {
 		triggerEvent(StorageManagerIF::GET_DATA_FAILED, result,
 				storageAddress.raw);
-		*data = nullptr;
+		*data = NULL;
 		*len = 0;
 		return result;
 	}
+
+}
+
+ReturnValue_t DeviceHandlerBase::initialize() {
+	ReturnValue_t result = SystemObject::initialize();
+	if (result != RETURN_OK) {
+		return result;
+	}
+
+	communicationInterface = objectManager->get<DeviceCommunicationIF>(
+			deviceCommunicationId);
+	if (communicationInterface == NULL) {
+		return RETURN_FAILED;
+	}
+
+	result = communicationInterface->open(&cookie, ioBoardAddress,
+			maxDeviceReplyLen);
+	if (result != RETURN_OK) {
+		return result;
+	}
+
+	IPCStore = objectManager->get<StorageManagerIF>(objects::IPC_STORE);
+	if (IPCStore == NULL) {
+		return RETURN_FAILED;
+	}
+
+	AcceptsDeviceResponsesIF *rawReceiver = objectManager->get<
+			AcceptsDeviceResponsesIF>(rawDataReceiverId);
+
+	if (rawReceiver == NULL) {
+		return RETURN_FAILED;
+	}
+
+	defaultRawReceiver = rawReceiver->getDeviceQueue();
+
+	powerSwitcher = objectManager->get<PowerSwitchIF>(powerSwitcherId);
+	if (powerSwitcher == NULL) {
+		return RETURN_FAILED;
+	}
+
+	result = healthHelper.initialize();
+	if (result != RETURN_OK) {
+		return result;
+	}
+
+	result = modeHelper.initialize();
+	if (result != RETURN_OK) {
+		return result;
+	}
+	result = actionHelper.initialize(commandQueue);
+	if (result != RETURN_OK) {
+		return result;
+	}
+	result = fdirInstance->initialize();
+	if (result != HasReturnvaluesIF::RETURN_OK) {
+		return result;
+	}
+
+	result = parameterHelper.initialize();
+	if (result != HasReturnvaluesIF::RETURN_OK) {
+		return result;
+	}
+
+	result = hkSwitcher.initialize();
+	if (result != HasReturnvaluesIF::RETURN_OK) {
+		return result;
+	}
+
+	fillCommandAndReplyMap();
+
+	//Set temperature target state to NON_OP.
+	DataSet mySet;
+	PoolVariable<int8_t> thermalRequest(deviceThermalRequestPoolId, &mySet,
+			PoolVariableIF::VAR_WRITE);
+	mySet.read();
+	thermalRequest = ThermalComponentIF::STATE_REQUEST_NON_OPERATIONAL;
+	mySet.commit(PoolVariableIF::VALID);
+
+	return RETURN_OK;
+
 }
 
 void DeviceHandlerBase::replyRawData(const uint8_t *data, size_t len,
@@ -702,7 +694,8 @@ void DeviceHandlerBase::replyRawData(const uint8_t *data, size_t len,
 }
 
 //Default child implementations
-DeviceHandlerIF::CommunicationAction_t DeviceHandlerBase::getComAction() {
+
+DeviceHandlerBase::RmapAction_t DeviceHandlerBase::getRmapAction() {
 	switch (pstStep) {
 	case 0:
 		return SEND_WRITE;
@@ -741,7 +734,7 @@ void DeviceHandlerBase::handleReply(const uint8_t* receivedData,
 
 	if (info->delayCycles != 0) {
 
-		if (info->periodic) {
+		if (info->periodic != 0) {
 			info->delayCycles = info->maxDelayCycles;
 		} else {
 			info->delayCycles = 0;
@@ -762,20 +755,20 @@ void DeviceHandlerBase::handleReply(const uint8_t* receivedData,
 	}
 }
 
-//ReturnValue_t DeviceHandlerBase::switchCookieChannel(object_id_t newChannelId) {
+ReturnValue_t DeviceHandlerBase::switchCookieChannel(object_id_t newChannelId) {
-//	DeviceCommunicationIF *newCommunication = objectManager->get<
+	DeviceCommunicationIF *newCommunication = objectManager->get<
-//			DeviceCommunicationIF>(newChannelId);
+			DeviceCommunicationIF>(newChannelId);
-//
+
-//	if (newCommunication != NULL) {
+	if (newCommunication != NULL) {
-//		ReturnValue_t result = newCommunication->reOpen(cookie, ioBoardAddress,
+		ReturnValue_t result = newCommunication->reOpen(cookie, ioBoardAddress,
-//				maxDeviceReplyLen);
+				maxDeviceReplyLen);
-//		if (result != RETURN_OK) {
+		if (result != RETURN_OK) {
-//			return result;
+			return result;
-//		}
+		}
-//		return RETURN_OK;
+		return RETURN_OK;
-//	}
+	}
-//	return RETURN_FAILED;
+	return RETURN_FAILED;
-//}
+}
 
 void DeviceHandlerBase::buildRawDeviceCommand(CommandMessage* commandMessage) {
 	storedRawData = DeviceHandlerMessage::getStoreAddress(commandMessage);
@@ -837,6 +830,7 @@ ReturnValue_t DeviceHandlerBase::enableReplyInReplyMap(
 
 void DeviceHandlerBase::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
 	setMode(getBaseMode(mode));
+	sif::debug<<"DeviceHandlerBase::doTransition Mode: "<<mode<<" reached"<<std::endl;
 }
 
 uint32_t DeviceHandlerBase::getTransitionDelayMs(Mode_t modeFrom,
@@ -914,6 +908,7 @@ ReturnValue_t DeviceHandlerBase::checkModeCommand(Mode_t commandedMode,
 
 void DeviceHandlerBase::startTransition(Mode_t commandedMode,
 		Submode_t commandedSubmode) {
+	sif::debug<<" DeviceHandlerBase::startTransition"<<std::endl;
 	switch (commandedMode) {
 	case MODE_ON:
 		if (mode == MODE_OFF) {
@@ -1036,6 +1031,7 @@ void DeviceHandlerBase::replyRawReplyIfnotWiretapped(const uint8_t* data,
 
 ReturnValue_t DeviceHandlerBase::handleDeviceHandlerMessage(
 		CommandMessage * message) {
+	ReturnValue_t result;
 	switch (message->getCommand()) {
 	case DeviceHandlerMessage::CMD_WIRETAPPING:
 		switch (DeviceHandlerMessage::getWiretappingMode(message)) {
@@ -1057,19 +1053,19 @@ ReturnValue_t DeviceHandlerBase::handleDeviceHandlerMessage(
 		}
 		replyReturnvalueToCommand(RETURN_OK);
 		return RETURN_OK;
-//	case DeviceHandlerMessage::CMD_SWITCH_IOBOARD:
+	case DeviceHandlerMessage::CMD_SWITCH_IOBOARD:
-//		if (mode != MODE_OFF) {
+		if (mode != MODE_OFF) {
-//			replyReturnvalueToCommand(WRONG_MODE_FOR_COMMAND);
+			replyReturnvalueToCommand(WRONG_MODE_FOR_COMMAND);
-//		} else {
+		} else {
-//			result = switchCookieChannel(
+			result = switchCookieChannel(
-//					DeviceHandlerMessage::getIoBoardObjectId(message));
+					DeviceHandlerMessage::getIoBoardObjectId(message));
-//			if (result == RETURN_OK) {
+			if (result == RETURN_OK) {
-//				replyReturnvalueToCommand(RETURN_OK);
+				replyReturnvalueToCommand(RETURN_OK);
-//			} else {
+			} else {
-//				replyReturnvalueToCommand(CANT_SWITCH_IO_ADDRESS);
+				replyReturnvalueToCommand(CANT_SWITCH_IOBOARD);
-//			}
+			}
-//		}
+		}
-//		return RETURN_OK;
+		return RETURN_OK;
 	case DeviceHandlerMessage::CMD_RAW:
 		if ((mode != MODE_RAW)) {
 			DeviceHandlerMessage::clear(message);
@@ -1085,7 +1081,7 @@ ReturnValue_t DeviceHandlerBase::handleDeviceHandlerMessage(
 
 void DeviceHandlerBase::setParentQueue(MessageQueueId_t parentQueueId) {
 	modeHelper.setParentQueue(parentQueueId);
-	healthHelper.setParentQueue(parentQueueId);
+	healthHelper.setParentQeueue(parentQueueId);
 }
 
 bool DeviceHandlerBase::isAwaitingReply() {
@@ -1149,7 +1145,7 @@ void DeviceHandlerBase::handleDeviceTM(SerializeIF* data,
 }
 
 ReturnValue_t DeviceHandlerBase::executeAction(ActionId_t actionId,
-		MessageQueueId_t commandedBy, const uint8_t* data, size_t size) {
+		MessageQueueId_t commandedBy, const uint8_t* data, uint32_t size) {
 	ReturnValue_t result = acceptExternalDeviceCommands();
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
@@ -1178,8 +1174,8 @@ void DeviceHandlerBase::buildInternalCommand(void) {
 	if (mode == MODE_NORMAL) {
 		result = buildNormalDeviceCommand(&deviceCommandId);
 		if (result == BUSY) {
-			sif::debug << std::hex << getObjectId()
+//			sif::debug << std::hex << getObjectId()
-					<< ": DHB::buildInternalCommand busy" << std::endl; //so we can track misconfigurations
+//					<< ": DeviceHandlerBase::buildInternalCommand busy" << std::endl; //so we can track misconfigurations
 			result = NOTHING_TO_SEND; //no need to report this
 		}
 	} else if (mode == MODE_RAW) {
@@ -1199,9 +1195,9 @@ void DeviceHandlerBase::buildInternalCommand(void) {
 		if (iter == deviceCommandMap.end()) {
 			result = COMMAND_NOT_SUPPORTED;
 		} else if (iter->second.isExecuting) {
-			sif::debug << std::hex << getObjectId()
+//			sif::debug << std::hex << getObjectId()
-					<< ": DHB::buildInternalCommand: Command "
+//					<< ": DHB::buildInternalCommand: Command "
-					<< deviceCommandId << " isExecuting" << std::endl; //so we can track misconfigurations
+//					<< deviceCommandId << " isExecuting" << std::endl; //so we can track misconfigurations
 			return; //this is an internal command, no need to report a failure here, missed reply will track if a reply is too late, otherwise, it's ok
 		} else {
 			iter->second.sendReplyTo = NO_COMMANDER;
@@ -1283,9 +1279,3 @@ void DeviceHandlerBase::changeHK(Mode_t mode, Submode_t submode, bool enable) {
 void DeviceHandlerBase::setTaskIF(PeriodicTaskIF* task_){
 			executingTask = task_;
 }
-
-// Default implementations empty.
-void DeviceHandlerBase::debugInterface(uint8_t positionTracker,
-		object_id_t objectId, uint32_t parameter) {}
-
-void DeviceHandlerBase::performOperationHook() {}

devicehandlers/DeviceHandlerIF.h

@@ -8,8 +8,7 @@
 #include <framework/ipc/MessageQueueSenderIF.h>
 
 /**
- * @brief 	This is the Interface used to communicate with a device handler.
+ * This is the Interface used to communicate with a device handler.
- * @details Includes all expected return values, events and modes.
  *
  */
 class DeviceHandlerIF {
@@ -23,127 +22,93 @@ public:
 	 *
 	 * @details The mode of the device handler must not be confused with the mode the device is in.
 	 * The mode of the device itself is transparent to the user but related to the mode of the handler.
-	 * MODE_ON and MODE_OFF are included in hasModesIF.h
 	 */
+//		MODE_ON = 0, //!< The device is powered and ready to perform operations. In this mode, no commands are sent by the device handler itself, but direct commands van be commanded and will be interpreted
+//		MODE_OFF = 1, //!< The device is powered off. The only command accepted in this mode is a mode change to on.
+		static const Mode_t MODE_NORMAL = 2; //!< The device is powered on and the device handler periodically sends commands. The commands to be sent are selected by the handler according to the submode.
+		static const Mode_t MODE_RAW = 3; //!< The device is powered on and ready to perform operations. In this mode, raw commands can be sent. The device handler will send all replies received from the command back to the commanding object.
+		static const Mode_t MODE_ERROR_ON = 4; //!4< The device is shut down but the switch could not be turned off, so the device still is powered. In this mode, only a mode change to @c MODE_OFF can be commanded, which tries to switch off the device again.
+		static const Mode_t _MODE_START_UP = TRANSITION_MODE_CHILD_ACTION_MASK | 5; //!< This is a transitional state which can not be commanded. The device handler performs all commands to get the device in a state ready to perform commands. When this is completed, the mode changes to @c MODE_ON.
+		static const Mode_t _MODE_SHUT_DOWN = TRANSITION_MODE_CHILD_ACTION_MASK | 6; //!< This is a transitional state which can not be commanded. The device handler performs all actions and commands to get the device shut down. When the device is off, the mode changes to @c MODE_OFF.
+		static const Mode_t _MODE_TO_ON = TRANSITION_MODE_CHILD_ACTION_MASK | HasModesIF::MODE_ON;
+		static const Mode_t _MODE_TO_RAW = TRANSITION_MODE_CHILD_ACTION_MASK | MODE_RAW;
+		static const Mode_t _MODE_TO_NORMAL = TRANSITION_MODE_CHILD_ACTION_MASK | MODE_NORMAL;
+		static const Mode_t _MODE_POWER_DOWN = TRANSITION_MODE_BASE_ACTION_MASK | 1; //!< This is a transitional state which can not be commanded. The device is shut down and ready to be switched off. After the command to set the switch off has been sent, the mode changes to @c MODE_WAIT_OFF
+		static const Mode_t _MODE_POWER_ON = TRANSITION_MODE_BASE_ACTION_MASK | 2; //!< This is a transitional state which can not be commanded. The device will be switched on in this state. After the command to set the switch on has been sent, the mode changes to @c MODE_WAIT_ON
+		static const Mode_t _MODE_WAIT_OFF = TRANSITION_MODE_BASE_ACTION_MASK | 3; //!< This is a transitional state which can not be commanded. The switch has been commanded off and the handler waits for it to be off. When the switch is off, the mode changes to @c MODE_OFF.
+		static const Mode_t _MODE_WAIT_ON = TRANSITION_MODE_BASE_ACTION_MASK | 4; //!< This is a transitional state which can not be commanded. The switch has been commanded on and the handler waits for it to be on. When the switch is on, the mode changes to @c MODE_TO_ON.
+		static const Mode_t _MODE_SWITCH_IS_OFF = TRANSITION_MODE_BASE_ACTION_MASK | 5; //!< This is a transitional state which can not be commanded. The switch has been commanded off and is off now. This state is only to do an RMAP cycle once more where the doSendRead() function will set the mode to MODE_OFF. The reason to do this is to get rid of stuck packets in the IO Board
 
-	// MODE_ON = 0, //!< The device is powered and ready to perform operations. In this mode, no commands are sent by the device handler itself, but direct commands van be commanded and will be interpreted
+		static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::CDH;
-	// MODE_OFF = 1, //!< The device is powered off. The only command accepted in this mode is a mode change to on.
+		static const Event DEVICE_BUILDING_COMMAND_FAILED = MAKE_EVENT(0, SEVERITY::LOW);
-	//! The device is powered on and the device handler periodically sends
+		static const Event DEVICE_SENDING_COMMAND_FAILED = MAKE_EVENT(1, SEVERITY::LOW);
-	//! commands. The commands to be sent are selected by the handler
+		static const Event DEVICE_REQUESTING_REPLY_FAILED = MAKE_EVENT(2, SEVERITY::LOW);
-	//! according to the submode.
+		static const Event DEVICE_READING_REPLY_FAILED = MAKE_EVENT(3, SEVERITY::LOW);
-	static const Mode_t MODE_NORMAL = 2;
+		static const Event DEVICE_INTERPRETING_REPLY_FAILED = MAKE_EVENT(4, SEVERITY::LOW);
-	//! The device is powered on and ready to perform operations. In this mode,
+		static const Event DEVICE_MISSED_REPLY = MAKE_EVENT(5, SEVERITY::LOW);
-	//! raw commands can be sent. The device handler will send all replies
+		static const Event DEVICE_UNKNOWN_REPLY = MAKE_EVENT(6, SEVERITY::LOW);
-	//! received from the command back to the commanding object.
+		static const Event DEVICE_UNREQUESTED_REPLY = MAKE_EVENT(7, SEVERITY::LOW);
-	static const Mode_t MODE_RAW = 3;
+		static const Event INVALID_DEVICE_COMMAND = MAKE_EVENT(8, SEVERITY::LOW); //!< Indicates a SW bug in child class.
-	//! The device is shut down but the switch could not be turned off, so the
+		static const Event MONITORING_LIMIT_EXCEEDED = MAKE_EVENT(9, SEVERITY::LOW);
-	//! device still is powered. In this mode, only a mode change to @c MODE_OFF
+		static const Event MONITORING_AMBIGUOUS = MAKE_EVENT(10, SEVERITY::HIGH);
-	//! can be commanded, which tries to switch off the device again.
-	static const Mode_t MODE_ERROR_ON = 4;
-	//! This is a transitional state which can not be commanded. The device
-	//! handler performs all commands to get the device in a state ready to
-	//! perform commands. When this is completed, the mode changes to @c MODE_ON.
-	static const Mode_t _MODE_START_UP = TRANSITION_MODE_CHILD_ACTION_MASK | 5;
-	//! This is a transitional state which can not be commanded.
-	//! The device handler performs all actions and commands to get the device
-	//! shut down. When the device is off, the mode changes to @c MODE_OFF.
-	static const Mode_t _MODE_SHUT_DOWN = TRANSITION_MODE_CHILD_ACTION_MASK | 6;
-	//! It is possible to set the mode to _MODE_TO_ON to use the to on
-	//! transition if available.
-	static const Mode_t _MODE_TO_ON = TRANSITION_MODE_CHILD_ACTION_MASK | HasModesIF::MODE_ON;
-	//! It is possible to set the mode to _MODE_TO_RAW to use the to raw
-	//! transition if available.
-	static const Mode_t _MODE_TO_RAW = TRANSITION_MODE_CHILD_ACTION_MASK | MODE_RAW;
-	//! It is possible to set the mode to _MODE_TO_NORMAL to use the to normal
-	//! transition if available.
-	static const Mode_t _MODE_TO_NORMAL = TRANSITION_MODE_CHILD_ACTION_MASK | MODE_NORMAL;
-	//! This is a transitional state which can not be commanded.
-	//! The device is shut down and ready to be switched off.
-	//! After the command to set the switch off has been sent,
-	//! the mode changes to @c MODE_WAIT_OFF
-	static const Mode_t _MODE_POWER_DOWN = TRANSITION_MODE_BASE_ACTION_MASK | 1;
-	//! This is a transitional state which can not be commanded. The device
-	//! will be switched on in this state. After the command to set the switch
-	//! on has been sent, the mode changes to @c MODE_WAIT_ON.
-	static const Mode_t _MODE_POWER_ON = TRANSITION_MODE_BASE_ACTION_MASK | 2;
-	//! This is a transitional state which can not be commanded. The switch has
-	//! been commanded off and the handler waits for it to be off.
-	//! When the switch is off, the mode changes to @c MODE_OFF.
-	static const Mode_t _MODE_WAIT_OFF = TRANSITION_MODE_BASE_ACTION_MASK | 3;
-	//! This is a transitional state which can not be commanded. The switch
-	//! has been commanded on and the handler waits for it to be on.
-	//! When the switch is on, the mode changes to @c MODE_TO_ON.
-	static const Mode_t _MODE_WAIT_ON = TRANSITION_MODE_BASE_ACTION_MASK | 4;
-	//! This is a transitional state which can not be commanded. The switch has
-	//! been commanded off and is off now. This state is only to do an RMAP
-	//! cycle once more where the doSendRead() function will set the mode to
-	//! MODE_OFF. The reason to do this is to get rid of stuck packets in the IO Board.
-	static const Mode_t _MODE_SWITCH_IS_OFF = TRANSITION_MODE_BASE_ACTION_MASK | 5;
 
-	static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::CDH;
+		static const uint8_t INTERFACE_ID = CLASS_ID::DEVICE_HANDLER_IF;
-	static const Event DEVICE_BUILDING_COMMAND_FAILED = MAKE_EVENT(0, SEVERITY::LOW);
+		static const ReturnValue_t NO_COMMAND_DATA = MAKE_RETURN_CODE(0xA0);
-	static const Event DEVICE_SENDING_COMMAND_FAILED = MAKE_EVENT(1, SEVERITY::LOW);
+		static const ReturnValue_t COMMAND_NOT_SUPPORTED = MAKE_RETURN_CODE(0xA1);
-	static const Event DEVICE_REQUESTING_REPLY_FAILED = MAKE_EVENT(2, SEVERITY::LOW);
+		static const ReturnValue_t COMMAND_ALREADY_SENT = MAKE_RETURN_CODE(0xA2);
-	static const Event DEVICE_READING_REPLY_FAILED = MAKE_EVENT(3, SEVERITY::LOW);
+		static const ReturnValue_t COMMAND_WAS_NOT_SENT = MAKE_RETURN_CODE(0xA3);
-	static const Event DEVICE_INTERPRETING_REPLY_FAILED = MAKE_EVENT(4, SEVERITY::LOW);
+		static const ReturnValue_t CANT_SWITCH_IOBOARD = MAKE_RETURN_CODE(0xA4);
-	static const Event DEVICE_MISSED_REPLY = MAKE_EVENT(5, SEVERITY::LOW);
+		static const ReturnValue_t WRONG_MODE_FOR_COMMAND = MAKE_RETURN_CODE(0xA5);
-	static const Event DEVICE_UNKNOWN_REPLY = MAKE_EVENT(6, SEVERITY::LOW);
+		static const ReturnValue_t TIMEOUT = MAKE_RETURN_CODE(0xA6);
-	static const Event DEVICE_UNREQUESTED_REPLY = MAKE_EVENT(7, SEVERITY::LOW);
+		static const ReturnValue_t BUSY = MAKE_RETURN_CODE(0xA7);
-	static const Event INVALID_DEVICE_COMMAND = MAKE_EVENT(8, SEVERITY::LOW); //!< Indicates a SW bug in child class.
+		static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8); //!< Used to indicate that this is a command-only command.
-	static const Event MONITORING_LIMIT_EXCEEDED = MAKE_EVENT(9, SEVERITY::LOW);
+		static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9);
-	static const Event MONITORING_AMBIGUOUS = MAKE_EVENT(10, SEVERITY::HIGH);
+		static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA);
 
-	static const uint8_t INTERFACE_ID = CLASS_ID::DEVICE_HANDLER_IF;
+		//standard codes used in scan for reply
+	//	static const ReturnValue_t TOO_SHORT = MAKE_RETURN_CODE(0xB1);
+		static const ReturnValue_t CHECKSUM_ERROR = MAKE_RETURN_CODE(0xB2);
+		static const ReturnValue_t LENGTH_MISSMATCH = MAKE_RETURN_CODE(0xB3);
+		static const ReturnValue_t INVALID_DATA = MAKE_RETURN_CODE(0xB4);
+		static const ReturnValue_t PROTOCOL_ERROR = MAKE_RETURN_CODE(0xB5);
 
-	// Standard codes used when building commands.
+		//standard codes used in  interpret device reply
-	static const ReturnValue_t NO_COMMAND_DATA = MAKE_RETURN_CODE(0xA0); //!< If the command size is 0. Checked in DHB
+		static const ReturnValue_t DEVICE_DID_NOT_EXECUTE = MAKE_RETURN_CODE(0xC1); //the device reported, that it did not execute the command
-	static const ReturnValue_t COMMAND_NOT_SUPPORTED = MAKE_RETURN_CODE(0xA1); //!< Command ID not in commandMap. Checked in DHB
+		static const ReturnValue_t DEVICE_REPORTED_ERROR = MAKE_RETURN_CODE(0xC2);
-	static const ReturnValue_t COMMAND_ALREADY_SENT = MAKE_RETURN_CODE(0xA2); //!< Command was already executed. Checked in DHB
+		static const ReturnValue_t UNKNOW_DEVICE_REPLY = MAKE_RETURN_CODE(0xC3); //the deviceCommandId reported by scanforReply is unknown
-	static const ReturnValue_t COMMAND_WAS_NOT_SENT = MAKE_RETURN_CODE(0xA3);
+		static const ReturnValue_t DEVICE_REPLY_INVALID = MAKE_RETURN_CODE(0xC4); //syntax etc is correct but still not ok, eg parameters where none are expected
-	static const ReturnValue_t CANT_SWITCH_ADDRESS = MAKE_RETURN_CODE(0xA4);
-	static const ReturnValue_t WRONG_MODE_FOR_COMMAND = MAKE_RETURN_CODE(0xA5);
-	static const ReturnValue_t TIMEOUT = MAKE_RETURN_CODE(0xA6);
-	static const ReturnValue_t BUSY = MAKE_RETURN_CODE(0xA7);
-	static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8); //!< Used to indicate that this is a command-only command.
-	static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9);
-	static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA);
 
-	// Standard codes used in scanForReply
+		//Standard codes used in buildCommandFromCommand
-	static const ReturnValue_t CHECKSUM_ERROR = MAKE_RETURN_CODE(0xB0);
+		static const ReturnValue_t INVALID_COMMAND_PARAMETER = MAKE_RETURN_CODE(
-	static const ReturnValue_t LENGTH_MISSMATCH = MAKE_RETURN_CODE(0xB1);
+				0xD0);
-	static const ReturnValue_t INVALID_DATA = MAKE_RETURN_CODE(0xB2);
+		static const ReturnValue_t INVALID_NUMBER_OR_LENGTH_OF_PARAMETERS =
-	static const ReturnValue_t PROTOCOL_ERROR = MAKE_RETURN_CODE(0xB3);
+				MAKE_RETURN_CODE(0xD1);
-
-	// Standard codes used in  interpretDeviceReply
-	static const ReturnValue_t DEVICE_DID_NOT_EXECUTE = MAKE_RETURN_CODE(0xC0); //the device reported, that it did not execute the command
-	static const ReturnValue_t DEVICE_REPORTED_ERROR = MAKE_RETURN_CODE(0xC1);
-	static const ReturnValue_t UNKNOW_DEVICE_REPLY = MAKE_RETURN_CODE(0xC2); //the deviceCommandId reported by scanforReply is unknown
-	static const ReturnValue_t DEVICE_REPLY_INVALID = MAKE_RETURN_CODE(0xC3); //syntax etc is correct but still not ok, eg parameters where none are expected
-
-	// Standard codes used in buildCommandFromCommand
-	static const ReturnValue_t INVALID_COMMAND_PARAMETER = MAKE_RETURN_CODE(0xD0);
-	static const ReturnValue_t INVALID_NUMBER_OR_LENGTH_OF_PARAMETERS = MAKE_RETURN_CODE(0xD1);
-
-	/**
-	 * Communication action that will be executed.
-	 *
-	 * This is used by the child class to tell the base class what to do.
-	 */
-	enum CommunicationAction_t: uint8_t {
-		SEND_WRITE,//!< Send write
-		GET_WRITE, //!< Get write
-		SEND_READ, //!< Send read
-		GET_READ,  //!< Get read
-		NOTHING    //!< Do nothing.
-	};
 
+		/**
+		 * RMAP Action that will be executed.
+		 *
+		 * This is used by the child class to tell the base class what to do.
+		 */
+		enum RmapAction_t {
+			SEND_WRITE,//!< RMAP send write
+			GET_WRITE, //!< RMAP get write
+			SEND_READ, //!< RMAP send read
+			GET_READ,  //!< RMAP get read
+			NOTHING    //!< Do nothing.
+		};
 	/**
 	 * Default Destructor
 	 */
-	virtual ~DeviceHandlerIF() {}
+	virtual ~DeviceHandlerIF() {
+
+	}
 
 	/**
 	 * This MessageQueue is used to command the device handler.
+	 *
+	 * To command a device handler, a DeviceHandlerCommandMessage can be sent to this Queue.
+	 * The handler replies with a DeviceHandlerCommandMessage containing the DeviceHandlerCommand_t reply.
+	 *
 	 * @return the id of the MessageQueue
 	 */
 	virtual MessageQueueId_t getCommandQueue() const = 0;

devicehandlers/DeviceTmReportingWrapper.cpp

@@ -12,35 +12,35 @@ DeviceTmReportingWrapper::~DeviceTmReportingWrapper() {
 }
 
 ReturnValue_t DeviceTmReportingWrapper::serialize(uint8_t** buffer,
-		size_t* size, size_t maxSize, Endianness streamEndianness) const {
+		uint32_t* size, const uint32_t max_size, bool bigEndian) const {
-	ReturnValue_t result = SerializeAdapter::serialize(&objectId,
+	ReturnValue_t result = SerializeAdapter<object_id_t>::serialize(&objectId,
-			buffer, size, maxSize, streamEndianness);
+			buffer, size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::serialize(&actionId, buffer,
+	result = SerializeAdapter<ActionId_t>::serialize(&actionId, buffer,
-			size, maxSize, streamEndianness);
+			size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	return data->serialize(buffer, size, maxSize, streamEndianness);
+	return data->serialize(buffer, size, max_size, bigEndian);
 }
 
-size_t DeviceTmReportingWrapper::getSerializedSize() const {
+uint32_t DeviceTmReportingWrapper::getSerializedSize() const {
 	return sizeof(objectId) + sizeof(ActionId_t) + data->getSerializedSize();
 }
 
 ReturnValue_t DeviceTmReportingWrapper::deSerialize(const uint8_t** buffer,
-		size_t* size, Endianness streamEndianness) {
+		int32_t* size, bool bigEndian) {
-	ReturnValue_t result = SerializeAdapter::deSerialize(&objectId,
+	ReturnValue_t result = SerializeAdapter<object_id_t>::deSerialize(&objectId,
-			buffer, size, streamEndianness);
+			buffer, size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::deSerialize(&actionId, buffer,
+	result = SerializeAdapter<ActionId_t>::deSerialize(&actionId, buffer,
-			size, streamEndianness);
+			size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	return data->deSerialize(buffer, size, streamEndianness);
+	return data->deSerialize(buffer, size, bigEndian);
 }

devicehandlers/DeviceTmReportingWrapper.h

@@ -11,13 +11,13 @@ public:
 			SerializeIF *data);
 	virtual ~DeviceTmReportingWrapper();
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 private:
 	object_id_t objectId;
 	ActionId_t actionId;

devicehandlers/FixedSequenceSlot.cpp

@@ -16,5 +16,6 @@ FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,
 	handler->setTaskIF(executingTask);
 }
 
-FixedSequenceSlot::~FixedSequenceSlot() {}
+FixedSequenceSlot::~FixedSequenceSlot() {
+}
 

devicehandlers/FixedSequenceSlot.h

@@ -13,47 +13,35 @@
 class PeriodicTaskIF;
 
 /**
- * @brief	This class is the representation of a single polling sequence table entry.
+ * \brief	This class is the representation of a single polling sequence table entry.
  *
- * @details	The PollingSlot class is the representation of a single polling
+ * \details	The PollingSlot class is the representation of a single polling sequence table entry.
- * 			sequence table entry.
  */
 class FixedSequenceSlot {
 public:
-	FixedSequenceSlot( object_id_t handlerId, uint32_t setTimeMs,
+			FixedSequenceSlot( object_id_t handlerId, uint32_t setTimeMs, int8_t setSequenceId, PeriodicTaskIF* executingTask );
-			int8_t setSequenceId, PeriodicTaskIF* executingTask );
 	virtual ~FixedSequenceSlot();
 
 	/**
-	 * @brief	Handler identifies which device handler object is executed in this slot.
+	 * \brief	\c handler identifies which device handler object is executed in this slot.
 	 */
 	ExecutableObjectIF*	handler;
 
 	/**
-	 * @brief	This attribute defines when a device handler object is executed.
+	 * \brief	This attribute defines when a device handler object is executed.
 	 *
-	 * @details	The pollingTime attribute identifies the time the handler is executed in ms.
+	 * \details	The pollingTime attribute identifies the time the handler is executed in ms. It must be
-	 * 			It must be smaller than the period length of the polling sequence.
+	 * 			smaller than the period length of the polling sequence, what is ensured by automated calculation
+	 * 			from a database.
 	 */
 	uint32_t	pollingTimeMs;
 
 	/**
-	 * @brief	This value defines the type of device communication.
+	 * \brief	This value defines the type of device communication.
 	 *
-	 * @details	The state of this value decides what communication routine is
+	 * \details	The state of this value decides what communication routine is called in the PST executable or the device handler object.
-	 * 			called in the PST executable or the device handler object.
 	 */
 	uint8_t			opcode;
-
-	/**
-	 * @brief 	Operator overload for the comparison operator to
-	 * 			allow sorting by polling time.
-	 * @param fixedSequenceSlot
-	 * @return
-	 */
-	bool operator <(const FixedSequenceSlot & fixedSequenceSlot) const {
-		return pollingTimeMs < fixedSequenceSlot.pollingTimeMs;
-	}
 };
 
 

devicehandlers/FixedSlotSequence.cpp

@@ -7,12 +7,17 @@ FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
 }
 
 FixedSlotSequence::~FixedSlotSequence() {
-	// Call the destructor on each list entry.
+	std::list<FixedSequenceSlot*>::iterator slotIt;
-	slotList.clear();
+	//Iterate through slotList and delete all entries.
+	slotIt = this->slotList.begin();
+	while (slotIt != this->slotList.end()) {
+		delete (*slotIt);
+		slotIt++;
+	}
 }
 
 void FixedSlotSequence::executeAndAdvance() {
-	current->handler->performOperation(current->opcode);
+	(*this->current)->handler->performOperation((*this->current)->opcode);
 //	if (returnValue != RETURN_OK) {
 //		this->sendErrorMessage( returnValue );
 //	}
@@ -26,50 +31,53 @@ void FixedSlotSequence::executeAndAdvance() {
 
 uint32_t FixedSlotSequence::getIntervalToNextSlotMs() {
 	uint32_t oldTime;
-	SlotListIter slotListIter = current;
+	std::list<FixedSequenceSlot*>::iterator it;
+	it = current;
 	// Get the pollingTimeMs of the current slot object.
-	oldTime = slotListIter->pollingTimeMs;
+	oldTime = (*it)->pollingTimeMs;
 	// Advance to the next object.
-	slotListIter++;
+	it++;
 	// Find the next interval which is not 0.
-	while (slotListIter != slotList.end()) {
+	while (it != slotList.end()) {
-		if (oldTime != slotListIter->pollingTimeMs) {
+		if (oldTime != (*it)->pollingTimeMs) {
-			return slotListIter->pollingTimeMs - oldTime;
+			return (*it)->pollingTimeMs - oldTime;
 		} else {
-			slotListIter++;
+			it++;
 		}
 	}
 	// If the list end is reached (this is definitely an interval != 0),
 	// the interval is calculated by subtracting the remaining time of the PST
 	// and adding the start time of the first handler in the list.
-	slotListIter = slotList.begin();
+	it = slotList.begin();
-	return lengthMs - oldTime + slotListIter->pollingTimeMs;
+	return lengthMs - oldTime + (*it)->pollingTimeMs;
 }
 
 uint32_t FixedSlotSequence::getIntervalToPreviousSlotMs() {
 	uint32_t currentTime;
-	SlotListIter slotListIter = current;
+	std::list<FixedSequenceSlot*>::iterator it;
+	it = current;
 	// Get the pollingTimeMs of the current slot object.
-	currentTime = slotListIter->pollingTimeMs;
+	currentTime = (*it)->pollingTimeMs;
 
 	//if it is the first slot, calculate difference to last slot
-	if (slotListIter == slotList.begin()){
+	if (it == slotList.begin()){
-		return lengthMs - (--slotList.end())->pollingTimeMs + currentTime;
+		return lengthMs - (*(--slotList.end()))->pollingTimeMs + currentTime;
 	}
 	// get previous slot
-	slotListIter--;
+	it--;
 
-	return currentTime - slotListIter->pollingTimeMs;
+	return currentTime - (*it)->pollingTimeMs;
 }
 
 bool FixedSlotSequence::slotFollowsImmediately() {
-	uint32_t currentTime = current->pollingTimeMs;
+	uint32_t currentTime = (*current)->pollingTimeMs;
-	SlotListIter fixedSequenceIter = this->current;
+	std::list<FixedSequenceSlot*>::iterator it;
+	it = this->current;
 	// Get the pollingTimeMs of the current slot object.
-	if (fixedSequenceIter == slotList.begin())
+	if (it == slotList.begin())
 		return false;
-	fixedSequenceIter--;
+	it--;
-	if (fixedSequenceIter->pollingTimeMs == currentTime) {
+	if ((*it)->pollingTimeMs == currentTime) {
 		return true;
 	} else {
 		return false;
@@ -85,30 +93,26 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
 		sif::error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
-
 	auto slotIt = slotList.begin();
 	uint32_t count = 0;
 	uint32_t time = 0;
 	while (slotIt != slotList.end()) {
-		if (slotIt->handler == nullptr) {
+		if ((*slotIt)->handler == NULL) {
 			sif::error << "FixedSlotSequene::initialize: ObjectId does not exist!"
 					<< std::endl;
 			count++;
-		} else if (slotIt->pollingTimeMs < time) {
+		} else if ((*slotIt)->pollingTimeMs < time) {
 			sif::error << "FixedSlotSequence::initialize: Time: "
-					<< slotIt->pollingTimeMs
+					<< (*slotIt)->pollingTimeMs
 					<< " is smaller than previous with " << time << std::endl;
 			count++;
 		} else {
-			// All ok, print slot.
+			//All ok, print slot.
-			//info << "Current slot polling time: " << std::endl;
+//			(*slotIt)->print();
-			//info << std::dec << slotIt->pollingTimeMs << std::endl;
 		}
-		time = slotIt->pollingTimeMs;
+		time = (*slotIt)->pollingTimeMs;
 		slotIt++;
 	}
-	//info << "Number of elements in slot list: "
-	//	   << slotList.size() << std::endl;
 	if (count > 0) {
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
@@ -117,7 +121,8 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
 
 void FixedSlotSequence::addSlot(object_id_t componentId, uint32_t slotTimeMs,
 		int8_t executionStep, PeriodicTaskIF* executingTask) {
-	this->slotList.insert(FixedSequenceSlot(componentId, slotTimeMs, executionStep,
+	this->slotList.push_back(
-			executingTask));
+			new FixedSequenceSlot(componentId, slotTimeMs, executionStep,
+					executingTask));
 	this->current = slotList.begin();
 }

devicehandlers/FixedSlotSequence.h

@@ -1,9 +1,9 @@
-#ifndef FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
+#ifndef FIXEDSLOTSEQUENCE_H_
-#define FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
+#define FIXEDSLOTSEQUENCE_H_
 
 #include <framework/devicehandlers/FixedSequenceSlot.h>
 #include <framework/objectmanager/SystemObject.h>
-#include <set>
+#include <list>
 
 /**
  * @brief	This class is the representation of a Polling Sequence Table in software.
@@ -24,39 +24,30 @@
  */
 class FixedSlotSequence {
 public:
-	using SlotList = std::multiset<FixedSequenceSlot>;
-	using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
 
 	/**
-	 * @brief	The constructor of the FixedSlotSequence object.
+	 * \brief	The constructor of the FixedSlotSequence object.
 	 *
-	 * @details	The constructor takes two arguments, the period length and the init function.
+	 * \details	The constructor takes two arguments, the period length and the init function.
 	 *
-	 * @param	setLength	The period length, expressed in ms.
+	 * \param	setLength	The period length, expressed in ms.
 	 */
 	FixedSlotSequence(uint32_t setLengthMs);
 
 	/**
-	 * @brief	The destructor of the FixedSlotSequence object.
+	 * \brief	The destructor of the FixedSlotSequence object.
 	 *
-	 * @details	The destructor frees all allocated memory by iterating through the slotList
+	 * \details	The destructor frees all allocated memory by iterating through the slotList
 	 *  		and deleting all allocated resources.
 	 */
 	virtual ~FixedSlotSequence();
 
 	/**
-	 * @brief	This is a method to add an PollingSlot object to slotList.
+	 * \brief	This is a method to add an PollingSlot object to slotList.
 	 *
-	 * @details	Here, a polling slot object is added to the slot list. It is appended
+	 * \details	Here, a polling slot object is added to the slot list. It is appended
 	 * 			to the end of the list. The list is currently NOT reordered.
 	 * 			Afterwards, the iterator current is set to the beginning of the list.
-	 * 	@param Object ID of the object to add
-	 * 	@param setTime Value between (0 to 1) * slotLengthMs, when a FixedTimeslotTask
-	 * 				   will be called inside the slot period.
-	 * 	@param setSequenceId ID which can be used to distinguish
-	 * 	                     different task operations
-	 * 	@param
-	 * 	@param
 	 */
 	void addSlot(object_id_t handlerId, uint32_t setTime, int8_t setSequenceId,
 			PeriodicTaskIF* executingTask);
@@ -70,59 +61,47 @@ public:
 	bool slotFollowsImmediately();
 
 	/**
-	 * @brief	This method returns the time until the next software
+	 * \brief	This method returns the time until the next software component is invoked.
-	 * 			component is invoked.
 	 *
-	 * @details
+	 * \details	This method is vitally important for the operation of the PST. By fetching the polling time
-	 * This method is vitally important for the operation of the PST.
+	 * 			of the current slot and that of the next one (or the first one, if the list end is reached)
-	 * By fetching the polling time of the current slot and that of the
+	 * 			it calculates and returns the interval in milliseconds within which the handler execution
-	 * next one (or the first one, if the list end is reached)
+	 * 			shall take place. If the next slot has the same time as the current one, it is ignored until
-	 * it calculates and returns the interval in milliseconds within
+	 * 			a slot with different time or the end of the PST is found.
-	 * which the handler execution shall take place.
-	 * If the next slot has the same time as the current one, it is ignored
-	 * until a slot with different time or the end of the PST is found.
 	 */
 	uint32_t getIntervalToNextSlotMs();
 
 	/**
-	 * @brief	This method returns the time difference between the current
+	 * \brief	This method returns the time difference between the current slot and the previous slot
-	 * 			slot and the previous slot
 	 *
-	 * @details
+	 * \details	This method is vitally important for the operation of the PST. By fetching the polling time
-	 * This method is vitally important for the operation of the PST.
+	 * 			of the current slot and that of the prevous one (or the last one, if the slot is the first one)
-	 * By fetching the polling time of the current slot and that of the previous
+	 * 			it calculates and returns the interval in milliseconds that the handler execution shall be delayed.
-	 * one (or the last one, if the slot is the first one) it calculates and
-	 * returns the interval in milliseconds that the handler execution shall
-	 * be delayed.
 	 */
 	uint32_t getIntervalToPreviousSlotMs();
 
 	/**
-	 * @brief	This method returns the length of this FixedSlotSequence instance.
+	 * \brief	This method returns the length of this FixedSlotSequence instance.
 	 */
 	uint32_t getLengthMs() const;
 
 	/**
-	 * @brief	The method to execute the device handler entered in the current
+	 * \brief	The method to execute the device handler entered in the current OPUSPollingSlot object.
-	 * 			PollingSlot object.
 	 *
-	 * @details
+	 * \details	Within this method the device handler object to be executed is chosen by looking up the
-	 * Within this method the device handler object to be executed is chosen by
+	 * 			handler address of the current slot in the handlerMap. Either the device handler's
-	 * looking up the handler address of the current slot in the handlerMap.
+	 * 			talkToInterface or its listenToInterface method is invoked, depending on the isTalking flag
-	 * Either the device handler's talkToInterface or its listenToInterface
+	 * 			of the polling slot. After execution the iterator current is increased or, by reaching the
-	 * method is invoked, depending on the isTalking flag of the polling slot.
+	 * 			end of slotList, reset to the beginning.
-	 * After execution the iterator current is increased or, by reaching the
-	 * end of slotList, reset to the beginning.
 	 */
 	void executeAndAdvance();
 
 	/**
-	 * @brief	An iterator that indicates the current polling slot to execute.
+	 * \brief	An iterator that indicates the current polling slot to execute.
 	 *
-	 * @details	This is an iterator for slotList and always points to the
+	 * \details	This is an iterator for slotList and always points to the polling slot which is executed next.
-	 * 			polling slot which is executed next.
 	 */
-	SlotListIter current;
+	std::list<FixedSequenceSlot*>::iterator current;
 
 	/**
 	 * Iterate through slotList and check successful creation.
@@ -130,21 +109,18 @@ public:
 	 * @return
 	 */
 	ReturnValue_t checkSequence() const;
-
 protected:
 
 	/**
-	 * @brief	This list contains all PollingSlot objects, defining order and
+	 * \brief	This list contains all OPUSPollingSlot objects, defining order and execution time of the
-	 * 			execution time of the device handler objects.
+	 * 			device handler objects.
 	 *
-	 * @details
+	 * \details	The slot list is a std:list object that contains all created OPUSPollingSlot instances.
-	 * The slot list is a std:list object that contains all created
+	 * 			They are NOT ordered automatically, so by adding entries, the correct order needs to be ensured.
-	 * PollingSlot instances. They are NOT ordered automatically, so by
+	 * 			By iterating through this list the polling sequence is executed. Two entries with identical
-	 * adding entries, the correct order needs to be ensured. By iterating
+	 * 			polling times are executed immediately one after another.
-	 * through this list the polling sequence is executed. Two entries with
-	 * identical polling times are executed immediately one after another.
 	 */
-	SlotList slotList;
+	std::list<FixedSequenceSlot*> slotList;
 
 	uint32_t lengthMs;
 };

devicehandlers/HealthDevice.cpp

@@ -38,7 +38,7 @@ MessageQueueId_t HealthDevice::getCommandQueue() const {
 }
 
 void HealthDevice::setParentQueue(MessageQueueId_t parentQueue) {
-	healthHelper.setParentQueue(parentQueue);
+	healthHelper.setParentQeueue(parentQueue);
 }
 
 bool HealthDevice::hasHealthChanged() {

events/eventmatching/EventRangeMatcherBase.h

@@ -11,16 +11,16 @@ class EventRangeMatcherBase: public SerializeableMatcherIF<EventMessage*> {
 public:
 	EventRangeMatcherBase(T from, T till, bool inverted) : rangeMatcher(from, till, inverted) {	}
 	virtual ~EventRangeMatcherBase() { }
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
-		return rangeMatcher.serialize(buffer, size, maxSize, streamEndianness);
+		return rangeMatcher.serialize(buffer, size, max_size, bigEndian);
 	}
-	size_t getSerializedSize() const {
+	uint32_t getSerializedSize() const {
 		return rangeMatcher.getSerializedSize();
 	}
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
-		return rangeMatcher.deSerialize(buffer, size, streamEndianness);
+		return rangeMatcher.deSerialize(buffer, size, bigEndian);
 	}
 protected:
 	RangeMatcher<T> rangeMatcher;

framework.mk

@@ -1,5 +1,5 @@
-# This file needs FRAMEWORK_PATH and OS_FSFW set correctly by another Makefile.
+# This file needs FRAMEWORK_PATH and API set correctly
-# Valid API settings: rtems, linux, freeRTOS, host
+# Valid API settings: rtems, linux, freeRTOS
 
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/action/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/container/*.cpp)
@@ -12,6 +12,7 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/devicehandlers/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/eventmatching/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/fdir/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/framework.mk/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/matching/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/math/*.cpp)
@@ -25,16 +26,14 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/objectmanager/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/*.cpp)
 
 # select the OS
-ifeq ($(OS_FSFW),rtems)
+ifeq ($(OS),rtems)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/rtems/*.cpp)
-else ifeq ($(OS_FSFW),linux)
+else ifeq ($(OS),linux)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/linux/*.cpp)
-else ifeq ($(OS_FSFW),freeRTOS)
+else ifeq ($(OS),freeRTOS)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp)
-else ifeq ($(OS_FSFW),host)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/host/*.cpp)
 else
-$(error invalid OS specified, valid OS are rtems, linux, freeRTOS, host)
+$(error invalid OS specified, valid OS are rtems, linux, freeRTOS)
 endif
 
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/parameters/*.cpp)

globalfunctions/Type.cpp

@@ -59,8 +59,8 @@ uint8_t Type::getSize() const {
 	}
 }
 
-ReturnValue_t Type::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t Type::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	uint8_t ptc;
 	uint8_t pfc;
 	ReturnValue_t result = getPtcPfc(&ptc, &pfc);
@@ -68,36 +68,36 @@ ReturnValue_t Type::serialize(uint8_t** buffer, size_t* size,
 		return result;
 	}
 
-	result = SerializeAdapter::serialize(&ptc, buffer, size, maxSize,
+	result = SerializeAdapter<uint8_t>::serialize(&ptc, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	result = SerializeAdapter::serialize(&pfc, buffer, size, maxSize,
+	result = SerializeAdapter<uint8_t>::serialize(&pfc, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 
 	return result;
 
 }
 
-size_t Type::getSerializedSize() const {
+uint32_t Type::getSerializedSize() const {
 	uint8_t dontcare = 0;
-	return 2 * SerializeAdapter::getSerializedSize(&dontcare);
+	return 2 * SerializeAdapter<uint8_t>::getSerializedSize(&dontcare);
 }
 
-ReturnValue_t Type::deSerialize(const uint8_t** buffer, size_t* size,
+ReturnValue_t Type::deSerialize(const uint8_t** buffer, int32_t* size,
-		Endianness streamEndianness) {
+		bool bigEndian) {
 	uint8_t ptc;
 	uint8_t pfc;
-	ReturnValue_t result = SerializeAdapter::deSerialize(&ptc, buffer,
+	ReturnValue_t result = SerializeAdapter<uint8_t>::deSerialize(&ptc, buffer,
-			size, streamEndianness);
+			size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	result = SerializeAdapter::deSerialize(&pfc, buffer, size,
+	result = SerializeAdapter<uint8_t>::deSerialize(&pfc, buffer, size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}

globalfunctions/Type.h

@@ -22,7 +22,7 @@ public:
 
 	Type(ActualType_t actualType);
 
-	Type(const Type &type);
+	Type(const Type& type);
 
 	Type& operator=(Type rhs);
 
@@ -30,8 +30,8 @@ public:
 
 	operator ActualType_t() const;
 
-	bool operator==(const Type &rhs);
+	bool operator==(const Type& rhs);
-	bool operator!=(const Type &rhs);
+	bool operator!=(const Type& rhs);
 
 	uint8_t getSize() const;
 
@@ -39,13 +39,13 @@ public:
 
 	static ActualType_t getActualType(uint8_t ptc, uint8_t pfc);
 
-	virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 
 private:
 	ActualType_t actualType;

globalfunctions/conversion.cpp

@@ -0,0 +1,104 @@
+#include <framework/globalfunctions/conversion.h>
+#include <framework/osal/Endiness.h>
+#include <cstring>
+
+
+
+//SHOULDDO: This shall be optimized (later)!
+void convertToByteStream( uint16_t value, uint8_t* buffer, uint32_t* size ) {
+	buffer[0] = (value & 0xFF00) >> 8;
+	buffer[1] = (value & 0x00FF);
+	*size += 2;
+}
+
+void convertToByteStream( uint32_t value, uint8_t* buffer, uint32_t* size ) {
+	buffer[0] = (value & 0xFF000000) >> 24;
+	buffer[1] = (value & 0x00FF0000) >> 16;
+	buffer[2] = (value & 0x0000FF00) >> 8;
+	buffer[3] = (value & 0x000000FF);
+	*size +=4;
+}
+
+void convertToByteStream( int16_t value, uint8_t* buffer, uint32_t* size ) {
+	buffer[0] = (value & 0xFF00) >> 8;
+	buffer[1] = (value & 0x00FF);
+	*size += 2;
+}
+
+void convertToByteStream( int32_t value, uint8_t* buffer, uint32_t* size ) {
+	buffer[0] = (value & 0xFF000000) >> 24;
+	buffer[1] = (value & 0x00FF0000) >> 16;
+	buffer[2] = (value & 0x0000FF00) >> 8;
+	buffer[3] = (value & 0x000000FF);
+	*size += 4;
+}
+
+//void convertToByteStream( uint64_t value, uint8_t* buffer, uint32_t* size ) {
+//	buffer[0] = (value & 0xFF00000000000000) >> 56;
+//	buffer[1] = (value & 0x00FF000000000000) >> 48;
+//	buffer[2] = (value & 0x0000FF0000000000) >> 40;
+//	buffer[3] = (value & 0x000000FF00000000) >> 32;
+//	buffer[4] = (value & 0x00000000FF000000) >> 24;
+//	buffer[5] = (value & 0x0000000000FF0000) >> 16;
+//	buffer[6] = (value & 0x000000000000FF00) >> 8;
+//	buffer[7] = (value & 0x00000000000000FF);
+//	*size+=8;
+//}
+//
+//void convertToByteStream( int64_t value, uint8_t* buffer, uint32_t* size ) {
+//	buffer[0] = (value & 0xFF00000000000000) >> 56;
+//	buffer[1] = (value & 0x00FF000000000000) >> 48;
+//	buffer[2] = (value & 0x0000FF0000000000) >> 40;
+//	buffer[3] = (value & 0x000000FF00000000) >> 32;
+//	buffer[4] = (value & 0x00000000FF000000) >> 24;
+//	buffer[5] = (value & 0x0000000000FF0000) >> 16;
+//	buffer[6] = (value & 0x000000000000FF00) >> 8;
+//	buffer[7] = (value & 0x00000000000000FF);
+//	*size+=8;
+//}
+
+void convertToByteStream( float in_value, uint8_t* buffer, uint32_t* size ) {
+#ifndef BYTE_ORDER_SYSTEM
+	#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+	union float_union {
+		float value;
+		uint8_t chars[4];
+	};
+	float_union temp;
+	temp.value = in_value;
+	buffer[0] = temp.chars[3];
+	buffer[1] = temp.chars[2];
+	buffer[2] = temp.chars[1];
+	buffer[3] = temp.chars[0];
+	*size += 4;
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+	memcpy(buffer, &in_value, sizeof(in_value));
+	*size += sizeof(in_value);
+#endif
+}
+
+void convertToByteStream( double in_value, uint8_t* buffer, uint32_t* size ) {
+#ifndef BYTE_ORDER_SYSTEM
+	#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+	union double_union {
+		double value;
+		uint8_t chars[8];
+	};
+	double_union temp;
+	temp.value = in_value;
+	buffer[0] = temp.chars[7];
+	buffer[1] = temp.chars[6];
+	buffer[2] = temp.chars[5];
+	buffer[3] = temp.chars[4];
+	buffer[4] = temp.chars[3];
+	buffer[5] = temp.chars[2];
+	buffer[6] = temp.chars[1];
+	buffer[7] = temp.chars[0];
+	*size += 8;
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+	memcpy(buffer, &in_value, sizeof(in_value));
+	*size += sizeof(in_value);
+#endif
+}

globalfunctions/conversion.h

@@ -0,0 +1,24 @@
+#ifndef CONVERSION_H_
+#define CONVERSION_H_
+
+
+#include <stdint.h>
+
+
+void convertToByteStream( uint16_t value, uint8_t* buffer, uint32_t* size );
+
+void convertToByteStream( uint32_t value, uint8_t* buffer, uint32_t* size );
+
+void convertToByteStream( int16_t value, uint8_t* buffer, uint32_t* size );
+
+void convertToByteStream( int32_t value, uint8_t* buffer, uint32_t* size );
+
+//void convertToByteStream( uint64_t value, uint8_t* buffer, uint32_t* size );
+//
+//void convertToByteStream( int64_t value, uint8_t* buffer, uint32_t* size );
+
+void convertToByteStream( float value, uint8_t* buffer, uint32_t* size );
+
+void convertToByteStream( double value, uint8_t* buffer, uint32_t* size );
+
+#endif /* CONVERSION_H_ */

globalfunctions/matching/MatchTree.h

@@ -45,38 +45,38 @@ public:
 		return matchSubtree(iter, number);
 	}
 
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, SerializeIF::Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
 		iterator iter = this->begin();
 		uint8_t count = this->countRight(iter);
-		ReturnValue_t result = SerializeAdapter::serialize(&count,
+		ReturnValue_t result = SerializeAdapter<uint8_t>::serialize(&count,
-				buffer, size, maxSize, streamEndianness);
+				buffer, size, max_size, bigEndian);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
 		if (iter == this->end()) {
 			return HasReturnvaluesIF::RETURN_OK;
 		}
-		result = iter->serialize(buffer, size, maxSize, streamEndianness);
+		result = iter->serialize(buffer, size, max_size, bigEndian);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
 		if (maxDepth > 0) {
 			MatchTree<T> temp(iter.left(), maxDepth - 1);
-			result = temp.serialize(buffer, size, maxSize, streamEndianness);
+			result = temp.serialize(buffer, size, max_size, bigEndian);
 		}
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
 		iter = iter.right();
 		while (iter != this->end()) {
-			result = iter->serialize(buffer, size, maxSize, streamEndianness);
+			result = iter->serialize(buffer, size, max_size, bigEndian);
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
 			}
 			if (maxDepth > 0) {
 				MatchTree<T> temp(iter.left(), maxDepth - 1);
-				result = temp.serialize(buffer, size, maxSize, streamEndianness);
+				result = temp.serialize(buffer, size, max_size, bigEndian);
 			}
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
@@ -86,7 +86,7 @@ public:
 		return result;
 	}
 
-	size_t getSerializedSize() const override {
+	uint32_t getSerializedSize() const {
 		//Analogous to serialize!
 		uint32_t size = 1; //One for count
 		iterator iter = this->begin();
@@ -115,8 +115,8 @@ public:
 		return size;
 	}
 
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			SerializeIF::Endianness streamEndianness) override {
+			bool bigEndian) {
 		return HasReturnvaluesIF::RETURN_OK;
 	}
 

globalfunctions/matching/RangeMatcher.h

@@ -4,6 +4,7 @@
 #include <framework/globalfunctions/matching/SerializeableMatcherIF.h>
 #include <framework/serialize/SerializeAdapter.h>
 
+
 template<typename T>
 class RangeMatcher: public SerializeableMatcherIF<T> {
 public:
@@ -26,40 +27,34 @@ public:
 		}
 	}
 
-	ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			SerializeIF::Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
-		ReturnValue_t result = SerializeAdapter::serialize(&lowerBound, buffer,
+		ReturnValue_t result = SerializeAdapter<T>::serialize(&lowerBound, buffer, size, max_size, bigEndian);
-				size, maxSize, streamEndianness);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::serialize(&upperBound, buffer, size,
+		result = SerializeAdapter<T>::serialize(&upperBound, buffer, size, max_size, bigEndian);
-				maxSize, streamEndianness);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		return SerializeAdapter::serialize(&inverted, buffer, size, maxSize,
+		return SerializeAdapter<bool>::serialize(&inverted, buffer, size, max_size, bigEndian);
-				streamEndianness);
 	}
 
-	size_t getSerializedSize() const override {
+	uint32_t getSerializedSize() const {
 		return sizeof(lowerBound) + sizeof(upperBound) + sizeof(bool);
 	}
 
-	ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			SerializeIF::Endianness streamEndianness) override {
+			bool bigEndian) {
-		ReturnValue_t result = SerializeAdapter::deSerialize(&lowerBound,
+		ReturnValue_t result = SerializeAdapter<T>::deSerialize(&lowerBound, buffer, size, bigEndian);
-				buffer, size, streamEndianness);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&upperBound, buffer, size,
+		result = SerializeAdapter<T>::deSerialize(&upperBound, buffer, size, bigEndian);
-				streamEndianness);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		return SerializeAdapter::deSerialize(&inverted, buffer, size,
+		return SerializeAdapter<bool>::deSerialize(&inverted, buffer, size, bigEndian);
-				streamEndianness);
 	}
 protected:
 	bool doMatch(T input) {

health/HealthHelper.cpp

@@ -29,11 +29,11 @@ HasHealthIF::HealthState HealthHelper::getHealth() {
 }
 
 ReturnValue_t HealthHelper::initialize(MessageQueueId_t parentQueue) {
-	setParentQueue(parentQueue);
+	setParentQeueue(parentQueue);
 	return initialize();
 }
 
-void HealthHelper::setParentQueue(MessageQueueId_t parentQueue) {
+void HealthHelper::setParentQeueue(MessageQueueId_t parentQueue) {
 	this->parentQueue = parentQueue;
 }
 

health/HealthHelper.h

@@ -78,7 +78,7 @@ public:
 	/**
 	 * @param parentQueue the Queue id of the parent object. Set to 0 if no parent present
 	 */
-	void setParentQueue(MessageQueueId_t parentQueue);
+	void setParentQeueue(MessageQueueId_t parentQueue);
 
 	/**
 	 *

health/HealthTable.cpp

@@ -63,21 +63,21 @@ bool HealthTable::hasHealth(object_id_t object) {
 	return exits;
 }
 
-void HealthTable::printAll(uint8_t* pointer, size_t maxSize) {
+void HealthTable::printAll(uint8_t* pointer, uint32_t maxSize) {
 	mutex->lockMutex(MutexIF::NO_TIMEOUT);
-	size_t size = 0;
+	uint32_t size = 0;
 	uint16_t count = healthMap.size();
-	ReturnValue_t result = SerializeAdapter::serialize(&count,
+	ReturnValue_t result = SerializeAdapter<uint16_t>::serialize(&count,
-			&pointer, &size, maxSize, SerializeIF::Endianness::BIG);
+			&pointer, &size, maxSize, true);
 	HealthMap::iterator iter;
 	for (iter = healthMap.begin();
 			iter != healthMap.end() && result == HasReturnvaluesIF::RETURN_OK;
 			++iter) {
-		result = SerializeAdapter::serialize(&iter->first,
+		result = SerializeAdapter<object_id_t>::serialize(&iter->first,
-				&pointer, &size, maxSize, SerializeIF::Endianness::BIG);
+				&pointer, &size, maxSize, true);
 		uint8_t health = iter->second;
-		result = SerializeAdapter::serialize(&health, &pointer, &size,
+		result = SerializeAdapter<uint8_t>::serialize(&health, &pointer, &size,
-				maxSize, SerializeIF::Endianness::BIG);
+				maxSize, true);
 	}
 	mutex->unlockMutex();
 }

health/HealthTable.h

@@ -21,7 +21,7 @@ public:
 	virtual HasHealthIF::HealthState getHealth(object_id_t);
 
 	virtual uint32_t getPrintSize();
-	virtual void printAll(uint8_t *pointer, size_t maxSize);
+	virtual void printAll(uint8_t *pointer, uint32_t maxSize);
 
 protected:
 	MutexIF* mutex;

health/HealthTableIF.h

@@ -17,7 +17,7 @@ public:
 			HasHealthIF::HealthState initilialState = HasHealthIF::HEALTHY) = 0;
 
 	virtual uint32_t getPrintSize() = 0;
-	virtual void printAll(uint8_t *pointer, size_t maxSize) = 0;
+	virtual void printAll(uint8_t *pointer, uint32_t maxSize) = 0;
 
 protected:
 	virtual ReturnValue_t iterate(std::pair<object_id_t,HasHealthIF::HealthState> *value, bool reset = false) = 0;

ipc/CommandMessage.cpp

@@ -111,7 +111,7 @@ size_t CommandMessage::getMinimumMessageSize() const {
 void CommandMessage::setToUnknownCommand() {
 	Command_t initialCommand = getCommand();
 	clearCommandMessage();
-	setReplyRejected(UNKNOWN_COMMAND, initialCommand);
+	setReplyRejected(UNKNOW_COMMAND, initialCommand);
 }
 
 void CommandMessage::setReplyRejected(ReturnValue_t reason,
@@ -120,12 +120,3 @@ void CommandMessage::setReplyRejected(ReturnValue_t reason,
 	setParameter(reason);
 	setParameter2(initialCommand);
 }
-
-ReturnValue_t CommandMessage::getReplyRejectedReason(
-        Command_t *initialCommand) const {
-    ReturnValue_t reason = getParameter();
-    if(initialCommand != nullptr) {
-        *initialCommand = getParameter2();
-    }
-    return reason;
-}

ipc/CommandMessage.h

@@ -20,7 +20,7 @@ typedef ReturnValue_t Command_t;
 class CommandMessage : public MessageQueueMessage {
 public:
 	static const uint8_t INTERFACE_ID = CLASS_ID::COMMAND_MESSAGE;
-	static const ReturnValue_t UNKNOWN_COMMAND = MAKE_RETURN_CODE(0x01);
+	static const ReturnValue_t UNKNOW_COMMAND = MAKE_RETURN_CODE(0x01);
 
 
 	static const uint8_t MESSAGE_ID = MESSAGE_TYPE::COMMAND;
@@ -124,9 +124,6 @@ public:
 	 */
 	void setToUnknownCommand();
 	void setReplyRejected(ReturnValue_t reason, Command_t initialCommand = CMD_NONE);
-	ReturnValue_t getReplyRejectedReason(
-	        Command_t *initialCommand = nullptr) const;
-
 	size_t getMinimumMessageSize() const;
 };
 

memory/MemoryHelper.cpp

@@ -2,7 +2,7 @@
 #include <framework/memory/MemoryHelper.h>
 #include <framework/memory/MemoryMessage.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/serialize/EndianConverter.h>
+#include <framework/serialize/EndianSwapper.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
 MemoryHelper::MemoryHelper(HasMemoryIF* workOnThis, MessageQueueIF* useThisQueue) :
@@ -53,7 +53,7 @@ void MemoryHelper::completeLoad(ReturnValue_t errorCode,
 		memcpy(copyHere, dataToCopy, size);
 		break;
 	case HasMemoryIF::POINTS_TO_VARIABLE:
-		EndianConverter::convertBigEndian(copyHere, dataToCopy, size);
+		EndianSwapper::swap(copyHere, dataToCopy, size);
 		break;
 	case HasMemoryIF::ACTIVITY_COMPLETED:
 	case RETURN_OK:
@@ -86,7 +86,7 @@ void MemoryHelper::completeDump(ReturnValue_t errorCode,
 	case HasMemoryIF::POINTS_TO_VARIABLE:
 		//"data" must be valid pointer!
 		if (errorCode == HasMemoryIF::POINTS_TO_VARIABLE) {
-			EndianConverter::convertBigEndian(reservedSpaceInIPC, dataToCopy, size);
+			EndianSwapper::swap(reservedSpaceInIPC, dataToCopy, size);
 		} else {
 			memcpy(reservedSpaceInIPC, dataToCopy, size);
 		}
@@ -136,7 +136,7 @@ void MemoryHelper::swapMatrixCopy(uint8_t* out, const uint8_t *in,
 	}
 
 	while (totalSize > 0){
-		EndianConverter::convertBigEndian(out,in,datatypeSize);
+		EndianSwapper::swap(out,in,datatypeSize);
 		out += datatypeSize;
 		in += datatypeSize;
 		totalSize -= datatypeSize;

monitoring/LimitViolationReporter.cpp

@@ -17,7 +17,7 @@ ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF
 	}
 	store_address_t storeId;
 	uint8_t* dataTarget = NULL;
-	size_t maxSize = data->getSerializedSize();
+	uint32_t maxSize = data->getSerializedSize();
 	if (maxSize > MonitoringIF::VIOLATION_REPORT_MAX_SIZE) {
 		return MonitoringIF::INVALID_SIZE;
 	}
@@ -26,8 +26,8 @@ ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	size_t size = 0;
+	uint32_t size = 0;
-	result = data->serialize(&dataTarget, &size, maxSize, SerializeIF::Endianness::BIG);
+	result = data->serialize(&dataTarget, &size, maxSize, true);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}

objectmanager/ObjectManager.cpp

@@ -2,6 +2,7 @@
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 #include <iomanip>
 #include <cstdlib>
+#include <iomanip>
 
 ObjectManager::ObjectManager( void (*setProducer)() ):
 		produceObjects(setProducer) {

objectmanager/ObjectManagerIF.h

@@ -21,8 +21,7 @@ public:
 	static constexpr uint8_t INTERFACE_ID = CLASS_ID::OBJECT_MANAGER_IF;
 	static constexpr ReturnValue_t INSERTION_FAILED = MAKE_RETURN_CODE( 1 );
 	static constexpr ReturnValue_t NOT_FOUND = MAKE_RETURN_CODE( 2 );
-
+	static constexpr ReturnValue_t CHILD_INIT_FAILED = MAKE_RETURN_CODE( 3 );
-	static constexpr ReturnValue_t CHILD_INIT_FAILED = MAKE_RETURN_CODE( 3 ); //!< Can be used if the initialization of a SystemObject failed.
 	static constexpr ReturnValue_t INTERNAL_ERR_REPORTER_UNINIT = MAKE_RETURN_CODE( 4 );
 
 protected:

osal/FreeRTOS/Clock.cpp

@@ -1,18 +1,16 @@
 #include <framework/timemanager/Clock.h>
 #include <framework/globalfunctions/timevalOperations.h>
-#include <framework/osal/FreeRTOS/Timekeeper.h>
-
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
-
 #include <stdlib.h>
-#include <time.h>
+#include "Timekeeper.h"
+
+#include <FreeRTOS.h>
+#include <task.h>
 
 //TODO sanitize input?
 //TODO much of this code can be reused for tick-only systems
 
 uint16_t Clock::leapSeconds = 0;
-MutexIF* Clock::timeMutex = nullptr;
+MutexIF* Clock::timeMutex = NULL;
 
 uint32_t Clock::getTicksPerSecond(void) {
 	return 1000;
@@ -58,6 +56,7 @@ ReturnValue_t Clock::getUptime(timeval* uptime) {
 
 timeval Clock::getUptime() {
 	TickType_t ticksSinceStart = xTaskGetTickCount();
+
 	return Timekeeper::ticksToTimeval(ticksSinceStart);
 }
 
@@ -129,7 +128,7 @@ ReturnValue_t Clock::convertTimevalToJD2000(timeval time, double* JD2000) {
 
 ReturnValue_t Clock::convertUTCToTT(timeval utc, timeval* tt) {
 	//SHOULDDO: works not for dates in the past (might have less leap seconds)
-	if (timeMutex == nullptr) {
+	if (timeMutex == NULL) {
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
 

osal/FreeRTOS/FixedTimeslotTask.cpp

@@ -1,6 +1,5 @@
-#include "FixedTimeslotTask.h"
-
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "FixedTimeslotTask.h"
 
 uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
 const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;
@@ -19,19 +18,16 @@ FixedTimeslotTask::~FixedTimeslotTask() {
 
 void FixedTimeslotTask::taskEntryPoint(void* argument) {
 
-	// The argument is re-interpreted as FixedTimeslotTask. The Task object is
+	//The argument is re-interpreted as FixedTimeslotTask. The Task object is global, so it is found from any place.
-    // global, so it is found from any place.
 	FixedTimeslotTask *originalTask(reinterpret_cast<FixedTimeslotTask*>(argument));
-	/* Task should not start until explicitly requested,
+	// Task should not start until explicitly requested
-	 * but in FreeRTOS, tasks start as soon as they are created if the scheduler
+	// in FreeRTOS, tasks start as soon as they are created if the scheduler is running
-	 * is running but not if the scheduler is not running.
+	// but not if the scheduler is not running.
-	 * To be able to accommodate both cases we check a member which is set in
+	// to be able to accommodate both cases we check a member which is set in #startTask()
-	 * #startTask(). If it is not set and we get here, the scheduler was started
+	// if it is not set and we get here, the scheduler was started before #startTask() was called and we need to suspend
-	 * before #startTask() was called and we need to suspend if it is set,
+	// if it is set, the scheduler was not running before #startTask() was called and we can continue
-	 * the scheduler was not running before #startTask() was called and we
-	 * can continue */
 
-	if (not originalTask->started) {
+	if (!originalTask->started) {
 		vTaskSuspend(NULL);
 	}
 
@@ -62,6 +58,11 @@ ReturnValue_t FixedTimeslotTask::startTask() {
 ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
 		uint32_t slotTimeMs, int8_t executionStep) {
 	if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
+		if(slotTimeMs == 0) {
+			// FreeRTOS throws a sanity error for zero values, so we set
+			// the time to one millisecond.
+			slotTimeMs = 1;
+		}
 		pst.addSlot(componentId, slotTimeMs, executionStep, this);
 		return HasReturnvaluesIF::RETURN_OK;
 	}
@@ -80,78 +81,43 @@ ReturnValue_t FixedTimeslotTask::checkSequence() const {
 }
 
 void FixedTimeslotTask::taskFunctionality() {
-	// A local iterator for the Polling Sequence Table is created to find the
+	// A local iterator for the Polling Sequence Table is created to find the start time for the first entry.
-    // start time for the first entry.
+	std::list<FixedSequenceSlot*>::iterator it = pst.current;
-	FixedSlotSequence::SlotListIter slotListIter = pst.current;
 
 	//The start time for the first entry is read.
-	uint32_t intervalMs = slotListIter->pollingTimeMs;
+	uint32_t intervalMs = (*it)->pollingTimeMs;
 	TickType_t interval = pdMS_TO_TICKS(intervalMs);
 
 	TickType_t xLastWakeTime;
 	/* The xLastWakeTime variable needs to be initialized with the current tick
-	 count. Note that this is the only time the variable is written to
+	 count. Note that this is the only time the variable is written to explicitly.
-	 explicitly. After this assignment, xLastWakeTime is updated automatically
+	 After this assignment, xLastWakeTime is updated automatically internally within
-	 internally within vTaskDelayUntil(). */
+	 vTaskDelayUntil(). */
 	xLastWakeTime = xTaskGetTickCount();
 
 	// wait for first entry's start time
-	if(interval > 0) {
+	vTaskDelayUntil(&xLastWakeTime, interval);
-	    vTaskDelayUntil(&xLastWakeTime, interval);
-	}
 
 	/* Enter the loop that defines the task behavior. */
 	for (;;) {
 		//The component for this slot is executed and the next one is chosen.
-	    this->pst.executeAndAdvance();
+		this->pst.executeAndAdvance();
-	    if (not pst.slotFollowsImmediately()) {
+		if (pst.slotFollowsImmediately()) {
-	        // Get the interval till execution of the next slot.
+			//Do nothing
-	        intervalMs = this->pst.getIntervalToPreviousSlotMs();
+		} else {
-	        interval = pdMS_TO_TICKS(intervalMs);
+			// we need to wait before executing the current slot
+			//this gives us the time to wait:
+			intervalMs = this->pst.getIntervalToPreviousSlotMs();
+			interval = pdMS_TO_TICKS(intervalMs);
+			vTaskDelayUntil(&xLastWakeTime, interval);
+			//TODO deadline missed check
+		}
 
-	        checkMissedDeadline(xLastWakeTime, interval);
-
-	        // Wait for the interval. This exits immediately if a deadline was
-	        // missed while also updating the last wake time.
-	        vTaskDelayUntil(&xLastWakeTime, interval);
-	    }
 	}
 }
 
-void FixedTimeslotTask::checkMissedDeadline(const TickType_t xLastWakeTime,
-        const TickType_t interval) {
-    /* Check whether deadline was missed while also taking overflows
-     * into account. Drawing this on paper with a timeline helps to understand
-     * it. */
-    TickType_t currentTickCount = xTaskGetTickCount();
-    TickType_t timeToWake = xLastWakeTime + interval;
-    // Time to wake has not overflown.
-    if(timeToWake > xLastWakeTime) {
-        /* If the current time has overflown exclusively or the current
-         * tick count is simply larger than the time to wake, a deadline was
-         * missed */
-        if((currentTickCount < xLastWakeTime) or (currentTickCount > timeToWake)) {
-            handleMissedDeadline();
-        }
-    }
-    /* Time to wake has overflown. A deadline was missed if the current time
-     * is larger than the time to wake */
-    else if((timeToWake < xLastWakeTime) and (currentTickCount > timeToWake)) {
-        handleMissedDeadline();
-    }
-}
-
-void FixedTimeslotTask::handleMissedDeadline() {
-#ifdef DEBUG
-    sif::warning << "FixedTimeslotTask: " << pcTaskGetName(NULL) <<
-            " missed deadline!\n" << std::flush;
-#endif
-    if(deadlineMissedFunc != nullptr) {
-        this->deadlineMissedFunc();
-    }
-}
-
 ReturnValue_t FixedTimeslotTask::sleepFor(uint32_t ms) {
 	vTaskDelay(pdMS_TO_TICKS(ms));
 	return HasReturnvaluesIF::RETURN_OK;
 }
+

osal/FreeRTOS/FixedTimeslotTask.h

@@ -1,27 +1,24 @@
-#ifndef FRAMEWORK_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_
+#ifndef POLLINGTASK_H_
-#define FRAMEWORK_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_
+#define POLLINGTASK_H_
 
 #include <framework/devicehandlers/FixedSlotSequence.h>
 #include <framework/tasks/FixedTimeslotTaskIF.h>
 #include <framework/tasks/Typedef.h>
 
-#include <freertos/FreeRTOS.h>
+#include <FreeRTOS.h>
-#include <freertos/task.h>
+#include "task.h"
 
 class FixedTimeslotTask: public FixedTimeslotTaskIF {
 public:
-
 	/**
-	 * Keep in mind that you need to call before vTaskStartScheduler()!
+	 * @brief	The standard constructor of the class.
-	 * A lot of task parameters are set in "FreeRTOSConfig.h".
+	 *
-	 * @param name Name of the task, lenght limited by configMAX_TASK_NAME_LEN
+	 * @details	This is the general constructor of the class. In addition to the TaskBase parameters,
-	 * @param setPriority Number of priorities specified by
+	 * 			the following variables are passed:
-	 * configMAX_PRIORITIES. High taskPriority_ number means high priority.
+	 *
-	 * @param setStack	Stack size in words (not bytes!).
+	 * @param	(*setDeadlineMissedFunc)() The function pointer to the deadline missed function that shall be assigned.
-	 * Lower limit specified by configMINIMAL_STACK_SIZE
+	 *
-	 * @param overallPeriod		Period in seconds.
+	 * @param	getPst The object id of the completely initialized polling sequence.
-	 * @param setDeadlineMissedFunc Callback if a deadline was missed.
-	 * @return Pointer to the newly created task.
 	 */
 	FixedTimeslotTask(const char *name, TaskPriority setPriority,
 			TaskStackSize setStack, TaskPeriod overallPeriod,
@@ -29,18 +26,16 @@ public:
 
 	/**
 	 * @brief	The destructor of the class.
-	 * @details
+	 *
-	 * The destructor frees all heap memory that was allocated on thread
+	 * @details	The destructor frees all heap memory that was allocated on thread initialization for the PST and
-	 * initialization for the PST and the device handlers. This is done by
+	 * 			the device handlers. This is done by calling the PST's destructor.
-	 * calling the PST's destructor.
 	 */
 	virtual ~FixedTimeslotTask(void);
 
 	ReturnValue_t startTask(void);
 	/**
 	 * This static function can be used as #deadlineMissedFunc.
-	 * It counts missedDeadlines and prints the number of missed deadlines
+	 * It counts missedDeadlines and prints the number of missed deadlines every 10th time.
-	 * every 10th time.
 	 */
 	static void missedDeadlineCounter();
 	/**
@@ -49,14 +44,13 @@ public:
 	static uint32_t deadlineMissedCount;
 
 	ReturnValue_t addSlot(object_id_t componentId, uint32_t slotTimeMs,
-			int8_t executionStep) override;
+			int8_t executionStep);
 
-	uint32_t getPeriodMs() const override;
+	uint32_t getPeriodMs() const;
 
-	ReturnValue_t checkSequence() const override;
+	ReturnValue_t checkSequence() const;
-
-	ReturnValue_t sleepFor(uint32_t ms) override;
 
+	ReturnValue_t sleepFor(uint32_t ms);
 protected:
 	bool started;
 	TaskHandle_t handle;
@@ -64,35 +58,32 @@ protected:
 	FixedSlotSequence pst;
 
 	/**
-	 * @brief	This attribute holds a function pointer that is executed when
+	 * @brief	This attribute holds a function pointer that is executed when a deadline was missed.
-	 *          a deadline was missed.
+	 *
-	 * @details
+	 * @details	Another function may be announced to determine the actions to perform when a deadline was missed.
-	 * Another function may be announced to determine the actions to perform
+	 * 			Currently, only one function for missing any deadline is allowed.
-	 * when a deadline was missed. Currently, only one function for missing
+	 * 			If not used, it shall be declared NULL.
-	 * any deadline is allowed. If not used, it shall be declared NULL.
 	 */
 	void (*deadlineMissedFunc)(void);
 	/**
-	 * @brief	This is the entry point for a new task.
+	 * @brief	This is the entry point in a new polling thread.
-	 * @details
+	 *
-	 * This method starts the task by calling taskFunctionality(), as soon as
+	 * @details	This method, that is the generalOSAL::checkAndRestartPeriod( this->periodId, interval ); entry point in the new thread, is here set to generate
-	 * all requirements (task scheduler has started and startTask()
+	 * 			and link the Polling Sequence Table to the thread object and start taskFunctionality()
-	 * has been called) are met.
+	 * 			on success. If operation of the task is ended for some reason,
+	 * 			the destructor is called to free allocated memory.
 	 */
 	static void taskEntryPoint(void* argument);
 
 	/**
 	 * @brief	This function holds the main functionality of the thread.
-	 * @details
+	 *
-	 * Core function holding the main functionality of the task
+	 *
-	 * It links the functionalities provided by FixedSlotSequence with the
+	 * @details	Holding the main functionality of the task, this method is most important.
-	 * OS's System Calls to keep the timing of the periods.
+	 * 			It links the functionalities provided by FixedSlotSequence with the OS's System Calls
+	 * 			to keep the timing of the periods.
 	 */
 	void taskFunctionality(void);
-
-	void checkMissedDeadline(const TickType_t xLastWakeTime,
-	        const TickType_t interval);
-	void handleMissedDeadline();
 };
 
-#endif /* FRAMEWORK_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_ */
+#endif /* POLLINGTASK_H_ */

osal/FreeRTOS/PeriodicTask.cpp

@@ -1,19 +1,17 @@
-#include "PeriodicTask.h"
-
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 #include <framework/tasks/ExecutableObjectIF.h>
+#include "PeriodicTask.h"
 
 PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority,
 		TaskStackSize setStack, TaskPeriod setPeriod,
 		void (*setDeadlineMissedFunc)()) :
 		started(false), handle(NULL), period(setPeriod), deadlineMissedFunc(
-		setDeadlineMissedFunc)
+				setDeadlineMissedFunc) {
-{
+
-	BaseType_t status = xTaskCreate(taskEntryPoint, name,
+	BaseType_t status = xTaskCreate(taskEntryPoint, name, setStack, this, setPriority, &handle);
-			setStack, this, setPriority, &handle);
 	if(status != pdPASS){
-		sif::debug << "PeriodicTask Insufficient heap memory remaining. "
+		sif::debug << "PeriodicTask Insufficient heap memory remaining. Status: "
-		        "Status: " << status << std::endl;
+		           << status << std::endl;
 	}
 
 }
@@ -23,19 +21,16 @@ PeriodicTask::~PeriodicTask(void) {
 }
 
 void PeriodicTask::taskEntryPoint(void* argument) {
-	// The argument is re-interpreted as PeriodicTask. The Task object is
+	//The argument is re-interpreted as PeriodicTask. The Task object is global, so it is found from any place.
-    // global, so it is found from any place.
 	PeriodicTask *originalTask(reinterpret_cast<PeriodicTask*>(argument));
-	/* Task should not start until explicitly requested,
+	// Task should not start until explicitly requested
-	 * but in FreeRTOS, tasks start as soon as they are created if the scheduler
+	// in FreeRTOS, tasks start as soon as they are created if the scheduler is running
-	 * is running but not if the scheduler is not running.
+	// but not if the scheduler is not running.
-	 * To be able to accommodate both cases we check a member which is set in
+	// to be able to accommodate both cases we check a member which is set in #startTask()
-	 * #startTask(). If it is not set and we get here, the scheduler was started
+	// if it is not set and we get here, the scheduler was started before #startTask() was called and we need to suspend
-	 * before #startTask() was called and we need to suspend if it is set,
+	// if it is set, the scheduler was not running before #startTask() was called and we can continue
-	 * the scheduler was not running before #startTask() was called and we
-	 * can continue */
 
-	if (not originalTask->started) {
+	if (!originalTask->started) {
 		vTaskSuspend(NULL);
 	}
 
@@ -64,72 +59,31 @@ void PeriodicTask::taskFunctionality() {
 	TickType_t xLastWakeTime;
 	const TickType_t xPeriod = pdMS_TO_TICKS(this->period * 1000.);
 	/* The xLastWakeTime variable needs to be initialized with the current tick
-	 count. Note that this is the only time the variable is written to
+	 count. Note that this is the only time the variable is written to explicitly.
-	 explicitly. After this assignment, xLastWakeTime is updated automatically
+	 After this assignment, xLastWakeTime is updated automatically internally within
-	 internally within vTaskDelayUntil(). */
+	 vTaskDelayUntil(). */
 	xLastWakeTime = xTaskGetTickCount();
 	/* Enter the loop that defines the task behavior. */
 	for (;;) {
-		for (auto const& object: objectList) {
+		for (ObjectList::iterator it = objectList.begin();
-			object->performOperation();
+				it != objectList.end(); ++it) {
+			(*it)->performOperation();
 		}
-
+		//TODO deadline missed check
-		checkMissedDeadline(xLastWakeTime, xPeriod);
-
 		vTaskDelayUntil(&xLastWakeTime, xPeriod);
-
 	}
 }
 
-ReturnValue_t PeriodicTask::addComponent(object_id_t object, bool setTaskIF) {
+ReturnValue_t PeriodicTask::addComponent(object_id_t object) {
 	ExecutableObjectIF* newObject = objectManager->get<ExecutableObjectIF>(
 			object);
-	if (newObject == nullptr) {
+	if (newObject == NULL) {
-	    sif::error << "PeriodicTask::addComponent: Invalid object. Make sure"
-	            "it implements ExecutableObjectIF!" << std::endl;
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
 	objectList.push_back(newObject);
-
-	if(setTaskIF) {
-	     newObject->setTaskIF(this);
-	}
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
 uint32_t PeriodicTask::getPeriodMs() const {
 	return period * 1000;
 }
-
-void PeriodicTask::checkMissedDeadline(const TickType_t xLastWakeTime,
-        const TickType_t interval) {
-    /* Check whether deadline was missed while also taking overflows
-     * into account. Drawing this on paper with a timeline helps to understand
-     * it. */
-    TickType_t currentTickCount = xTaskGetTickCount();
-    TickType_t timeToWake = xLastWakeTime + interval;
-    // Time to wake has not overflown.
-    if(timeToWake > xLastWakeTime) {
-        /* If the current time has overflown exclusively or the current
-         * tick count is simply larger than the time to wake, a deadline was
-         * missed */
-        if((currentTickCount < xLastWakeTime) or (currentTickCount > timeToWake)) {
-            handleMissedDeadline();
-        }
-    }
-    /* Time to wake has overflown. A deadline was missed if the current time
-     * is larger than the time to wake */
-    else if((timeToWake < xLastWakeTime) and (currentTickCount > timeToWake)) {
-        handleMissedDeadline();
-    }
-}
-
-void PeriodicTask::handleMissedDeadline() {
-#ifdef DEBUG
-    sif::warning << "PeriodicTask: " << pcTaskGetName(NULL) <<
-            " missed deadline!\n" << std::flush;
-#endif
-    if(deadlineMissedFunc != nullptr) {
-        this->deadlineMissedFunc();
-    }
-}

osal/FreeRTOS/PeriodicTask.h

@@ -1,49 +1,48 @@
-#ifndef FRAMEWORK_OSAL_FREERTOS_PERIODICTASK_H_
+#ifndef MULTIOBJECTTASK_H_
-#define FRAMEWORK_OSAL_FREERTOS_PERIODICTASK_H_
+#define MULTIOBJECTTASK_H_
 
 #include <framework/objectmanager/ObjectManagerIF.h>
 #include <framework/tasks/PeriodicTaskIF.h>
 #include <framework/tasks/Typedef.h>
 
-#include <freertos/FreeRTOS.h>
+#include <FreeRTOS.h>
-#include <freertos/task.h>
+#include "task.h"
 
 #include <vector>
 
 class ExecutableObjectIF;
 
 /**
- * @brief 	This class represents a specialized task for
+ * @brief This class represents a specialized task for periodic activities of multiple objects.
- * 			periodic activities of multiple objects.
+ *
+ * @details MultiObjectTask is an extension to ObjectTask in the way that it is able to execute
+ * 			multiple objects that implement the ExecutableObjectIF interface. The objects must be
+ * 			added prior to starting the task.
+ *
  * @ingroup task_handling
  */
 class PeriodicTask: public PeriodicTaskIF {
 public:
 	/**
-	 * Keep in Mind that you need to call before this vTaskStartScheduler()!
+	 * @brief	Standard constructor of the class.
-	 * A lot of task parameters are set in "FreeRTOSConfig.h".
+	 * @details	The class is initialized without allocated objects. These need to be added
-	 * TODO: why does this need to be called before vTaskStartScheduler?
+	 * 			with #addObject.
-	 * @details
+	 * 			In the underlying TaskBase class, a new operating system task is created.
-	 * The class is initialized without allocated objects.
+	 * 			In addition to the TaskBase parameters, the period, the pointer to the
-	 * These need to be added with #addComponent.
+	 * 			aforementioned initialization function and an optional "deadline-missed"
-	 * @param priority
+	 * 			function pointer is passed.
-	 * Sets the priority of a task. Values depend on freeRTOS configuration,
+	 * @param priority		Sets the priority of a task. Values range from a low 0 to a high 99.
-	 * high number means high priority.
+	 * @param stack_size	The stack size reserved by the operating system for the task.
-	 * @param stack_size
+	 * @param setPeriod 	The length of the period with which the task's functionality will be
-	 * The stack size reserved by the operating system for the task.
+	 * 						executed. It is expressed in clock ticks.
-	 * @param setPeriod
+	 * @param setDeadlineMissedFunc	The function pointer to the deadline missed function
-	 * The length of the period with which the task's
+	 * 								that shall be assigned.
-	 * functionality will be executed. It is expressed in clock ticks.
-	 * @param setDeadlineMissedFunc
-	 * The function pointer to the deadline missed function that shall
-	 * be assigned.
 	 */
-	PeriodicTask(const char *name, TaskPriority setPriority,
+	PeriodicTask(const char *name, TaskPriority setPriority, TaskStackSize setStack, TaskPeriod setPeriod,
-	        TaskStackSize setStack, TaskPeriod setPeriod,
+			void (*setDeadlineMissedFunc)());
-	        void (*setDeadlineMissedFunc)());
 	/**
-	 * @brief	Currently, the executed object's lifetime is not coupled with
+	 * @brief	Currently, the executed object's lifetime is not coupled with the task object's
-	 * 			the task object's lifetime, so the destructor is empty.
+	 * 			lifetime, so the destructor is empty.
 	 */
 	virtual ~PeriodicTask(void);
 
@@ -54,72 +53,58 @@ public:
 	 * 			The address of the task object is passed as an argument
 	 * 			to the system call.
 	 */
-	ReturnValue_t startTask() override;
+	ReturnValue_t startTask(void);
 	/**
 	 * Adds an object to the list of objects to be executed.
 	 * The objects are executed in the order added.
 	 * @param object Id of the object to add.
-	 * @return
+	 * @return RETURN_OK on success, RETURN_FAILED if the object could not be added.
-	 * -@c RETURN_OK on success
-	 * -@c RETURN_FAILED if the object could not be added.
 	 */
-	ReturnValue_t addComponent(object_id_t object,
+	ReturnValue_t addComponent(object_id_t object);
-	        bool setTaskIF = true) override;
 
-	uint32_t getPeriodMs() const override;
+	uint32_t getPeriodMs() const;
 
-	ReturnValue_t sleepFor(uint32_t ms) override;
+	ReturnValue_t sleepFor(uint32_t ms);
 protected:
 	bool started;
 	TaskHandle_t handle;
 
-	//! Typedef for the List of objects.
+	typedef std::vector<ExecutableObjectIF*> ObjectList;	//!< Typedef for the List of objects.
-	typedef std::vector<ExecutableObjectIF*> ObjectList;
 	/**
 	 * @brief	This attribute holds a list of objects to be executed.
 	 */
 	ObjectList objectList;
 	/**
 	 * @brief	The period of the task.
-	 * @details
+	 * @details	The period determines the frequency of the task's execution. It is expressed in clock ticks.
-	 * The period determines the frequency of the task's execution.
-	 * It is expressed in clock ticks.
 	 */
 	TaskPeriod period;
 	/**
 	 * @brief	The pointer to the deadline-missed function.
-	 * @details
+	 * @details	This pointer stores the function that is executed if the task's deadline is missed.
-	 * This pointer stores the function that is executed if the task's deadline
+	 * 			So, each may react individually on a timing failure. The pointer may be NULL,
-	 * is missed so each may react individually on a timing failure.
+	 * 			then nothing happens on missing the deadline. The deadline is equal to the next execution
-	 * The pointer may be NULL, then nothing happens on missing the deadline.
+	 * 			of the periodic task.
-	 * The deadline is equal to the next execution of the periodic task.
 	 */
 	void (*deadlineMissedFunc)(void);
 	/**
 	 * @brief	This is the function executed in the new task's context.
-	 * @details
+	 * @details	It converts the argument back to the thread object type and copies the class instance
-	 * It converts the argument back to the thread object type and copies the
+	 * 			to the task context. The taskFunctionality method is called afterwards.
-	 * class instance to the task context. The taskFunctionality method is
-	 * called afterwards.
 	 * @param	A pointer to the task object itself is passed as argument.
 	 */
 
 	static void taskEntryPoint(void* argument);
 	/**
 	 * @brief	The function containing the actual functionality of the task.
-	 * @details
+	 * @details	The method sets and starts
-	 * The method sets and starts the task's period, then enters a loop that is
+	 * 			the task's period, then enters a loop that is repeated as long as the isRunning
-	 * repeated as long as the isRunning attribute is true. Within the loop,
+	 * 			attribute is true. Within the loop, all performOperation methods of the added
-	 * all performOperation methods of the added objects are called.
+	 * 			objects are called. Afterwards the checkAndRestartPeriod system call blocks the task
-	 * Afterwards the checkAndRestartPeriod system call blocks the task until
+	 * 			until the next period.
-	 * the next period.
+	 * 			On missing the deadline, the deadlineMissedFunction is executed.
-	 * On missing the deadline, the deadlineMissedFunction is executed.
 	 */
 	void taskFunctionality(void);
-
-	void checkMissedDeadline(const TickType_t xLastWakeTime,
-	        const TickType_t interval);
-	void handleMissedDeadline();
 };
 
-#endif /* PERIODICTASK_H_ */
+#endif /* MULTIOBJECTTASK_H_ */

osal/FreeRTOS/Timekeeper.cpp

@@ -1,19 +1,20 @@
-#include <framework/osal/FreeRTOS/Timekeeper.h>
+#include "Timekeeper.h"
+#include <FreeRTOSConfig.h>
 
-#include "FreeRTOSConfig.h"
+Timekeeper::Timekeeper() :
+		offset( { 0, 0 }) {
+	// TODO Auto-generated constructor stub
 
-Timekeeper * Timekeeper::myinstance = nullptr;
+}
 
-Timekeeper::Timekeeper() : offset( { 0, 0 } ) {}
+Timekeeper * Timekeeper::myinstance = NULL;
-
-Timekeeper::~Timekeeper() {}
 
 const timeval& Timekeeper::getOffset() const {
 	return offset;
 }
 
 Timekeeper* Timekeeper::instance() {
-	if (myinstance == nullptr) {
+	if (myinstance == NULL) {
 		myinstance = new Timekeeper();
 	}
 	return myinstance;
@@ -23,6 +24,10 @@ void Timekeeper::setOffset(const timeval& offset) {
 	this->offset = offset;
 }
 
+Timekeeper::~Timekeeper() {
+	// TODO Auto-generated destructor stub
+}
+
 timeval Timekeeper::ticksToTimeval(TickType_t ticks) {
 	timeval uptime;
 	uptime.tv_sec = ticks / configTICK_RATE_HZ;
@@ -35,7 +40,3 @@ timeval Timekeeper::ticksToTimeval(TickType_t ticks) {
 
 	return uptime;
 }
-
-TickType_t Timekeeper::getTicks() {
-    return xTaskGetTickCount();
-}

osal/FreeRTOS/Timekeeper.h

@@ -3,9 +3,7 @@
 
 #include <framework/timemanager/Clock.h>
 
-#include <freertos/FreeRTOS.h>
+#include <FreeRTOS.h>
-#include <freertos/task.h>
-
 
 /**
  * A Class to basically store the time difference between uptime and UTC
@@ -27,11 +25,6 @@ public:
 	virtual ~Timekeeper();
 
 	static timeval ticksToTimeval(TickType_t ticks);
-    /**
-     * Get elapsed time in system ticks.
-     * @return
-     */
-    static TickType_t getTicks();
 
 	const timeval& getOffset() const;
 	void setOffset(const timeval& offset);

osal/linux/Clock.cpp

@@ -1,10 +1,10 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include <sys/time.h>
+#include <time.h>
 #include <framework/timemanager/Clock.h>
 
-#include <sys/time.h>
+
 #include <sys/sysinfo.h>
 #include <linux/sysinfo.h>
-#include <time.h>
 #include <unistd.h>
 
 //#include <fstream>
@@ -65,15 +65,6 @@ ReturnValue_t Clock::getClock_usecs(uint64_t* time) {
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-timeval Clock::getUptime() {
-	timeval uptime;
-	auto result = getUptime(&uptime);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-		sif::error << "Clock::getUptime: Error getting uptime" << std::endl;
-	}
-	return uptime;
-}
-
 ReturnValue_t Clock::getUptime(timeval* uptime) {
 	//TODO This is not posix compatible and delivers only seconds precision
 	struct sysinfo sysInfo;

osal/linux/PeriodicPosixTask.cpp

@@ -24,13 +24,10 @@ void* PeriodicPosixTask::taskEntryPoint(void* arg) {
 ReturnValue_t PeriodicPosixTask::addComponent(object_id_t object) {
 	ExecutableObjectIF* newObject = objectManager->get<ExecutableObjectIF>(
 			object);
-	if (newObject == nullptr) {
+	if (newObject == NULL) {
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
 	objectList.push_back(newObject);
-
-	newObject->setTaskIF(this);
-
 	return HasReturnvaluesIF::RETURN_OK;
 }
 

osal/linux/PeriodicPosixTask.h

@@ -39,11 +39,11 @@ public:
 	 * @param object Id of the object to add.
 	 * @return RETURN_OK on success, RETURN_FAILED if the object could not be added.
 	 */
-	ReturnValue_t addComponent(object_id_t object) override;
+	ReturnValue_t addComponent(object_id_t object);
 
-	uint32_t getPeriodMs() const override;
+	uint32_t getPeriodMs() const;
 
-	ReturnValue_t sleepFor(uint32_t ms) override;
+	ReturnValue_t sleepFor(uint32_t ms);
 
 private:
 	typedef std::vector<ExecutableObjectIF*> ObjectList;	//!< Typedef for the List of objects.

osal/rtems/CpuUsage.cpp

@@ -89,15 +89,15 @@ void CpuUsage::clear() {
 	threadData.clear();
 }
 
-ReturnValue_t CpuUsage::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t CpuUsage::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
-	ReturnValue_t result = SerializeAdapter::serialize(
+	ReturnValue_t result = SerializeAdapter<float>::serialize(
-			&timeSinceLastReset, buffer, size, maxSize, streamEndianness);
+			&timeSinceLastReset, buffer, size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 	return SerialArrayListAdapter<ThreadData>::serialize(&threadData, buffer,
-			size, maxSize, streamEndianness);
+			size, max_size, bigEndian);
 }
 
 uint32_t CpuUsage::getSerializedSize() const {
@@ -109,37 +109,37 @@ uint32_t CpuUsage::getSerializedSize() const {
 	return size;
 }
 
-ReturnValue_t CpuUsage::deSerialize(const uint8_t** buffer, size_t* size,
+ReturnValue_t CpuUsage::deSerialize(const uint8_t** buffer, int32_t* size,
-		Endianness streamEndianness) {
+		bool bigEndian) {
-	ReturnValue_t result = SerializeAdapter::deSerialize(
+	ReturnValue_t result = SerializeAdapter<float>::deSerialize(
-			&timeSinceLastReset, buffer, size, streamEndianness);
+			&timeSinceLastReset, buffer, size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 	return SerialArrayListAdapter<ThreadData>::deSerialize(&threadData, buffer,
-			size, streamEndianness);
+			size, bigEndian);
 }
 
-ReturnValue_t CpuUsage::ThreadData::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t CpuUsage::ThreadData::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
-	ReturnValue_t result = SerializeAdapter::serialize(&id, buffer,
+	ReturnValue_t result = SerializeAdapter<uint32_t>::serialize(&id, buffer,
-			size, maxSize, streamEndianness);
+			size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	if (*size + MAX_LENGTH_OF_THREAD_NAME > maxSize) {
+	if (*size + MAX_LENGTH_OF_THREAD_NAME > max_size) {
 		return BUFFER_TOO_SHORT;
 	}
 	memcpy(*buffer, name, MAX_LENGTH_OF_THREAD_NAME);
 	*size += MAX_LENGTH_OF_THREAD_NAME;
 	*buffer += MAX_LENGTH_OF_THREAD_NAME;
-	result = SerializeAdapter::serialize(&timeRunning,
+	result = SerializeAdapter<float>::serialize(&timeRunning,
-			buffer, size, maxSize, streamEndianness);
+			buffer, size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::serialize(&percentUsage,
+	result = SerializeAdapter<float>::serialize(&percentUsage,
-			buffer, size, maxSize, streamEndianness);
+			buffer, size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -158,9 +158,9 @@ uint32_t CpuUsage::ThreadData::getSerializedSize() const {
 }
 
 ReturnValue_t CpuUsage::ThreadData::deSerialize(const uint8_t** buffer,
-		int32_t* size, Endianness streamEndianness) {
+		int32_t* size, bool bigEndian) {
-	ReturnValue_t result = SerializeAdapter::deSerialize(&id, buffer,
+	ReturnValue_t result = SerializeAdapter<uint32_t>::deSerialize(&id, buffer,
-			size, streamEndianness);
+			size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -169,13 +169,13 @@ ReturnValue_t CpuUsage::ThreadData::deSerialize(const uint8_t** buffer,
 	}
 	memcpy(name, *buffer, MAX_LENGTH_OF_THREAD_NAME);
 	*buffer -= MAX_LENGTH_OF_THREAD_NAME;
-	result = SerializeAdapter::deSerialize(&timeRunning,
+	result = SerializeAdapter<float>::deSerialize(&timeRunning,
-			buffer, size, streamEndianness);
+			buffer, size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::deSerialize(&percentUsage,
+	result = SerializeAdapter<float>::deSerialize(&percentUsage,
-			buffer, size, streamEndianness);
+			buffer, size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}

osal/rtems/CpuUsage.h

@@ -18,13 +18,13 @@ public:
 		float timeRunning;
 		float percentUsage;
 
-		virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+		virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-				size_t maxSize, Endianness streamEndianness) const override;
+				const uint32_t max_size, bool bigEndian) const;
 
-		virtual size_t getSerializedSize() const override;
+		virtual uint32_t getSerializedSize() const;
 
-		virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+		virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-				Endianness streamEndianness) override;
+				bool bigEndian);
 	};
 
 	CpuUsage();
@@ -41,13 +41,13 @@ public:
 
 	void clear();
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 };
 
 #endif /* CPUUSAGE_H_ */

parameters/ParameterHelper.cpp

@@ -83,7 +83,7 @@ ReturnValue_t ParameterHelper::handleParameterMessage(CommandMessage *message) {
 
 ReturnValue_t ParameterHelper::sendParameter(MessageQueueId_t to, uint32_t id,
 		const ParameterWrapper* description) {
-	size_t serializedSize = description->getSerializedSize();
+	uint32_t serializedSize = description->getSerializedSize();
 
 	uint8_t *storeElement;
 	store_address_t address;
@@ -94,10 +94,10 @@ ReturnValue_t ParameterHelper::sendParameter(MessageQueueId_t to, uint32_t id,
 		return result;
 	}
 
-	size_t storeElementSize = 0;
+	uint32_t storeElementSize = 0;
 
 	result = description->serialize(&storeElement, &storeElementSize,
-			serializedSize, SerializeIF::Endianness::BIG);
+			serializedSize, true);
 
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		storage->deleteData(address);

parameters/ParameterWrapper.cpp

@@ -2,41 +2,41 @@
 
 ParameterWrapper::ParameterWrapper() :
 		pointsToStream(false), type(Type::UNKNOWN_TYPE), rows(0), columns(0), data(
-		NULL), readonlyData(NULL) {
+				NULL), readonlyData(NULL) {
 }
 
 ParameterWrapper::ParameterWrapper(Type type, uint8_t rows, uint8_t columns,
-		void *data) :
+		void* data) :
 		pointsToStream(false), type(type), rows(rows), columns(columns), data(
 				data), readonlyData(data) {
 }
 
 ParameterWrapper::ParameterWrapper(Type type, uint8_t rows, uint8_t columns,
-		const void *data) :
+		const void* data) :
 		pointsToStream(false), type(type), rows(rows), columns(columns), data(
-		NULL), readonlyData(data) {
+				NULL), readonlyData(data) {
 }
 
 ParameterWrapper::~ParameterWrapper() {
 }
 
-ReturnValue_t ParameterWrapper::serialize(uint8_t **buffer, size_t *size,
+ReturnValue_t ParameterWrapper::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	ReturnValue_t result;
 
-	result = SerializeAdapter::serialize(&type, buffer, size, maxSize,
+	result = SerializeAdapter<Type>::serialize(&type, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	result = SerializeAdapter::serialize(&columns, buffer, size, maxSize,
+	result = SerializeAdapter<uint8_t>::serialize(&columns, buffer, size,
-			streamEndianness);
+			max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::serialize(&rows, buffer, size, maxSize,
+	result = SerializeAdapter<uint8_t>::serialize(&rows, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -47,33 +47,28 @@ ReturnValue_t ParameterWrapper::serialize(uint8_t **buffer, size_t *size,
 	}
 	switch (type) {
 	case Type::UINT8_T:
-		result = serializeData<uint8_t>(buffer, size, maxSize,
+		result = serializeData<uint8_t>(buffer, size, max_size, bigEndian);
-				streamEndianness);
 		break;
 	case Type::INT8_T:
-		result = serializeData<int8_t>(buffer, size, maxSize, streamEndianness);
+		result = serializeData<int8_t>(buffer, size, max_size, bigEndian);
 		break;
 	case Type::UINT16_T:
-		result = serializeData<uint16_t>(buffer, size, maxSize,
+		result = serializeData<uint16_t>(buffer, size, max_size, bigEndian);
-				streamEndianness);
 		break;
 	case Type::INT16_T:
-		result = serializeData<int16_t>(buffer, size, maxSize,
+		result = serializeData<int16_t>(buffer, size, max_size, bigEndian);
-				streamEndianness);
 		break;
 	case Type::UINT32_T:
-		result = serializeData<uint32_t>(buffer, size, maxSize,
+		result = serializeData<uint32_t>(buffer, size, max_size, bigEndian);
-				streamEndianness);
 		break;
 	case Type::INT32_T:
-		result = serializeData<int32_t>(buffer, size, maxSize,
+		result = serializeData<int32_t>(buffer, size, max_size, bigEndian);
-				streamEndianness);
 		break;
 	case Type::FLOAT:
-		result = serializeData<float>(buffer, size, maxSize, streamEndianness);
+		result = serializeData<float>(buffer, size, max_size, bigEndian);
 		break;
 	case Type::DOUBLE:
-		result = serializeData<double>(buffer, size, maxSize, streamEndianness);
+		result = serializeData<double>(buffer, size, max_size, bigEndian);
 		break;
 	default:
 		result = UNKNOW_DATATYPE;
@@ -82,7 +77,7 @@ ReturnValue_t ParameterWrapper::serialize(uint8_t **buffer, size_t *size,
 	return result;
 }
 
-size_t ParameterWrapper::getSerializedSize() const {
+uint32_t ParameterWrapper::getSerializedSize() const {
 	uint32_t serializedSize = 0;
 	serializedSize += type.getSerializedSize();
 	serializedSize += sizeof(rows);
@@ -93,14 +88,14 @@ size_t ParameterWrapper::getSerializedSize() const {
 }
 
 template<typename T>
-ReturnValue_t ParameterWrapper::serializeData(uint8_t **buffer, size_t *size,
+ReturnValue_t ParameterWrapper::serializeData(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	const T *element = (const T*) readonlyData;
 	ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 	uint16_t dataSize = columns * rows;
 	while (dataSize != 0) {
-		result = SerializeAdapter::serialize(element, buffer, size, maxSize,
+		result = SerializeAdapter<T>::serialize(element, buffer, size, max_size,
-				streamEndianness);
+				bigEndian);
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
@@ -116,21 +111,21 @@ ReturnValue_t ParameterWrapper::deSerializeData(uint8_t startingRow,
 		uint8_t fromColumns) {
 
 	//treat from as a continuous Stream as we copy all of it
-	const uint8_t *fromAsStream = (const uint8_t*) from;
+	const uint8_t *fromAsStream = (const uint8_t *) from;
-	size_t streamSize = fromRows * fromColumns * sizeof(T);
+	int32_t streamSize = fromRows * fromColumns * sizeof(T);
 
 	ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 
 	for (uint8_t fromRow = 0; fromRow < fromRows; fromRow++) {
 
 		//get the start element of this row in data
-		T *dataWithDataType = ((T*) data)
+		T *dataWithDataType = ((T *) data)
 				+ (((startingRow + fromRow) * columns) + startingColumn);
 
 		for (uint8_t fromColumn = 0; fromColumn < fromColumns; fromColumn++) {
-			result = SerializeAdapter::deSerialize(
+			result = SerializeAdapter<T>::deSerialize(
 					dataWithDataType + fromColumn, &fromAsStream, &streamSize,
-					SerializeIF::Endianness::BIG);
+					true);
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
 			}
@@ -141,14 +136,13 @@ ReturnValue_t ParameterWrapper::deSerializeData(uint8_t startingRow,
 
 }
 
-ReturnValue_t ParameterWrapper::deSerialize(const uint8_t **buffer,
+ReturnValue_t ParameterWrapper::deSerialize(const uint8_t** buffer,
-		size_t *size, Endianness streamEndianness) {
+		int32_t* size, bool bigEndian) {
-	return deSerialize(buffer, size, streamEndianness, 0);
+	return deSerialize(buffer, size, bigEndian, 0);
 }
 
-ReturnValue_t ParameterWrapper::deSerialize(const uint8_t **buffer,
+ReturnValue_t ParameterWrapper::deSerialize(const uint8_t** buffer,
-		size_t *size, Endianness streamEndianness,
+		int32_t* size, bool bigEndian, uint16_t startWritingAtIndex) {
-		uint16_t startWritingAtIndex) {
 	ParameterWrapper streamDescription;
 
 	ReturnValue_t result = streamDescription.set(*buffer, *size, buffer, size);
@@ -159,26 +153,26 @@ ReturnValue_t ParameterWrapper::deSerialize(const uint8_t **buffer,
 	return copyFrom(&streamDescription, startWritingAtIndex);
 }
 
-ReturnValue_t ParameterWrapper::set(const uint8_t *stream, size_t streamSize,
+ReturnValue_t ParameterWrapper::set(const uint8_t* stream, int32_t streamSize,
-		const uint8_t **remainingStream, size_t *remainingSize) {
+		const uint8_t **remainingStream, int32_t *remainingSize) {
-	ReturnValue_t result = SerializeAdapter::deSerialize(&type, &stream,
+	ReturnValue_t result = SerializeAdapter<Type>::deSerialize(&type, &stream,
-			&streamSize, SerializeIF::Endianness::BIG);
+			&streamSize, true);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	result = SerializeAdapter::deSerialize(&columns, &stream, &streamSize,
+	result = SerializeAdapter<uint8_t>::deSerialize(&columns, &stream,
-			SerializeIF::Endianness::BIG);
+			&streamSize, true);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	result = SerializeAdapter::deSerialize(&rows, &stream, &streamSize,
+	result = SerializeAdapter<uint8_t>::deSerialize(&rows, &stream, &streamSize,
-			SerializeIF::Endianness::BIG);
+			true);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
 
-	size_t dataSize = type.getSize() * rows * columns;
+	int32_t dataSize = type.getSize() * rows * columns;
 
 	if (streamSize < dataSize) {
 		return SerializeIF::STREAM_TOO_SHORT;
@@ -200,7 +194,7 @@ ReturnValue_t ParameterWrapper::set(const uint8_t *stream, size_t streamSize,
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-ReturnValue_t ParameterWrapper::copyFrom(const ParameterWrapper *from,
+ReturnValue_t ParameterWrapper::copyFrom(const ParameterWrapper* from,
 		uint16_t startWritingAtIndex) {
 	if (data == NULL) {
 		return READONLY;
@@ -267,7 +261,7 @@ ReturnValue_t ParameterWrapper::copyFrom(const ParameterWrapper *from,
 		}
 	} else {
 		//need a type to do arithmetic
-		uint8_t *toDataWithType = (uint8_t*) data;
+		uint8_t *toDataWithType = (uint8_t *) data;
 		for (uint8_t fromRow = 0; fromRow < from->rows; fromRow++) {
 			memcpy(
 					toDataWithType

parameters/ParameterWrapper.h

@@ -25,16 +25,16 @@ public:
 			const void *data);
 	virtual ~ParameterWrapper();
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness, uint16_t startWritingAtIndex = 0);
+			bool bigEndian, uint16_t startWritingAtIndex = 0);
 
 	template<typename T>
 	ReturnValue_t getElement(T *value, uint8_t row = 0, uint8_t column = 0) const {
@@ -54,7 +54,7 @@ public:
 			const uint8_t *streamWithtype = (const uint8_t *) readonlyData;
 			streamWithtype += (row * columns + column) * type.getSize();
 			int32_t size = type.getSize();
-			return SerializeAdapter::deSerialize(value, &streamWithtype,
+			return SerializeAdapter<T>::deSerialize(value, &streamWithtype,
 					&size, true);
 		} else {
 			const T *dataWithType = (const T *) readonlyData;
@@ -111,8 +111,8 @@ public:
 	void setMatrix(const T& member) {
 		this->set(member[0], sizeof(member)/sizeof(member[0]), sizeof(member[0])/sizeof(member[0][0]));
 	}
-	ReturnValue_t set(const uint8_t *stream, size_t streamSize,
+	ReturnValue_t set(const uint8_t *stream, int32_t streamSize,
-			const uint8_t **remainingStream = NULL, size_t *remainingSize =
+			const uint8_t **remainingStream = NULL, int32_t *remainingSize =
 					NULL);
 
 	ReturnValue_t copyFrom(const ParameterWrapper *from,
@@ -128,8 +128,8 @@ private:
 	const void *readonlyData;
 
 	template<typename T>
-	ReturnValue_t serializeData(uint8_t** buffer, size_t* size,
+	ReturnValue_t serializeData(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const;
+			const uint32_t max_size, bool bigEndian) const;
 
 	template<typename T>
 	ReturnValue_t deSerializeData(uint8_t startingRow, uint8_t startingColumn,

power/Fuse.cpp

@@ -86,12 +86,12 @@ ReturnValue_t Fuse::check() {
 	return result;
 }
 
-ReturnValue_t Fuse::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t Fuse::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	ReturnValue_t result = RETURN_FAILED;
 	for (DeviceList::const_iterator iter = devices.begin();
 			iter != devices.end(); iter++) {
-		result = (*iter)->serialize(buffer, size, maxSize, streamEndianness);
+		result = (*iter)->serialize(buffer, size, max_size, bigEndian);
 		if (result != RETURN_OK) {
 			return result;
 		}
@@ -99,7 +99,7 @@ ReturnValue_t Fuse::serialize(uint8_t** buffer, size_t* size,
 	return RETURN_OK;
 }
 
-size_t Fuse::getSerializedSize() const {
+uint32_t Fuse::getSerializedSize() const {
 	uint32_t size = 0;
 	for (DeviceList::const_iterator iter = devices.begin();
 			iter != devices.end(); iter++) {
@@ -108,12 +108,12 @@ size_t Fuse::getSerializedSize() const {
 	return size;
 }
 
-ReturnValue_t Fuse::deSerialize(const uint8_t** buffer, size_t* size,
+ReturnValue_t Fuse::deSerialize(const uint8_t** buffer, int32_t* size,
-Endianness streamEndianness) {
+bool bigEndian) {
 	ReturnValue_t result = RETURN_FAILED;
 	for (DeviceList::iterator iter = devices.begin(); iter != devices.end();
 			iter++) {
-		result = (*iter)->deSerialize(buffer, size, streamEndianness);
+		result = (*iter)->deSerialize(buffer, size, bigEndian);
 		if (result != RETURN_OK) {
 			return result;
 		}

power/Fuse.h

@@ -11,15 +11,14 @@
 #include <framework/parameters/ParameterHelper.h>
 #include <list>
 
-namespace Factory {
+namespace Factory{
 void setStaticFrameworkObjectIds();
 }
 
 class Fuse: public SystemObject,
 		public HasHealthIF,
 		public HasReturnvaluesIF,
-		public ReceivesParameterMessagesIF,
+		public ReceivesParameterMessagesIF {
-		public SerializeIF {
 	friend void (Factory::setStaticFrameworkObjectIds)();
 private:
 	static constexpr float RESIDUAL_POWER = 0.005 * 28.5; //!< This is the upper limit of residual power lost by fuses and switches. Worst case is Fuse and one of two switches on. See PCDU ICD 1.9 p29 bottom
@@ -41,7 +40,7 @@ public:
 	Fuse(object_id_t fuseObjectId, uint8_t fuseId, VariableIds ids,
 			float maxCurrent, uint16_t confirmationCount = 2);
 	virtual ~Fuse();
-	void addDevice(PowerComponentIF *set);
+	void addDevice(PowerComponentIF* set);
 	float getPower();
 
 	bool isPowerValid();
@@ -50,11 +49,11 @@ public:
 	uint8_t getFuseId() const;
 	ReturnValue_t initialize();
 	DeviceList devices;
-	ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			SerializeIF::Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
-	size_t getSerializedSize() const override;
+	uint32_t getSerializedSize() const;
-	ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			SerializeIF::Endianness streamEndianness) override;
+	bool bigEndian);
 	void setAllMonitorsToUnchecked();
 	ReturnValue_t performOperation(uint8_t opCode);
 	MessageQueueId_t getCommandQueue() const;
@@ -63,13 +62,13 @@ public:
 	HasHealthIF::HealthState getHealth();
 
 	ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId,
-			ParameterWrapper *parameterWrapper,
+				ParameterWrapper *parameterWrapper,
-			const ParameterWrapper *newValues, uint16_t startAtIndex);
+				const ParameterWrapper *newValues, uint16_t startAtIndex);
 
 private:
 	uint8_t oldFuseState;
 	uint8_t fuseId;
-	PowerSwitchIF *powerIF; //could be static in our case.
+	PowerSwitchIF* powerIF; //could be static in our case.
 	AbsLimitMonitor<float> currentLimit;
 	class PowerMonitor: public MonitorReporter<float> {
 	public:
@@ -89,11 +88,11 @@ private:
 	PIDReader<float> current;
 	PIDReader<uint8_t> state;
 	db_float_t power;
-	MessageQueueIF *commandQueue;
+	MessageQueueIF* commandQueue;
 	ParameterHelper parameterHelper;
 	HealthHelper healthHelper;
 	static object_id_t powerSwitchId;
-	void calculatePowerLimits(float *low, float *high);
+	void calculatePowerLimits(float* low, float* high);
 	void calculateFusePower();
 	void checkFuseState();
 	void reportEvents(Event event);

power/PowerComponent.cpp

@@ -17,18 +17,18 @@ PowerComponent::PowerComponent(object_id_t setId, uint8_t moduleId, float min, f
 				twoSwitches), min(min), max(max), moduleId(moduleId) {
 }
 
-ReturnValue_t PowerComponent::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t PowerComponent::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
-	ReturnValue_t result = SerializeAdapter::serialize(&min, buffer,
+	ReturnValue_t result = SerializeAdapter<float>::serialize(&min, buffer,
-			size, maxSize, streamEndianness);
+			size, max_size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	return SerializeAdapter::serialize(&max, buffer, size, maxSize,
+	return SerializeAdapter<float>::serialize(&max, buffer, size, max_size,
-			streamEndianness);
+			bigEndian);
 }
 
-size_t PowerComponent::getSerializedSize() const {
+uint32_t PowerComponent::getSerializedSize() const {
 	return sizeof(min) + sizeof(max);
 }
 
@@ -56,14 +56,14 @@ float PowerComponent::getMax() {
 	return max;
 }
 
-ReturnValue_t PowerComponent::deSerialize(const uint8_t** buffer, size_t* size,
+ReturnValue_t PowerComponent::deSerialize(const uint8_t** buffer, int32_t* size,
-Endianness streamEndianness) {
+bool bigEndian) {
-	ReturnValue_t result = SerializeAdapter::deSerialize(&min, buffer,
+	ReturnValue_t result = SerializeAdapter<float>::deSerialize(&min, buffer,
-			size, streamEndianness);
+			size, bigEndian);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
-	return SerializeAdapter::deSerialize(&max, buffer, size, streamEndianness);
+	return SerializeAdapter<float>::deSerialize(&max, buffer, size, bigEndian);
 }
 
 ReturnValue_t PowerComponent::getParameter(uint8_t domainId,

power/PowerComponent.h

@@ -19,13 +19,13 @@ public:
 	float getMin();
 	float getMax();
 
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	size_t getSerializedSize() const override;
+	uint32_t getSerializedSize() const;
 
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 
 	ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId,
 				ParameterWrapper *parameterWrapper,

returnvalues/FwClassIds.h

@@ -24,7 +24,6 @@ enum {
 	MEMORY_HELPER, //MH
 	SERIALIZE_IF, //SE
 	FIXED_MAP, //FM
-	FIXED_MULTIMAP, //FMM
 	HAS_HEALTH_IF, //HHI
 	FIFO_CLASS, //FF
 	MESSAGE_PROXY, //MQP
@@ -55,15 +54,11 @@ enum {
 	HAS_ACTIONS_IF, //HF
 	DEVICE_COMMUNICATION_IF, //DC
 	BSP, //BSP
-	TIME_STAMPER_IF, //TSI 53
+	TIME_STAMPER_IF, //TSI 52
 	//TODO This will shift all IDs for FLP
-	SGP4PROPAGATOR_CLASS, //SGP4 54
+	SGP4PROPAGATOR_CLASS, //SGP4 53
-	MUTEX_IF, //MUX 55
+	MUTEX_IF, //MUX 54
-	MESSAGE_QUEUE_IF,//MQI 56
+	MESSAGE_QUEUE_IF,//MQI 55
-	SEMAPHORE_IF, //SPH 57
-	LOCAL_POOL_OWNER_IF, //LPIF 58
-	POOL_VARIABLE_IF, //PVA 59
-	HOUSEKEEPING_MANAGER, //HKM 60
 	FW_CLASS_ID_COUNT //is actually count + 1 !
 
 };

returnvalues/HasReturnvaluesIF.h

@@ -1,23 +1,27 @@
-#ifndef FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_
+#ifndef HASRETURNVALUESIF_H_
-#define FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_
+#define HASRETURNVALUESIF_H_
 
+#include <stdint.h>
 #include <framework/returnvalues/FwClassIds.h>
 #include <config/returnvalues/classIds.h>
-#include <cstdint>
 
 #define MAKE_RETURN_CODE( number )	((INTERFACE_ID << 8) + (number))
 typedef uint16_t ReturnValue_t;
 
 
+
+
+
+
 class HasReturnvaluesIF {
 public:
 	static const ReturnValue_t RETURN_OK = 0;
 	static const ReturnValue_t RETURN_FAILED = 1;
-	virtual ~HasReturnvaluesIF() {}
+	virtual ~HasReturnvaluesIF() {
-
-	static ReturnValue_t makeReturnCode(uint8_t interfaceId, uint8_t number) {
-	    return (interfaceId << 8) + number;
 	}
+
 };
 
-#endif /* FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ */
+
+
+#endif /* HASRETURNVALUESIF_H_ */

rmap/RMAPCookie.h

@@ -1,12 +1,12 @@
 #ifndef RMAPCOOKIE_H_
 #define RMAPCOOKIE_H_
 
-#include <framework/devicehandlers/CookieIF.h>
+#include <framework/devicehandlers/Cookie.h>
 #include <framework/rmap/rmapStructs.h>
 
 class RMAPChannelIF;
 
-class RMAPCookie : public CookieIF {
+class RMAPCookie : public Cookie{
 public:
 	//To Uli: Sorry, I need an empty ctor to initialize an array of cookies.
 	RMAPCookie();

rmap/RmapDeviceCommunicationIF.cpp

@@ -5,43 +5,43 @@
 RmapDeviceCommunicationIF::~RmapDeviceCommunicationIF() {
 }
 
-ReturnValue_t RmapDeviceCommunicationIF::sendMessage(CookieIF* cookie,
+ReturnValue_t RmapDeviceCommunicationIF::sendMessage(Cookie* cookie,
 		uint8_t* data, uint32_t len) {
 	return RMAP::sendWriteCommand((RMAPCookie *) cookie, data, len);
 }
 
-ReturnValue_t RmapDeviceCommunicationIF::getSendSuccess(CookieIF* cookie) {
+ReturnValue_t RmapDeviceCommunicationIF::getSendSuccess(Cookie* cookie) {
 	return RMAP::getWriteReply((RMAPCookie *) cookie);
 }
 
 ReturnValue_t RmapDeviceCommunicationIF::requestReceiveMessage(
-		CookieIF* cookie) {
+		Cookie* cookie) {
 	return RMAP::sendReadCommand((RMAPCookie *) cookie,
 				((RMAPCookie *) cookie)->getMaxReplyLen());
 }
 
-ReturnValue_t RmapDeviceCommunicationIF::readReceivedMessage(CookieIF* cookie,
+ReturnValue_t RmapDeviceCommunicationIF::readReceivedMessage(Cookie* cookie,
 		uint8_t** buffer, uint32_t* size) {
 	return RMAP::getReadReply((RMAPCookie *) cookie, buffer, size);
 }
 
-ReturnValue_t RmapDeviceCommunicationIF::setAddress(CookieIF* cookie,
+ReturnValue_t RmapDeviceCommunicationIF::setAddress(Cookie* cookie,
 		uint32_t address) {
 
 	((RMAPCookie *) cookie)->setAddress(address);
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-uint32_t RmapDeviceCommunicationIF::getAddress(CookieIF* cookie) {
+uint32_t RmapDeviceCommunicationIF::getAddress(Cookie* cookie) {
 	return ((RMAPCookie *) cookie)->getAddress();
 }
 
-ReturnValue_t RmapDeviceCommunicationIF::setParameter(CookieIF* cookie,
+ReturnValue_t RmapDeviceCommunicationIF::setParameter(Cookie* cookie,
 		uint32_t parameter) {
 	//TODO Empty?
 	return HasReturnvaluesIF::RETURN_FAILED;
 }
 
-uint32_t RmapDeviceCommunicationIF::getParameter(CookieIF* cookie) {
+uint32_t RmapDeviceCommunicationIF::getParameter(Cookie* cookie) {
 	return 0;
 }

rmap/RmapDeviceCommunicationIF.h

@@ -25,7 +25,7 @@ public:
 	 * @param maxReplyLen Maximum length of expected reply
 	 * @return
 	 */
-	virtual ReturnValue_t open(CookieIF **cookie, uint32_t address,
+	virtual ReturnValue_t open(Cookie **cookie, uint32_t address,
 			uint32_t maxReplyLen) = 0;
 
 	/**
@@ -39,7 +39,7 @@ public:
 	 * @param maxReplyLen
 	 * @return
 	 */
-	virtual ReturnValue_t reOpen(CookieIF *cookie, uint32_t address,
+	virtual ReturnValue_t reOpen(Cookie *cookie, uint32_t address,
 			uint32_t maxReplyLen) = 0;
 
 
@@ -47,7 +47,7 @@ public:
 	 * Closing call of connection and memory free of cookie. Mission dependent call
 	 * @param cookie
 	 */
-	virtual void close(CookieIF *cookie) = 0;
+	virtual void close(Cookie *cookie) = 0;
 
 	//SHOULDDO can data be const?
 	/**
@@ -58,23 +58,23 @@ public:
 	 * @param len Length of the data to be send
 	 * @return - Return codes of RMAP::sendWriteCommand()
 	 */
-	virtual ReturnValue_t sendMessage(CookieIF *cookie, uint8_t *data,
+	virtual ReturnValue_t sendMessage(Cookie *cookie, uint8_t *data,
 			uint32_t len);
 
-	virtual ReturnValue_t getSendSuccess(CookieIF *cookie);
+	virtual ReturnValue_t getSendSuccess(Cookie *cookie);
 
-	virtual ReturnValue_t requestReceiveMessage(CookieIF *cookie);
+	virtual ReturnValue_t requestReceiveMessage(Cookie *cookie);
 
-	virtual ReturnValue_t readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
+	virtual ReturnValue_t readReceivedMessage(Cookie *cookie, uint8_t **buffer,
 			uint32_t *size);
 
-	virtual ReturnValue_t setAddress(CookieIF *cookie, uint32_t address);
+	virtual ReturnValue_t setAddress(Cookie *cookie, uint32_t address);
 
-	virtual uint32_t getAddress(CookieIF *cookie);
+	virtual uint32_t getAddress(Cookie *cookie);
 
-	virtual ReturnValue_t setParameter(CookieIF *cookie, uint32_t parameter);
+	virtual ReturnValue_t setParameter(Cookie *cookie, uint32_t parameter);
 
-	virtual uint32_t getParameter(CookieIF *cookie);
+	virtual uint32_t getParameter(Cookie *cookie);
 };
 
 #endif /* MISSION_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_ */

serialize/EndianConverter.h

@@ -1,126 +0,0 @@
-#ifndef ENDIANSWAPPER_H_
-#define ENDIANSWAPPER_H_
-
-#include <framework/osal/Endiness.h>
-#include <cstring>
-#include <iostream>
-
-/**
- * Helper class to convert variables or bitstreams between machine
- * endian and either big or little endian.
- * Machine endian is the endianness used by the machine running the
- * program and is one of big or little endian. As this is portable
- * code, it is not known at coding time which it is. At compile time
- * it is however, which is why this is implemented using compiler
- * macros and translates to a copy operation at runtime.
- *
- * This changes the layout of multi-byte variables in the machine's
- * memory. In most cases, you should not need to use this class.
- * Probably what you are looking for is the SerializeAdapter.
- * If you still decide you need this class, please read and understand
- * the code first.
- *
- * The order of the individual bytes of the multi-byte variable is
- * reversed, the byte at the highest address is moved to the lowest
- * address and vice versa, same for the bytes in between.
- *
- * Note that the conversion is also its inversion, that is converting
- * from machine to a specified endianness is the same operation as
- * converting from specified to machine (I looked it up, mathematicians
- * would call it an involution):
- *
- * X == convertBigEndian(convertBigEndian(X))
- *
- * Thus, there is only one function supplied to do the conversion.
- */
-class EndianConverter {
-private:
-	EndianConverter() {
-	}
-	;
-public:
-	/**
-	 * Convert a typed variable between big endian and machine endian.
-	 * Intended for plain old datatypes.
-	 */
-	template<typename T>
-	static T convertBigEndian(T in) {
-#ifndef BYTE_ORDER_SYSTEM
-#error BYTE_ORDER_SYSTEM not defined
-#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-		T tmp;
-		uint8_t *pointerOut = (uint8_t*) &tmp;
-		uint8_t *pointerIn = (uint8_t*) &in;
-		for (size_t count = 0; count < sizeof(T); count++) {
-			pointerOut[sizeof(T) - count - 1] = pointerIn[count];
-		}
-		return tmp;
-#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-		return in;
-#else
-#error Unknown Byte Order
-#endif
-	}
-
-	/**
-	 * convert a bytestream representing a single variable between big endian
-	 * and machine endian.
-	 */
-	static void convertBigEndian(uint8_t *out, const uint8_t *in,
-			size_t size) {
-#ifndef BYTE_ORDER_SYSTEM
-#error BYTE_ORDER_SYSTEM not defined
-#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-		for (size_t count = 0; count < size; count++) {
-			out[size - count - 1] = in[count];
-		}
-		return;
-#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-		memcpy(out, in, size);
-		return;
-#endif
-	}
-
-	/**
-	 * Convert a typed variable between little endian and machine endian.
-	 * Intended for plain old datatypes.
-	 */
-	template<typename T>
-	static T convertLittleEndian(T in) {
-#ifndef BYTE_ORDER_SYSTEM
-	#error BYTE_ORDER_SYSTEM not defined
-	#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-			T tmp;
-			uint8_t *pointerOut = (uint8_t *) &tmp;
-			uint8_t *pointerIn = (uint8_t *) &in;
-			for (size_t count = 0; count < sizeof(T); count++) {
-				pointerOut[sizeof(T) - count - 1] = pointerIn[count];
-			}
-			return tmp;
-	#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-		return in;
-#else
-	#error Unknown Byte Order
-	#endif
-	}
-	/**
-	 * convert a bytestream representing a single variable between little endian
-	 * and machine endian.
-	 */
-	static void convertLittleEndian(uint8_t *out, const uint8_t *in,
-			size_t size) {
-#ifndef BYTE_ORDER_SYSTEM
-	#error BYTE_ORDER_SYSTEM not defined
-	#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
-			for (size_t count = 0; count < size; count++) {
-				out[size - count - 1] = in[count];
-			}
-			return;
-	#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
-		memcpy(out, in, size);
-		return;
-#endif
-	}
-};
-
-#endif /* ENDIANSWAPPER_H_ */

serialize/EndianSwapper.h

@@ -0,0 +1,47 @@
+#ifndef ENDIANSWAPPER_H_
+#define ENDIANSWAPPER_H_
+
+#include <framework/osal/Endiness.h>
+#include <cstring>
+#include <iostream>
+
+class EndianSwapper {
+private:
+	EndianSwapper() {
+	}
+	;
+public:
+	template<typename T>
+	static T swap(T in) {
+#ifndef BYTE_ORDER_SYSTEM
+#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+		T tmp;
+		uint8_t *pointerOut = (uint8_t *) &tmp;
+		uint8_t *pointerIn = (uint8_t *) &in;
+		for (uint8_t count = 0; count < sizeof(T); count++) {
+			pointerOut[sizeof(T) - count - 1] = pointerIn[count];
+		}
+		return tmp;
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+		return in;
+#else
+#error Unknown Byte Order
+#endif
+	}
+	static void swap(uint8_t* out, const uint8_t* in, uint32_t size) {
+#ifndef BYTE_ORDER_SYSTEM
+#error BYTE_ORDER_SYSTEM not defined
+#elif BYTE_ORDER_SYSTEM == LITTLE_ENDIAN
+		for (uint8_t count = 0; count < size; count++) {
+			out[size - count - 1] = in[count];
+		}
+		return;
+#elif BYTE_ORDER_SYSTEM == BIG_ENDIAN
+		memcpy(out, in, size);
+		return;
+#endif
+	}
+};
+
+#endif /* ENDIANSWAPPER_H_ */

serialize/SerialArrayListAdapter.h

@@ -1,13 +1,18 @@
-#ifndef FRAMEWORK_SERIALIZE_SERIALARRAYLISTADAPTER_H_
+/**
-#define FRAMEWORK_SERIALIZE_SERIALARRAYLISTADAPTER_H_
+ * @file	SerialArrayListAdapter.h
+ * @brief	This file defines the SerialArrayListAdapter class.
+ * @date	22.07.2014
+ * @author	baetz
+ */
+#ifndef SERIALARRAYLISTADAPTER_H_
+#define SERIALARRAYLISTADAPTER_H_
 
 #include <framework/container/ArrayList.h>
 #include <framework/serialize/SerializeIF.h>
 #include <utility>
 
 /**
- * @ingroup serialize
+ * \ingroup serialize
- * @author  baetz
  */
 template<typename T, typename count_t = uint8_t>
 class SerialArrayListAdapter : public SerializeIF {
@@ -15,26 +20,25 @@ public:
 	SerialArrayListAdapter(ArrayList<T, count_t> *adaptee) : adaptee(adaptee) {
 	}
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
-		return serialize(adaptee, buffer, size, maxSize, streamEndianness);
+		return serialize(adaptee, buffer, size, max_size, bigEndian);
 	}
 
-	static ReturnValue_t serialize(const ArrayList<T, count_t>* list,
+	static ReturnValue_t serialize(const ArrayList<T, count_t>* list, uint8_t** buffer, uint32_t* size,
-	        uint8_t** buffer, size_t* size, size_t maxSize,
+			const uint32_t max_size, bool bigEndian) {
-	        Endianness streamEndianness) {
+		ReturnValue_t result = SerializeAdapter<count_t>::serialize(&list->size,
-		ReturnValue_t result = SerializeAdapter::serialize(&list->size,
+				buffer, size, max_size, bigEndian);
-				buffer, size, maxSize, streamEndianness);
 		count_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < list->size)) {
-			result = SerializeAdapter::serialize(&list->entries[i], buffer,
+			result = SerializeAdapter<T>::serialize(&list->entries[i], buffer, size,
-			        size, maxSize, streamEndianness);
+					max_size, bigEndian);
 			++i;
 		}
 		return result;
 	}
 
-	virtual size_t getSerializedSize() const {
+	virtual uint32_t getSerializedSize() const {
 		return getSerializedSize(adaptee);
 	}
 
@@ -43,35 +47,31 @@ public:
 		count_t i = 0;
 
 		for (i = 0; i < list->size; ++i) {
-			printSize += SerializeAdapter::getSerializedSize(&list->entries[i]);
+			printSize += SerializeAdapter<T>::getSerializedSize(&list->entries[i]);
 		}
 
 		return printSize;
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
-		return deSerialize(adaptee, buffer, size, streamEndianness);
+		return deSerialize(adaptee, buffer, size, bigEndian);
 	}
 
-	static ReturnValue_t deSerialize(ArrayList<T, count_t>* list,
+	static ReturnValue_t deSerialize(ArrayList<T, count_t>* list, const uint8_t** buffer, int32_t* size,
-	        const uint8_t** buffer, size_t* size,
+			bool bigEndian) {
-			Endianness streamEndianness) {
 		count_t tempSize = 0;
-		ReturnValue_t result = SerializeAdapter::deSerialize(&tempSize,
+		ReturnValue_t result = SerializeAdapter<count_t>::deSerialize(&tempSize,
-				buffer, size, streamEndianness);
+				buffer, size, bigEndian);
-		if(result != HasReturnvaluesIF::RETURN_OK) {
-		    return result;
-		}
 		if (tempSize > list->maxSize()) {
 			return SerializeIF::TOO_MANY_ELEMENTS;
 		}
 		list->size = tempSize;
 		count_t i = 0;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (i < list->size)) {
-			result = SerializeAdapter::deSerialize(
+			result = SerializeAdapter<T>::deSerialize(
 					&list->front()[i], buffer, size,
-					streamEndianness);
+					bigEndian);
 			++i;
 		}
 		return result;
@@ -82,4 +82,4 @@ private:
 
 
 
-#endif /* FRAMEWORK_SERIALIZE_SERIALARRAYLISTADAPTER_H_ */
+#endif /* SERIALARRAYLISTADAPTER_H_ */

serialize/SerialBufferAdapter.cpp

@@ -22,19 +22,19 @@ SerialBufferAdapter<T>::~SerialBufferAdapter() {
 }
 
 template<typename T>
-ReturnValue_t SerialBufferAdapter<T>::serialize(uint8_t** buffer, size_t* size,
+ReturnValue_t SerialBufferAdapter<T>::serialize(uint8_t** buffer, uint32_t* size,
-		size_t maxSize, Endianness streamEndianness) const {
+		const uint32_t max_size, bool bigEndian) const {
 	uint32_t serializedLength = bufferLength;
 	if (serializeLength) {
-		serializedLength += SerializeAdapter::getSerializedSize(
+		serializedLength += AutoSerializeAdapter::getSerializedSize(
 				&bufferLength);
 	}
-	if (*size + serializedLength > maxSize) {
+	if (*size + serializedLength > max_size) {
 		return BUFFER_TOO_SHORT;
 	} else {
 		if (serializeLength) {
-			SerializeAdapter::serialize(&bufferLength, buffer, size,
+			AutoSerializeAdapter::serialize(&bufferLength, buffer, size,
-					maxSize, streamEndianness);
+					max_size, bigEndian);
 		}
 		if (this->constBuffer != NULL) {
 			memcpy(*buffer, this->constBuffer, bufferLength);
@@ -50,20 +50,20 @@ ReturnValue_t SerialBufferAdapter<T>::serialize(uint8_t** buffer, size_t* size,
 }
 
 template<typename T>
-size_t SerialBufferAdapter<T>::getSerializedSize() const {
+uint32_t SerialBufferAdapter<T>::getSerializedSize() const {
 	if (serializeLength) {
-		return bufferLength + SerializeAdapter::getSerializedSize(&bufferLength);
+		return bufferLength + AutoSerializeAdapter::getSerializedSize(&bufferLength);
 	} else {
 		return bufferLength;
 	}
 }
 template<typename T>
 ReturnValue_t SerialBufferAdapter<T>::deSerialize(const uint8_t** buffer,
-		size_t* size, Endianness streamEndianness) {
+		int32_t* size, bool bigEndian) {
 	//TODO Ignores Endian flag!
 	if (buffer != NULL) {
 		if(serializeLength){
-			T serializedSize = SerializeAdapter::getSerializedSize(
+			T serializedSize = AutoSerializeAdapter::getSerializedSize(
 					&bufferLength);
 			if((*size - bufferLength - serializedSize) >= 0){
 				*buffer +=  serializedSize;

serialize/SerialBufferAdapter.h

@@ -16,13 +16,13 @@ public:
 
 	virtual ~SerialBufferAdapter();
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override;
+			const uint32_t max_size, bool bigEndian) const;
 
-	virtual size_t getSerializedSize() const override;
+	virtual uint32_t getSerializedSize() const;
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override;
+			bool bigEndian);
 private:
 	bool serializeLength;
 	const uint8_t *constBuffer;

serialize/SerialBufferAdapter2.h

@@ -0,0 +1,149 @@
+#ifndef SERIALBUFFERADAPTER2_H_
+#define SERIALBUFFERADAPTER2_H_
+
+#include <framework/serialize/SerializeIF.h>
+#include <framework/serialize/SerializeAdapter.h>
+#include <framework/serviceinterface/ServiceInterfaceStream.h>
+
+#include <cstring>
+extern std::ostream error;
+extern std::ostream debug;
+/**
+ * This adapter provides an interface for SerializeIF to serialize or deserialize
+ * buffers with no length header but a known size.
+ *
+ * Additionally, the buffer length can be serialized too and will be put in front of the serialized buffer.
+ *
+ * Can be used with SerialLinkedListAdapter by declaring a SerializeElement with
+ * SerialElement<SerialBufferAdapter<bufferLengthType(will be uint8_t mostly)>> serialBufferElement.
+ * Right now, the SerialBufferAdapter must always be initialized with the buffer and size !
+ *
+ * \ingroup serialize
+ */
+template<typename BUFFER_TYPE = uint8_t, typename count_t = uint8_t>
+class SerialBufferAdapter2: public SerializeIF {
+public:
+	/**
+	 * Constructor for constant uint8_t buffer. Length field can be serialized optionally.
+	 * Type of length can be supplied as template type.
+	 * @param buffer
+	 * @param bufferLength
+	 * @param serializeLength
+	 */
+	SerialBufferAdapter2(void * buffer_, count_t bufferLength_, bool serializeLength_ = false):
+				bufferLength(bufferLength_), serializeLength(serializeLength_) {
+		determineLengthInBytes(sizeof(BUFFER_TYPE));
+		buffer = reinterpret_cast<const uint8_t *>(buffer_);
+		constBuffer = NULL;
+	}
+
+	SerialBufferAdapter2(const void * buffer_, count_t bufferLength_, bool serializeLength_ = false):
+					bufferLength(bufferLength_), serializeLength(serializeLength_) {
+		determineLengthInBytes(sizeof(BUFFER_TYPE));
+		constBuffer = reinterpret_cast<const uint8_t *>(buffer_);
+		buffer = NULL;
+	}
+
+	ReturnValue_t serialize(uint8_t ** buffer, uint32_t* size,
+			const uint32_t max_size, bool bigEndian) const {
+		uint32_t serializedLength = bufferLength;
+		if (serializeLength) {
+			serializedLength += AutoSerializeAdapter::getSerializedSize(
+					&bufferLength);
+		}
+		if (*size + serializedLength > max_size) {
+			return BUFFER_TOO_SHORT;
+		} else {
+			if (serializeLength) {
+				AutoSerializeAdapter::serialize(&bufferLength, buffer, size,
+						max_size, bigEndian);
+			}
+			memcpy(*buffer, this->buffer, bufferLength);
+			*size += bufferLength;
+			(*buffer) += bufferLength;
+			return HasReturnvaluesIF::RETURN_OK;
+		}
+	}
+
+	uint32_t getSerializedSize() const {
+		if (serializeLength) {
+			return bufferLength + AutoSerializeAdapter::getSerializedSize(&bufferLength);
+		} else {
+			return bufferLength;
+		}
+	}
+
+	ReturnValue_t deSerialize(const uint8_t** buffer,
+			int32_t* size, bool bigEndian) {
+		//TODO Ignores Endian flag!
+		if (buffer != NULL) {
+			if(serializeLength){
+				// Suggestion (would require removing rest of the block inside this if clause !):
+				//ReturnValue_t result = AutoSerializeAdapter::deSerialize(&bufferLength,buffer,size,bigEndian);
+				//if (result != HasReturnvaluesIF::RETURN_OK) {
+				//	return result;
+				//}
+				count_t serializedSize = AutoSerializeAdapter::getSerializedSize(
+						&bufferLength);
+				if((*size - bufferLength - serializedSize) >= 0){
+					*buffer +=  serializedSize;
+					*size -= serializedSize;
+				}else{
+					return STREAM_TOO_SHORT;
+				}
+			}
+			//No Else If, go on with buffer
+			if (*size - bufferLength >= 0) {
+				*size -= bufferLength;
+				memcpy(this->buffer, *buffer, bufferLength);
+				(*buffer) += bufferLength;
+				return HasReturnvaluesIF::RETURN_OK;
+			} else {
+				return STREAM_TOO_SHORT;
+			}
+		} else {
+			return HasReturnvaluesIF::RETURN_FAILED;
+		}
+	}
+
+
+	BUFFER_TYPE * getBuffer() {
+		return reinterpret_cast<BUFFER_TYPE *>(buffer);
+	}
+
+	void setBuffer(void * buffer_, count_t bufferLength_, bool serializeLength_ = false) {
+		buffer = buffer_;
+		bufferLength = bufferLength_;
+		serializeLength = serializeLength_;
+		determineLengthInBytes(sizeof(BUFFER_TYPE));
+	}
+
+	void setConstBuffer(const void * buffer_, count_t bufferLength_, bool serializeLength_ = false) {
+		constBuffer = buffer_;
+		bufferLength = bufferLength_;
+		serializeLength = serializeLength_;
+		determineLengthInBytes(sizeof(BUFFER_TYPE));
+	}
+private:
+	uint8_t * buffer;
+	const uint8_t * constBuffer;
+	count_t bufferLength;
+	bool serializeLength;
+
+	void determineLengthInBytes(uint8_t typeSize) {
+		switch(typeSize) {
+		case(1): break;
+		case(2):
+			bufferLength *= 2; break;
+		case(4):
+			bufferLength *= 4; break;
+		case(8):
+			bufferLength *= 8; break;
+		default:
+			error << "Serial Buffer Adapter 2: Invalid type size, assuming regular uint8_t." << std::endl;
+			error << "Detected type size: " << (int) typeSize << std::endl;
+		}
+	}
+};
+
+#endif /* SERIALBUFFERADAPTER2_H_ */

serialize/SerialFixedArrayListAdapter.h

@@ -13,16 +13,16 @@ public:
 	template<typename... Args>
 	SerialFixedArrayListAdapter(Args... args) : FixedArrayList<T, MAX_SIZE, count_t>(std::forward<Args>(args)...) {
 	}
-	ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
-		return SerialArrayListAdapter<T, count_t>::serialize(this, buffer, size, maxSize, streamEndianness);
+		return SerialArrayListAdapter<T, count_t>::serialize(this, buffer, size, max_size, bigEndian);
 	}
-	size_t getSerializedSize() const {
+	uint32_t getSerializedSize() const {
 		return SerialArrayListAdapter<T, count_t>::getSerializedSize(this);
 	}
-	ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
-		return SerialArrayListAdapter<T, count_t>::deSerialize(this, buffer, size, streamEndianness);
+		return SerialArrayListAdapter<T, count_t>::deSerialize(this, buffer, size, bigEndian);
 	}
 };
 

serialize/SerialLinkedListAdapter.h

@@ -31,32 +31,32 @@ public:
 			SinglyLinkedList<T>(), printCount(printCount) {
 	}
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
 		if (printCount) {
 			count_t mySize = SinglyLinkedList<T>::getSize();
-			ReturnValue_t result = SerializeAdapter::serialize(&mySize,
+			ReturnValue_t result = SerializeAdapter<count_t>::serialize(&mySize,
-					buffer, size, maxSize, streamEndianness);
+					buffer, size, max_size, bigEndian);
 			if (result != HasReturnvaluesIF::RETURN_OK) {
 				return result;
 			}
 		}
-		return serialize(SinglyLinkedList<T>::start, buffer, size, maxSize,
+		return serialize(SinglyLinkedList<T>::start, buffer, size, max_size,
-				streamEndianness);
+				bigEndian);
 	}
 
 	static ReturnValue_t serialize(const LinkedElement<T>* element,
-			uint8_t** buffer, size_t* size, size_t maxSize,
+			uint8_t** buffer, uint32_t* size, const uint32_t max_size,
-			Endianness streamEndianness) {
+			bool bigEndian) {
 		ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (element != NULL)) {
-			result = element->value->serialize(buffer, size, maxSize,
+			result = element->value->serialize(buffer, size, max_size,
-					streamEndianness);
+					bigEndian);
 			element = element->getNext();
 		}
 		return result;
 	}
-	virtual size_t getSerializedSize() const override {
+	virtual uint32_t getSerializedSize() const {
 		if (printCount) {
 			return SerialLinkedListAdapter<T>::getSerializedSize()
 					+ sizeof(count_t);
@@ -64,8 +64,8 @@ public:
 			return getSerializedSize(SinglyLinkedList<T>::start);
 		}
 	}
-	static size_t getSerializedSize(const LinkedElement<T> *element) {
+	static uint32_t getSerializedSize(const LinkedElement<T> *element) {
-		size_t size = 0;
+		uint32_t size = 0;
 		while (element != NULL) {
 			size += element->value->getSerializedSize();
 			element = element->getNext();
@@ -73,16 +73,16 @@ public:
 		return size;
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override {
+			bool bigEndian) {
-		return deSerialize(SinglyLinkedList<T>::start, buffer, size, streamEndianness);
+		return deSerialize(SinglyLinkedList<T>::start, buffer, size, bigEndian);
 	}
 
 	static ReturnValue_t deSerialize(LinkedElement<T>* element,
-			const uint8_t** buffer, size_t* size, Endianness streamEndianness) {
+			const uint8_t** buffer, int32_t* size, bool bigEndian) {
 		ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 		while ((result == HasReturnvaluesIF::RETURN_OK) && (element != NULL)) {
-			result = element->value->deSerialize(buffer, size, streamEndianness);
+			result = element->value->deSerialize(buffer, size, bigEndian);
 			element = element->getNext();
 		}
 		return result;

serialize/SerializeAdapter.h

@@ -3,121 +3,123 @@
 
 #include <framework/container/IsDerivedFrom.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/serialize/EndianConverter.h>
+#include <framework/serialize/EndianSwapper.h>
 #include <framework/serialize/SerializeIF.h>
 #include <string.h>
 
 /**
  * \ingroup serialize
  */
+template<typename T, int>
+class SerializeAdapter_ {
+public:
+	static ReturnValue_t serialize(const T* object, uint8_t** buffer,
+			uint32_t* size, const uint32_t max_size, bool bigEndian) {
+		uint32_t ignoredSize = 0;
+		if (size == NULL) {
+			size = &ignoredSize;
+		}
+		if (sizeof(T) + *size <= max_size) {
+			T tmp;
+			if (bigEndian) {
+				tmp = EndianSwapper::swap<T>(*object);
+			} else {
+				tmp = *object;
+			}
+			memcpy(*buffer, &tmp, sizeof(T));
+			*size += sizeof(T);
+			(*buffer) += sizeof(T);
+			return HasReturnvaluesIF::RETURN_OK;
+		} else {
+			return SerializeIF::BUFFER_TOO_SHORT;
+		}
+	}
 
+	ReturnValue_t deSerialize(T* object, const uint8_t** buffer, int32_t* size,
+			bool bigEndian) {
+		T tmp;
+		*size -= sizeof(T);
+		if (*size >= 0) {
+			memcpy(&tmp, *buffer, sizeof(T));
+			if (bigEndian) {
+				*object = EndianSwapper::swap<T>(tmp);
+			} else {
+				*object = tmp;
+			}
+			*buffer += sizeof(T);
+			return HasReturnvaluesIF::RETURN_OK;
+		} else {
+			return SerializeIF::STREAM_TOO_SHORT;
+		}
+	}
+
+	uint32_t getSerializedSize(const T * object) {
+		return sizeof(T);
+	}
+
+};
+
+template<typename T>
+class SerializeAdapter_<T, 1> {
+public:
+	ReturnValue_t serialize(const T* object, uint8_t** buffer, uint32_t* size,
+			const uint32_t max_size, bool bigEndian) const {
+		uint32_t ignoredSize = 0;
+		if (size == NULL) {
+			size = &ignoredSize;
+		}
+		return object->serialize(buffer, size, max_size, bigEndian);
+	}
+	uint32_t getSerializedSize(const T* object) const {
+		return object->getSerializedSize();
+	}
+
+	ReturnValue_t deSerialize(T* object, const uint8_t** buffer, int32_t* size,
+			bool bigEndian) {
+		return object->deSerialize(buffer, size, bigEndian);
+	}
+};
+
+template<typename T>
 class SerializeAdapter {
+public:
+	static ReturnValue_t serialize(const T* object, uint8_t** buffer,
+			uint32_t* size, const uint32_t max_size, bool bigEndian) {
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		return adapter.serialize(object, buffer, size, max_size, bigEndian);
+	}
+	static uint32_t getSerializedSize(const T* object) {
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		return adapter.getSerializedSize(object);
+	}
+
+	static ReturnValue_t deSerialize(T* object, const uint8_t** buffer,
+			int32_t* size, bool bigEndian) {
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		return adapter.deSerialize(object, buffer, size, bigEndian);
+	}
+};
+
+
+class AutoSerializeAdapter {
 public:
 	template<typename T>
-	static ReturnValue_t serialize(const T *object, uint8_t **buffer,
+	static ReturnValue_t serialize(const T* object, uint8_t** buffer,
-			size_t *size, size_t maxSize, SerializeIF::Endianness streamEndianness) {
+			uint32_t* size, const uint32_t max_size, bool bigEndian) {
-		InternalSerializeAdapter<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
-		return adapter.serialize(object, buffer, size, maxSize,
+		return adapter.serialize(object, buffer, size, max_size, bigEndian);
-				streamEndianness);
 	}
 	template<typename T>
-	static uint32_t getSerializedSize(const T *object) {
+	static uint32_t getSerializedSize(const T* object) {
-		InternalSerializeAdapter<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
 		return adapter.getSerializedSize(object);
 	}
 	template<typename T>
-	static ReturnValue_t deSerialize(T *object, const uint8_t **buffer,
+	static ReturnValue_t deSerialize(T* object, const uint8_t** buffer,
-			size_t *size, SerializeIF::Endianness streamEndianness) {
+			int32_t* size, bool bigEndian) {
-		InternalSerializeAdapter<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
+		SerializeAdapter_<T, IsDerivedFrom<T, SerializeIF>::Is> adapter;
-		return adapter.deSerialize(object, buffer, size, streamEndianness);
+		return adapter.deSerialize(object, buffer, size, bigEndian);
 	}
-private:
-	template<typename T, int>
-	class InternalSerializeAdapter {
-	public:
-		static ReturnValue_t serialize(const T *object, uint8_t **buffer,
-				size_t *size, size_t max_size, SerializeIF::Endianness streamEndianness) {
-			size_t ignoredSize = 0;
-			if (size == NULL) {
-				size = &ignoredSize;
-			}
-			//TODO check integer overflow of *size
-			if (sizeof(T) + *size <= max_size) {
-				T tmp;
-				switch (streamEndianness) {
-				case SerializeIF::Endianness::BIG:
-					tmp = EndianConverter::convertBigEndian<T>(*object);
-					break;
-				case SerializeIF::Endianness::LITTLE:
-					tmp = EndianConverter::convertLittleEndian<T>(*object);
-					break;
-				default:
-				case SerializeIF::Endianness::MACHINE:
-					tmp = *object;
-					break;
-				}
-				memcpy(*buffer, &tmp, sizeof(T));
-				*size += sizeof(T);
-				(*buffer) += sizeof(T);
-				return HasReturnvaluesIF::RETURN_OK;
-			} else {
-				return SerializeIF::BUFFER_TOO_SHORT;
-			}
-		}
-
-		ReturnValue_t deSerialize(T *object, const uint8_t **buffer,
-				size_t *size, SerializeIF::Endianness streamEndianness) {
-			T tmp;
-			if (*size >= sizeof(T)) {
-				*size -= sizeof(T);
-				memcpy(&tmp, *buffer, sizeof(T));
-				switch (streamEndianness) {
-				case SerializeIF::Endianness::BIG:
-					*object = EndianConverter::convertBigEndian<T>(tmp);
-					break;
-				case SerializeIF::Endianness::LITTLE:
-					*object = EndianConverter::convertLittleEndian<T>(tmp);
-					break;
-				default:
-				case SerializeIF::Endianness::MACHINE:
-					*object = tmp;
-					break;
-				}
-
-				*buffer += sizeof(T);
-				return HasReturnvaluesIF::RETURN_OK;
-			} else {
-				return SerializeIF::STREAM_TOO_SHORT;
-			}
-		}
-
-		uint32_t getSerializedSize(const T *object) {
-			return sizeof(T);
-		}
-
-	};
-
-	template<typename T>
-	class InternalSerializeAdapter<T, 1> {
-	public:
-		ReturnValue_t serialize(const T *object, uint8_t **buffer,
-				size_t *size, size_t max_size,
-				SerializeIF::Endianness streamEndianness) const {
-			size_t ignoredSize = 0;
-			if (size == NULL) {
-				size = &ignoredSize;
-			}
-			return object->serialize(buffer, size, max_size, streamEndianness);
-		}
-		uint32_t getSerializedSize(const T *object) const {
-			return object->getSerializedSize();
-		}
-
-		ReturnValue_t deSerialize(T *object, const uint8_t **buffer,
-				size_t *size, SerializeIF::Endianness streamEndianness) {
-			return object->deSerialize(buffer, size, streamEndianness);
-		}
-	};
 };
 
 #endif /* SERIALIZEADAPTER_H_ */

serialize/SerializeElement.h

@@ -9,43 +9,41 @@
  * \ingroup serialize
  */
 template<typename T>
-class SerializeElement: public SerializeIF, public LinkedElement<SerializeIF> {
+class SerializeElement : public SerializeIF, public LinkedElement<SerializeIF> {
 public:
-	template<typename ... Args>
+	template<typename... Args>
-	SerializeElement(Args ... args) :
+	SerializeElement(Args... args) : LinkedElement<SerializeIF>(this), entry(std::forward<Args>(args)...) {
-			LinkedElement<SerializeIF>(this), entry(std::forward<Args>(args)...) {
 
 	}
-	SerializeElement() :
+	SerializeElement() : LinkedElement<SerializeIF>(this) {
-			LinkedElement<SerializeIF>(this) {
 	}
 	T entry;
-	ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+	ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			Endianness streamEndianness) const override {
+			const uint32_t max_size, bool bigEndian) const {
-		return SerializeAdapter::serialize(&entry, buffer, size, maxSize,
+		return SerializeAdapter<T>::serialize(&entry, buffer, size, max_size, bigEndian);
-				streamEndianness);
 	}
 
-	size_t getSerializedSize() const override {
+	uint32_t getSerializedSize() const {
-		return SerializeAdapter::getSerializedSize(&entry);
+		return SerializeAdapter<T>::getSerializedSize(&entry);
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) override {
+			bool bigEndian) {
-		return SerializeAdapter::deSerialize(&entry, buffer, size,
+		return SerializeAdapter<T>::deSerialize(&entry, buffer, size, bigEndian);
-				streamEndianness);
 	}
 	operator T() {
 		return entry;
 	}
 
-	SerializeElement<T>& operator=(T newValue) {
+	SerializeElement<T> &operator=(T newValue) {
 		entry = newValue;
 		return *this;
 	}
-	T* operator->() {
+	T *operator->() {
 		return &entry;
 	}
 };
 
+
+
 #endif /* SERIALIZEELEMENT_H_ */

serialize/SerializeIF.h

@@ -2,7 +2,6 @@
 #define SERIALIZEIF_H_
 
 #include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <stddef.h>
 
 /**
  * \defgroup serialize Serialization
@@ -15,10 +14,6 @@
  */
 class SerializeIF {
 public:
-	enum class Endianness : uint8_t {
-		BIG, LITTLE, MACHINE
-	};
-
 	static const uint8_t INTERFACE_ID = CLASS_ID::SERIALIZE_IF;
 	static const ReturnValue_t BUFFER_TOO_SHORT = MAKE_RETURN_CODE(1);
 	static const ReturnValue_t STREAM_TOO_SHORT = MAKE_RETURN_CODE(2);
@@ -27,13 +22,13 @@ public:
 	virtual ~SerializeIF() {
 	}
 
-	virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const = 0;
+			const uint32_t max_size, bool bigEndian) const = 0;
 
-	virtual size_t getSerializedSize() const = 0;
+	virtual uint32_t getSerializedSize() const = 0;
 
-	virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-			Endianness streamEndianness) = 0;
+			bool bigEndian) = 0;
 
 };
 

serviceinterface/ServiceInterfaceBuffer.cpp

@@ -1,58 +1,11 @@
 #include <framework/timemanager/Clock.h>
 #include <framework/serviceinterface/ServiceInterfaceBuffer.h>
 #include <cstring>
-#include <inttypes.h>
 
 // to be implemented by bsp
-extern "C" void printChar(const char*, bool errStream);
+extern "C" void printChar(const char*);
-
-#ifndef UT699
-
-ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string setMessage,
-		bool addCrToPreamble, bool buffered , bool errStream, uint16_t port):
-		isActive(true), logMessage(setMessage),
-		addCrToPreamble(addCrToPreamble), buffered(buffered),
-		errStream(errStream) {
-	if(buffered) {
-		// Set pointers if the stream is buffered.
-		setp( buf, buf + BUF_SIZE );
-	}
-	preamble.reserve(MAX_PREAMBLE_SIZE);
-	preamble.resize(MAX_PREAMBLE_SIZE);
-}
-
-void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
-	char array[BUF_SIZE];
-	uint32_t length = end - begin;
-	if (length > sizeof(array)) {
-		length = sizeof(array);
-	}
-	memcpy(array, begin, length);
-
-	for(; begin != end; begin++){
-		if(errStream) {
-			printChar(begin, true);
-		}
-		else {
-			printChar(begin, false);
-		}
-	}
-}
-
-#endif
 
 int ServiceInterfaceBuffer::overflow(int c) {
-	if(not buffered and this->isActive) {
-		if (c != Traits::eof()) {
-			if(errStream) {
-				printChar(reinterpret_cast<const char*>(&c), true);
-			}
-			else {
-				printChar(reinterpret_cast<const char*>(&c), false);
-			}
-		}
-		return 0;
-	}
 	// Handle output
 	putChars(pbase(), pptr());
 	if (c != Traits::eof()) {
@@ -67,70 +20,52 @@ int ServiceInterfaceBuffer::overflow(int c) {
 }
 
 int ServiceInterfaceBuffer::sync(void) {
-	if(not this->isActive and not buffered) {
+	if (this->isActive) {
-		if(not buffered) {
+		Clock::TimeOfDay_t loggerTime;
-			setp(buf, buf + BUF_SIZE - 1);
+		Clock::getDateAndTime(&loggerTime);
-		}
+		char preamble[96] = { 0 };
-		return 0;
+		sprintf(preamble, "%s: | %lu:%02lu:%02lu.%03lu | ",
+				this->log_message.c_str(), (unsigned long) loggerTime.hour,
+				(unsigned long) loggerTime.minute,
+				(unsigned long) loggerTime.second,
+				(unsigned long) loggerTime.usecond /1000);
+		// Write log_message and time
+		this->putChars(preamble, preamble + sizeof(preamble));
+		// Handle output
+		this->putChars(pbase(), pptr());
 	}
-	if(not buffered) {
-		return 0;
-	}
-
-	size_t preambleSize  = 0;
-	std::string* preamble = getPreamble(&preambleSize);
-	// Write logMessage and time
-	this->putChars(preamble->data(), preamble->data() + preambleSize);
-	// Handle output
-	this->putChars(pbase(), pptr());
 	// This tells that buffer is empty again
 	setp(buf, buf + BUF_SIZE - 1);
 	return 0;
 }
 
-bool ServiceInterfaceBuffer::isBuffered() const {
+#ifndef UT699
-	return buffered;
+
+ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string set_message, uint16_t port) {
+	this->log_message = set_message;
+	this->isActive = true;
+	setp( buf, buf + BUF_SIZE );
 }
 
-std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) {
+void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
-	Clock::TimeOfDay_t loggerTime;
+	char array[BUF_SIZE];
-	Clock::getDateAndTime(&loggerTime);
+	uint32_t length = end - begin;
-	size_t currentSize = 0;
+	if (length > sizeof(array)) {
-	char* parsePosition = &preamble[0];
+		length = sizeof(array);
-	if(addCrToPreamble) {
-		preamble[0] = '\r';
-		currentSize += 1;
-		parsePosition += 1;
 	}
-	int32_t charCount = sprintf(parsePosition,
+	memcpy(array, begin, length);
-			"%s: | %02" SCNu32 ":%02" SCNu32 ":%02" SCNu32 ".%03" SCNu32 " | ",
+
-					this->logMessage.c_str(), loggerTime.hour,
+	for( ; begin != end; begin++){
-					loggerTime.minute,
+		printChar(begin);
-					loggerTime.second,
-					loggerTime.usecond /1000);
-	if(charCount < 0) {
-		printf("ServiceInterfaceBuffer: Failure parsing preamble\r\n");
-		return &preamble;
 	}
-	if(charCount > MAX_PREAMBLE_SIZE) {
+
-		printf("ServiceInterfaceBuffer: Char count too large for maximum "
-				"preamble size");
-		return &preamble;
-	}
-	currentSize += charCount;
-	if(preambleSize != nullptr) {
-		*preambleSize = currentSize;
-	}
-	return &preamble;
 }
-
+#endif
-
 
 #ifdef UT699
 #include <framework/osal/rtems/Interrupt.h>
 
-ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string set_message,
+ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string set_message, uint16_t port) {
-		uint16_t port) {
 	this->log_message = set_message;
 	this->isActive = true;
 	setp( buf, buf + BUF_SIZE );

serviceinterface/ServiceInterfaceBuffer.h

@@ -1,71 +1,51 @@
 #ifndef FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_
 #define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_
 
-#include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <iostream>
+#include <iosfwd>
 #include <sstream>
-#include <iomanip>
+#include <cstdio>
 
 #ifndef UT699
-
+class ServiceInterfaceBuffer: public std::basic_streambuf<char,
-/**
+		std::char_traits<char> > {
- * @brief 	This is the underlying stream buffer which implements the
- * 			streambuf class and overloads the overflow() and sync() methods
- * @details
- * This class is used to modify the output of the stream, for example by adding.
- * It also calls the char printing function which is implemented in the
- * board supply package (BSP).
- */
-class ServiceInterfaceBuffer:
-        public std::streambuf {
 	friend class ServiceInterfaceStream;
 public:
-	static constexpr uint8_t MAX_PREAMBLE_SIZE = 40;
+	ServiceInterfaceBuffer(std::string set_message, uint16_t port);
-
-	ServiceInterfaceBuffer(std::string setMessage, bool addCrToPreamble,
-			bool buffered, bool errStream, uint16_t port);
-
 protected:
 	bool isActive;
-	//! This is called when buffer becomes full. If
+	// This is called when buffer becomes full. If
-	//! buffer is not used, then this is called every
+	// buffer is not used, then this is called every
-	//! time when characters are put to stream.
+	// time when characters are put to stream.
-	int overflow(int c = Traits::eof()) override;
+	virtual int overflow(int c = Traits::eof());
 
-	//! This function is called when stream is flushed,
+	// This function is called when stream is flushed,
-	//! for example when std::endl is put to stream.
+	// for example when std::endl is put to stream.
-	int sync(void) override;
+	virtual int sync(void);
 
-	bool isBuffered() const;
 private:
-	//! For additional message information
+	// For additional message information
-	std::string logMessage;
+	std::string log_message;
-	std::string preamble;
 	// For EOF detection
 	typedef std::char_traits<char> Traits;
 
-	//! This is useful for some terminal programs which do not have
+	// Work in buffer mode. It is also possible to work without buffer.
-	//! implicit carriage return with newline characters.
-	bool addCrToPreamble;
-
-	//! Specifies whether the stream operates in buffered or unbuffered mode.
-	bool buffered;
-	//! This specifies to print to stderr and work in unbuffered mode.
-	bool errStream;
-
-	//! Needed for buffered mode.
 	static size_t const BUF_SIZE = 128;
 	char buf[BUF_SIZE];
 
-	//! In this function, the characters are parsed.
+	// In this function, the characters are parsed.
 	void putChars(char const* begin, char const* end);
-
-	std::string* getPreamble(size_t * preambleSize = nullptr);
 };
-
 #endif
 
 
+
+
+
+
+
+
+
 #ifdef UT699
 class ServiceInterfaceBuffer: public std::basic_streambuf<char,
 		std::char_traits<char> > {

serviceinterface/ServiceInterfaceStream.cpp

@@ -1,32 +1,11 @@
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage,
-		bool addCrToPreamble, bool buffered, bool errStream, uint16_t port) :
-		std::ostream(&streambuf),
-		streambuf(setMessage, addCrToPreamble, buffered, errStream, port) {}
-
 void ServiceInterfaceStream::setActive( bool myActive) {
-	this->streambuf.isActive = myActive;
+	this->buf.isActive = myActive;
 }
 
-std::string* ServiceInterfaceStream::getPreamble() {
+ServiceInterfaceStream::ServiceInterfaceStream(std::string set_message,
-	return streambuf.getPreamble();
+		uint16_t port) :
-}
+		std::basic_ostream<char, std::char_traits<char> >(&buf), buf(
-
+				set_message, port) {
-void ServiceInterfaceStream::print(std::string error,
-		bool withPreamble, bool withNewline, bool flush) {
-	if(not streambuf.isBuffered() and withPreamble) {
-		*this << getPreamble() << error;
-	}
-	else {
-		*this << error;
-	}
-
-	if(withNewline) {
-		*this << "\n";
-	}
-	// if mode is non-buffered, no need to flush.
-	if(flush and streambuf.isBuffered()) {
-		this->flush();
-	}
 }

serviceinterface/ServiceInterfaceStream.h

@@ -3,56 +3,28 @@
 
 #include <framework/serviceinterface/ServiceInterfaceBuffer.h>
 #include <iostream>
+#include <iosfwd>
+#include <sstream>
 #include <cstdio>
 
-/**
+// Unfortunately, there must be a forward declaration of log_fe
- * Generic service interface stream which can be used like std::cout or
+// (MUST be defined in main), to let the system know where to write to.
- * std::cerr but has additional capability. Add preamble and timestamp
- * to output. Can be run in buffered or unbuffered mode.
- */
-class ServiceInterfaceStream : public std::ostream {
-public:
-	/**
-	 * This constructor is used by specifying the preamble message.
-	 * Optionally, the output can be directed to stderr and a CR character
-	 * can be prepended to the preamble.
-	 * @param setMessage message of preamble.
-	 * @param addCrToPreamble Useful for applications like Puttty.
-	 * @param buffered specify whether to use buffered mode.
-	 * @param errStream specify which output stream to use (stderr or stdout).
-	 */
-	ServiceInterfaceStream(std::string setMessage,
-			bool addCrToPreamble = false, bool buffered = true,
-			bool errStream = false, uint16_t port = 1234);
-
-	//! An inactive stream will not print anything.
-	void setActive( bool );
-
-	/**
-	 * This can be used to retrieve the preamble in case it should be printed in
-	 * the unbuffered mode.
-	 * @return Preamle consisting of log message and timestamp.
-	 */
-	std::string* getPreamble();
-
-	/**
-	 * This prints an error with a preamble. Useful if using the unbuffered
-	 * mode. Flushes in default mode (prints immediately).
-	 */
-	void print(std::string error, bool withPreamble = true,
-			bool withNewline = true, bool flush = true);
-
-protected:
-	ServiceInterfaceBuffer streambuf;
-};
-
-// Forward declaration of interface streams. These should be instantiated in
-// main. They can then be used like std::cout or std::cerr.
 namespace sif {
-extern ServiceInterfaceStream debug;
+extern std::ostream debug;
-extern ServiceInterfaceStream info;
+extern std::ostream info;
-extern ServiceInterfaceStream warning;
+extern std::ostream warning;
-extern ServiceInterfaceStream error;
+extern std::ostream error;
 }
 
+
+class ServiceInterfaceStream : public std::basic_ostream< char, std::char_traits< char > > {
+protected:
+    ServiceInterfaceBuffer buf;
+public:
+    ServiceInterfaceStream( std::string set_message, uint16_t port = 1234 );
+	void setActive( bool );
+};
+
+
+
 #endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ */

subsystem/Subsystem.cpp

@@ -13,7 +13,7 @@ Subsystem::Subsystem(object_id_t setObjectId, object_id_t parent,
 				false), uptimeStartTable(0), currentTargetTable(), targetMode(
 				0), targetSubmode(SUBMODE_NONE), initialMode(0), currentSequenceIterator(), modeTables(
 				maxNumberOfTables), modeSequences(maxNumberOfSequences), IPCStore(
-		NULL)
+				NULL)
 #ifdef USE_MODESTORE
 ,modeStore(NULL)
 #endif
@@ -75,8 +75,7 @@ void Subsystem::performChildOperation() {
 	if (isInTransition) {
 		if (commandsOutstanding <= 0) { //all children of the current table were commanded and replied
 			if (currentSequenceIterator.value == NULL) { //we're through with this sequence
-				if (checkStateAgainstTable(currentTargetTable, targetSubmode)
+				if (checkStateAgainstTable(currentTargetTable, targetSubmode) == RETURN_OK) {
-						== RETURN_OK) {
 					setMode(targetMode, targetSubmode);
 					isInTransition = false;
 					return;
@@ -87,8 +86,7 @@ void Subsystem::performChildOperation() {
 				}
 			}
 			if (currentSequenceIterator->checkSuccess()) {
-				if (checkStateAgainstTable(getCurrentTable(), targetSubmode)
+				if (checkStateAgainstTable(getCurrentTable(), targetSubmode) != RETURN_OK) {
-						!= RETURN_OK) {
 					transitionFailed(TABLE_CHECK_FAILED,
 							currentSequenceIterator->getTableId());
 					return;
@@ -119,8 +117,7 @@ void Subsystem::performChildOperation() {
 			childrenChangedHealth = false;
 			startTransition(mode, submode);
 		} else if (childrenChangedMode) {
-			if (checkStateAgainstTable(currentTargetTable, submode)
+			if (checkStateAgainstTable(currentTargetTable, submode) != RETURN_OK) {
-					!= RETURN_OK) {
 				triggerEvent(CANT_KEEP_MODE, mode, submode);
 				cantKeepMode();
 			}
@@ -150,7 +147,7 @@ HybridIterator<ModeListEntry> Subsystem::getTable(Mode_t id) {
 	}
 }
 
-ReturnValue_t Subsystem::handleCommandMessage(CommandMessage *message) {
+ReturnValue_t Subsystem::handleCommandMessage(CommandMessage* message) {
 	ReturnValue_t result;
 	switch (message->getCommand()) {
 	case HealthMessage::HEALTH_INFO: {
@@ -171,13 +168,12 @@ ReturnValue_t Subsystem::handleCommandMessage(CommandMessage *message) {
 				&sizeRead);
 		if (result == RETURN_OK) {
 			Mode_t fallbackId;
-			size_t size = sizeRead;
+			int32_t size = sizeRead;
-			result = SerializeAdapter::deSerialize(&fallbackId, &pointer, &size,
+			result = SerializeAdapter<Mode_t>::deSerialize(&fallbackId,
-					SerializeIF::Endianness::BIG);
+					&pointer, &size, true);
 			if (result == RETURN_OK) {
 				result = SerialArrayListAdapter<ModeListEntry>::deSerialize(
-						&sequence, &pointer, &size,
+						&sequence, &pointer, &size, true);
-						SerializeIF::Endianness::BIG);
 				if (result == RETURN_OK) {
 					result = addSequence(&sequence,
 							ModeSequenceMessage::getSequenceId(message),
@@ -197,9 +193,9 @@ ReturnValue_t Subsystem::handleCommandMessage(CommandMessage *message) {
 				ModeSequenceMessage::getStoreAddress(message), &pointer,
 				&sizeRead);
 		if (result == RETURN_OK) {
-			size_t size = sizeRead;
+			int32_t size = sizeRead;
 			result = SerialArrayListAdapter<ModeListEntry>::deSerialize(&table,
-					&pointer, &size, SerializeIF::Endianness::BIG);
+					&pointer, &size, true);
 			if (result == RETURN_OK) {
 				result = addTable(&table,
 						ModeSequenceMessage::getSequenceId(message));
@@ -343,7 +339,7 @@ void Subsystem::replyToCommand(ReturnValue_t status, uint32_t parameter) {
 	}
 }
 
-ReturnValue_t Subsystem::addSequence(ArrayList<ModeListEntry> *sequence,
+ReturnValue_t Subsystem::addSequence(ArrayList<ModeListEntry>* sequence,
 		Mode_t id, Mode_t fallbackSequence, bool inStore, bool preInit) {
 
 	ReturnValue_t result;
@@ -511,7 +507,7 @@ MessageQueueId_t Subsystem::getSequenceCommandQueue() const {
 }
 
 ReturnValue_t Subsystem::checkModeCommand(Mode_t mode, Submode_t submode,
-		uint32_t *msToReachTheMode) {
+		uint32_t* msToReachTheMode) {
 	//Need to accept all submodes to be able to inherit submodes
 //	if (submode != SUBMODE_NONE) {
 //		return INVALID_SUBMODE;
@@ -603,15 +599,15 @@ void Subsystem::transitionFailed(ReturnValue_t failureCode,
 }
 
 void Subsystem::sendSerializablesAsCommandMessage(Command_t command,
-		SerializeIF **elements, uint8_t count) {
+		SerializeIF** elements, uint8_t count) {
 	ReturnValue_t result;
-	size_t maxSize = 0;
+	uint32_t maxSize = 0;
 	for (uint8_t i = 0; i < count; i++) {
 		maxSize += elements[i]->getSerializedSize();
 	}
 	uint8_t *storeBuffer;
 	store_address_t address;
-	size_t size = 0;
+	uint32_t size = 0;
 
 	result = IPCStore->getFreeElement(&address, maxSize, &storeBuffer);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
@@ -619,8 +615,7 @@ void Subsystem::sendSerializablesAsCommandMessage(Command_t command,
 		return;
 	}
 	for (uint8_t i = 0; i < count; i++) {
-		elements[i]->serialize(&storeBuffer, &size, maxSize,
+		elements[i]->serialize(&storeBuffer, &size, maxSize, true);
-				SerializeIF::Endianness::BIG);
 	}
 	CommandMessage reply;
 	ModeSequenceMessage::setModeSequenceMessage(&reply, command, address);

subsystem/SubsystemBase.cpp

@@ -329,7 +329,7 @@ void SubsystemBase::checkCommandQueue() {
 		result = handleCommandMessage(&message);
 		if (result != RETURN_OK) {
 			CommandMessage reply;
-			reply.setReplyRejected(CommandMessage::UNKNOWN_COMMAND,
+			reply.setReplyRejected(CommandMessage::UNKNOW_COMMAND,
 					message.getCommand());
 			replyToCommand(&reply);
 		}

subsystem/modes/ModeDefinitions.h

@@ -18,65 +18,65 @@ public:
 	uint8_t value3;
 	uint8_t value4;
 
-	virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t serialize(uint8_t** buffer, uint32_t* size,
-			size_t maxSize, Endianness streamEndianness) const {
+			const uint32_t max_size, bool bigEndian) const {
 
 		ReturnValue_t result;
 
-		result = SerializeAdapter::serialize(&value1, buffer, size,
+		result = SerializeAdapter<uint32_t>::serialize(&value1, buffer, size,
-				maxSize, streamEndianness);
+				max_size, bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::serialize(&value2, buffer, size,
+		result = SerializeAdapter<uint32_t>::serialize(&value2, buffer, size,
-				maxSize, streamEndianness);
+				max_size, bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::serialize(&value3, buffer, size,
+		result = SerializeAdapter<uint8_t>::serialize(&value3, buffer, size,
-				maxSize, streamEndianness);
+				max_size, bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
 
-		result = SerializeAdapter::serialize(&value4, buffer, size,
+		result = SerializeAdapter<uint8_t>::serialize(&value4, buffer, size,
-				maxSize, streamEndianness);
+				max_size, bigEndian);
 
 		return result;
 
 	}
 
-	virtual size_t getSerializedSize() const {
+	virtual uint32_t getSerializedSize() const {
 		return sizeof(value1) + sizeof(value2) + sizeof(value3) + sizeof(value4);
 	}
 
-	virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+	virtual ReturnValue_t deSerialize(const uint8_t** buffer, int32_t* size,
-	Endianness streamEndianness) {
+	bool bigEndian) {
 		ReturnValue_t result;
 
-		result = SerializeAdapter::deSerialize(&value1, buffer, size,
+		result = SerializeAdapter<uint32_t>::deSerialize(&value1, buffer, size,
-				streamEndianness);
+				bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&value2, buffer, size,
+		result = SerializeAdapter<uint32_t>::deSerialize(&value2, buffer, size,
-				streamEndianness);
+				bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&value3, buffer, size,
+		result = SerializeAdapter<uint8_t>::deSerialize(&value3, buffer, size,
-				streamEndianness);
+				bigEndian);
 
 		if (result != HasReturnvaluesIF::RETURN_OK) {
 			return result;
 		}
-		result = SerializeAdapter::deSerialize(&value4, buffer, size,
+		result = SerializeAdapter<uint8_t>::deSerialize(&value4, buffer, size,
-				streamEndianness);
+				bigEndian);
 
 		return result;
 	}

tasks/ExecutableObjectIF.h

@@ -1,5 +1,15 @@
-#ifndef FRAMEWORK_TASKS_EXECUTABLEOBJECTIF_H_
+/**
-#define FRAMEWORK_TASKS_EXECUTABLEOBJECTIF_H_
+ * @file	ExecutableObjectIF.h
+ *
+ * @brief	This file contains the definition for the ExecutableObjectIF interface.
+ *
+ * @author	Bastian Baetz
+ *
+ * @date	12.03.2012
+ */
+
+#ifndef EXECUTABLEOBJECTIF_H_
+#define EXECUTABLEOBJECTIF_H_
 
 class PeriodicTaskIF;
 
@@ -10,7 +20,6 @@ class PeriodicTaskIF;
  * @brief	The interface provides a method to execute objects within a task.
  * @details	The performOperation method, that is required by the interface is
  * 			executed cyclically within a task context.
- * @author  Bastian Baetz
  */
 class ExecutableObjectIF {
 public:
@@ -28,26 +37,13 @@ public:
 
 	/**
 	 * @brief Function called during setup assignment of object to task
-	 * @details
+	 * @details Has to be called from the function that assigns the object to a task and
-	 * Has to be called from the function that assigns the object to a task and
+	 * 			enables the object implementation to overwrite this function and get a reference to the executing task
-	 * enables the object implementation to overwrite this function and get
-	 * a reference to the executing task
 	 * @param task_ Pointer to the taskIF of this task
 	 */
-	virtual void setTaskIF(PeriodicTaskIF* task_) {};
+	virtual void setTaskIF(PeriodicTaskIF* task_) {
 
-	/**
-	 * This function should be called after the object was assigned to a
-	 * specific task.
-	 *
-	 * Example: Can be used to get task execution frequency.
-	 * The task is created after initialize() and the object ctors have been
-	 * called so the execution frequency can't be cached in initialize()
-	 * @return
-	 */
-	virtual ReturnValue_t initializeAfterTaskCreation() {
-	    return HasReturnvaluesIF::RETURN_OK;
 	}
 };
 
-#endif /* FRAMEWORK_TASKS_EXECUTABLEOBJECTIF_H_ */
+#endif /* EXECUTABLEOBJECTIF_H_ */

tasks/PeriodicTaskIF.h

@@ -1,11 +1,9 @@
-#ifndef FRAMEWORK_TASK_PERIODICTASKIF_H_
+#ifndef PERIODICTASKIF_H_
-#define FRAMEWORK_TASK_PERIODICTASKIF_H_
+#define PERIODICTASKIF_H_
 
 #include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/timemanager/Clock.h>
 #include <cstddef>
 class ExecutableObjectIF;
-
 /**
  * New version of TaskIF
  * Follows RAII principles, i.e. there's no create or delete method.
@@ -19,26 +17,11 @@ public:
 	 */
 	virtual ~PeriodicTaskIF() { }
 	/**
-	 * @brief	With the startTask method, a created task can be started
+	 * @brief	With the startTask method, a created task can be started for the first time.
-	 *          for the first time.
 	 */
 	virtual ReturnValue_t startTask() = 0;
 
-	/**
+	virtual ReturnValue_t addComponent(object_id_t object) {return HasReturnvaluesIF::RETURN_FAILED;};
-	 * Add a component (object) to a periodic task. The pointer to the
-	 * task can be set optionally
-	 * @param object
-	 * Add an object to the task. The most important case is to add an
-	 * executable object with a function which will be called regularly
-	 * (see ExecutableObjectIF)
-	 * @param setTaskIF
-	 * Can be used to specify whether the task object pointer is passed
-	 * to the component.
-	 * @return
-	 */
-	virtual ReturnValue_t addComponent(object_id_t object) {
-	    return HasReturnvaluesIF::RETURN_FAILED;
-	};
 
 	virtual ReturnValue_t sleepFor(uint32_t ms) = 0;