Updated control stuff

[matches/MCTX3420.git] / server / main.c

diff --git a/server/main.c b/server/main.c
index 6ea256c..4b36b20 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -8,6 +8,7 @@
 #include "options.h"
 #include "sensor.h"
 #include "actuator.h"
+#include "control.h"
 
 // --- Standard headers --- //
 #include <signal.h> // for signal handling
@@ -78,14 +79,19 @@ int main(int argc, char ** argv)
        */
        Sensor_Init();
        Actuator_Init();
-       Sensor_StartAll("test");
-       Actuator_StartAll("test");
+       //Sensor_StartAll("test");
+       //Actuator_StartAll("test");
+       const char *ret;
+       if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+               Fatal("Control_SetMode failed with '%s'", ret);
 
        // run request thread in the main thread
        FCGI_RequestLoop(NULL);
 
-       Sensor_StopAll();
-       Actuator_StopAll();
+       if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+               Fatal("Control_SetMode failed with '%s'", ret);
+       //Sensor_StopAll();
+       //Actuator_StopAll();
 
        Cleanup();
        return 0;