Erick / Mbed 2 deprecated ICE_BLE_TEST

Dependencies:   NaturalTinyShell_ice libmDot-12Sept mbed-rtos mbed

Fork of ICE by Erick

Revision:
220:dbe21411f962
Parent:
156:44f87c5a83ae
Child:
221:2a5e9902003c
--- a/src/ConfigurationHandler/ConfigurationHandler.h	Tue Oct 11 18:39:43 2016 +0000
+++ b/src/ConfigurationHandler/ConfigurationHandler.h	Fri Oct 14 13:32:47 2016 +0000
@@ -10,6 +10,7 @@
 #include "SetpointControl.h"
 #include "TimerControl.h"
 #include "ManualControl.h"
+#include "CompositeControl.h"
 #include <map>
 
 void ConfigurationHandler(void const *args);
@@ -26,8 +27,11 @@
 //map["control_mn_1.json"] : manualControl
 typedef map<string, ManualControl*> StringManualMap;
 
+typedef map<string, CompositeControl*> StringCompositeMap;
+
 extern StringSetpointMap        setpointTable;
-extern StringVectorTimerMap    timerTable;
+extern StringVectorTimerMap     timerTable;
 extern StringManualMap          manualTable;
+extern StringCompositeMap       compoisteTable;
 
 #endif