Closes #4

Author: gregkrsak

Diff for: ArduinoProtoThread.hpp

@@ -27,6 +27,8 @@
 
 #include "ArduinoProtoThreadStateMachine.hpp"
 
+#include "ArduinoProtoThreadDelegate.hpp"
+
 
 //
 // Class: ArduinoProtoThread
@@ -40,18 +42,19 @@ class ArduinoProtoThread : public ArduinoProtoThreadStateMachine
     ~ArduinoProtoThread() { }
 
     void setExecutionIntervalTo(unsigned long newIntervalInMs);
+    virtual void delegateCallbacksTo(ArduinoProtoThreadDelegate *object);
     void timeSlice();
 
     // BEGIN from ArduinoProtoThreadStateMachine //////////
     void changeStateTo(ArduinoProtoThreadState newState);
     ArduinoProtoThreadState currentState();
-    void delegateCallbacksTo(ArduinoProtoThreadDelegate *object);
     // END from ArduinoProtoThreadStateMachine //////////
 
   protected:
     unsigned long timeDifference;
     unsigned long executionInterval;
     unsigned long previousExecutionTime;
+    ArduinoProtoThreadDelegate *delegate;
 };
 
 

Diff for: ArduinoProtoThreadDelegate.hpp

@@ -26,8 +26,6 @@
 
 #pragma once
 
-#include "ArduinoProtoThreadStateMachine.hpp"
-
 // Used for pure virtual functions. I think this looks cleaner and is more self-documenting.
 #define PURE_VIRTUAL 0
 

Diff for: ArduinoProtoThreadStateMachine.hpp

@@ -26,8 +26,6 @@
 
 #pragma once
 
-#include "ArduinoProtoThreadDelegate.hpp"
-
 // Used for pure virtual functions. I think this looks cleaner and is more self-documenting.
 #define PURE_VIRTUAL 0
 
@@ -47,11 +45,9 @@ class ArduinoProtoThreadStateMachine
 
     virtual void changeStateTo(ArduinoProtoThreadState newState) = PURE_VIRTUAL;
     virtual ArduinoProtoThreadState currentState();
-    virtual void delegateCallbacksTo(ArduinoProtoThreadDelegate *object);
 
   protected:
     ArduinoProtoThreadState state;
-    ArduinoProtoThreadDelegate *delegate;
 };
 ArduinoProtoThreadStateMachine::~ArduinoProtoThreadStateMachine() { }