Merge branch 'master' into mueller_framework

devicehandlers/FixedSlotSequence.h

@@ -13,6 +13,7 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
 /**
  * @brief	This class is the representation of a Polling Sequence Table in software.
  *
+<<<<<<< HEAD
  * @details	The FixedSlotSequence object maintains the dynamic execution of device handler objects.
  * 			The main idea is to create a list of device handlers, to announce all handlers to the
  * 			polling sequence and to maintain a list of polling slot objects. This slot list represents the
@@ -20,6 +21,21 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
  * 			which device handler shall be executed within a given polling period.
  * 			The sequence is then executed by iterating through this slot list.
  * 			Handlers are invoking by calling a certain function stored in the handler list.
+=======
+ * @details
+ * The FixedSlotSequence object maintains the dynamic execution of
+ * device handler objects.
+ *
+ * The main idea is to create a list of device handlers, to announce all
+ * handlers to thepolling sequence and to maintain a list of
+ * polling slot objects. This slot list represents the Polling Sequence Table
+ * in software.
+ *
+ * Each polling slot contains information to indicate when and
+ * which device handler shall be executed within a given polling period.
+ * The sequence is then executed by iterating through this slot list.
+ * Handlers are invoking by calling a certain function stored in the handler list.
+>>>>>>> master
  */
 class FixedSlotSequence {
 public:
@@ -112,7 +128,16 @@ public:
 	 */
 	SlotListIter current;
 
+<<<<<<< HEAD
 	virtual ReturnValue_t checkSequence() const;
+=======
+	/**
+	 * Iterate through slotList and check successful creation.
+	 * Checks if timing is ok (must be ascending) and if all handlers were found.
+	 * @return
+	 */
+	ReturnValue_t checkSequence() const;
+>>>>>>> master
 protected:
 
 	/**