Erick / Mbed 2 deprecated ICE_BLE_TEST

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   NaturalTinyShell_ice libmDot-12Sept mbed-rtos mbed

Fork of ICE by Erick

Diff: src/ConfigurationHandler/ConfigurationHandler.cpp

Revision:
97:5cf6ab71dcd0
Parent:
93:1553fb156915
Child:
111:d31b3a347e6a
Child:
121:650205ffa656
diff -r 807f04bd5256 -r 5cf6ab71dcd0 src/ConfigurationHandler/ConfigurationHandler.cpp
--- a/src/ConfigurationHandler/ConfigurationHandler.cpp	Wed Sep 21 12:54:41 2016 +0000
+++ b/src/ConfigurationHandler/ConfigurationHandler.cpp	Wed Sep 21 16:17:12 2016 +0000
@@ -11,7 +11,7 @@
 
 StringSetpointMap   setpointTable;          // setpoint control object table
 StringTimerMap      timerTable;             // timer control object table
-//StringManualMap     manualTable;          // manual control object table
+StringManualMap     manualTable;            // manual control object table
 
 // local function prototypes
 static int loadPersistentControls(void);
@@ -92,6 +92,14 @@
             pos->second->display();
         }
     }
+    
+    if ( !manualTable.empty() )  {
+        printf("MANUAL CONTROLS\n");
+        StringManualMap::iterator pos;
+        for ( pos = manualTable.begin(); pos != manualTable.end(); ++pos ) {
+            pos->second->display();
+        }
+    }
 }
 
 /*****************************************************************************
@@ -179,7 +187,6 @@
             break;
         }
         case CONTROL_MANUAL: {
-#if 0
             ManualControl *manualControl = new ManualControl;
             bool rc = manualControl->load(msg->controlFile);
             if ( rc != true ) {
@@ -187,8 +194,9 @@
                 delete manualControl;
             } else {
                 manualTable[msg->controlFile] = manualControl;
+                // start the manual control
+                manualControl->start();
             }
-#endif
             break;
         }
         case CONTROL_PID:
@@ -249,14 +257,13 @@
             break;
         }
         case CONTROL_MANUAL: {
-#if 0
             StringManualMap::iterator pos;
             pos = manualTable.find(msg->controlFile);
             if ( pos != manualTable.end() ) {
+                pos->second->unregisterControl();
                 delete (pos->second);
                 manualTable.erase(pos);
             }
-#endif
             break;
         }
         default: