(Almost done) pin refactoring

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

diff --git a/server/main.c b/server/main.c
index b202418..2ad9dcc 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -7,8 +7,13 @@
 #include "common.h"
 #include "options.h"
 #include "sensor.h"
+#include "actuator.h"
+#include "control.h"
+#include "pin_test.h"
+#include "bbb_pin_defines.h"
 
 // --- Standard headers --- //
+#include <syslog.h> // for system logging
 #include <signal.h> // for signal handling
 
 // --- Variable definitions --- //
@@ -23,10 +28,39 @@ Options g_options; // options passed to program through command line arguments
  */
 void ParseArguments(int argc, char ** argv)
 {
+       // horrible horrible hacks
+       g_options.argc = argc;
+       g_options.argv = argv;
+
        g_options.program = argv[0]; // program name
        g_options.verbosity = LOGDEBUG; // default log level
        gettimeofday(&(g_options.start_time), NULL); // Start time
+       g_options.adc_device_path = ADC_DEVICE_PATH;
        Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
+
+       for (int i = 1; i < argc; ++i)
+       {
+               if (argv[i][0] != '-')
+                       Fatal("Unexpected argv[%d] - %s", i, argv[i]);
+
+               if (i+1 >= argc || argv[i+1][0] == '-')
+                       Fatal("No argument following switch %s", argv[i]);
+               
+               if (strlen(argv[i]) > 2)
+                       Fatal("Human readable switches are not supported.");
+
+               switch (argv[i][1])
+               {
+                       case 'a':
+                               g_options.adc_device_path = argv[i+1];
+                               Log(LOGINFO, "ADC Device Path: %s", argv[i+1]);
+                               ++i;
+                               break;
+                       default:
+                               Fatal("Unrecognised switch %s", argv[i]);
+                               break;
+               }
+       }       
 }
 
 /**
@@ -41,7 +75,7 @@ void SignalHandler(int signal)
        // At the moment just always exit.
        // Call `exit` so that Cleanup will be called to... clean up.
        Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
-       Thread_QuitProgram(false);
+
        //exit(signal);
 }
 
@@ -64,8 +98,14 @@ void Cleanup()
  */
 int main(int argc, char ** argv)
 {
+       // Open log before calling ParseArguments (since ParseArguments may call the Log functions)
+       openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+       Log(LOGINFO, "Server started");
+
        ParseArguments(argc, argv);
 
+       //Open the system log
+
        // signal handler
        //TODO: Make this work
        /*
@@ -75,15 +115,25 @@ int main(int argc, char ** argv)
                signal(signals[i], SignalHandler);
        }
        */
-       Sensor_Spawn();
+       Sensor_Init();
+       Actuator_Init();
+       Pin_Init();
+       //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);
 
-       // Join the dark side, Luke
-       // *cough*
-       // Join the sensor threads
-       Sensor_Join();
+       if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+               Fatal("Control_SetMode failed with '%s'", ret);
+       //Sensor_StopAll();
+       //Actuator_StopAll();
+
+       Pin_Close();
+
        Cleanup();
        return 0;
 }