Diff: sensors/ToDoQ.h

Revision:

1:b2a9a6f2c30e

Parent:

0:20bce0dcc921

Child:

2:dfe671e31221

--- a/sensors/ToDoQ.h	Tue Dec 20 01:51:02 2016 +0000
+++ b/sensors/ToDoQ.h	Thu Jan 19 09:17:16 2017 +0000
@@ -3,12 +3,14 @@
 
 #include "mbed.h"
 #include "debugIO.h"
+#include "CommonTemplateRoutines.hpp"
 
 #define TODO_QUEUE_SIZE 10
 
 namespace MaruSolSensorManager
 {
     class ToDo;
+    
     class ToDoQ
     {
     public:
@@ -19,31 +21,18 @@
     private:
         ToDo *q[TODO_QUEUE_SIZE];
         onGetTodo _onGetTodo;
-        ToDoQ(onGetTodo);
+        DECL_GET_INSTANCE(ToDoQ);
+        DECL_SELF(ToDoQ);
+        void setOnToDo(onGetTodo);
         void _queuePut(ToDo*);
+        ToDoQ();
     };
+
     class ToDo
     {
     public:
         virtual void toJSON(char *buf) = 0;
         virtual void getBytes(uint8_t *buf) = 0;
     };
-    class DeviceCommonParameters
-    {
-    public:
-        const char *devType;
-        const char *partNum;
-        const char *unit;
-        uint32_t sensingInterval;
-        DeviceCommonParameters(char *devType, char *partNum, char *unit, uint32_t sensingInterval)
-        {
-            this->devType = devType;
-            this->partNum = partNum;
-            this->unit = unit;
-            this->sensingInterval = sensingInterval;
-        }
-    };
-};
-
-
+}
 #endif //_TODO_QUEUE_H_
\ No newline at end of file