X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=2ad9dcc694c9354500b1a3feeae439c06475493f;hb=be4e13604e52cdc7986b726124d007a664f534b7;hp=d1aaa4ce588dcf4e4eef8d08106f13e6641c8a9b;hpb=5ab6641e1e2c28d85440f4cbe4c4091d0c54d1ab;p=matches%2FMCTX3420.git diff --git a/server/main.c b/server/main.c index d1aaa4c..2ad9dcc 100644 --- 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 // for system logging #include // 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; + } + } } /** @@ -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 /* @@ -76,12 +116,23 @@ int main(int argc, char ** argv) } */ Sensor_Init(); - Sensor_StartAll("test"); + 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); - Sensor_StopAll(); + if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL) + Fatal("Control_SetMode failed with '%s'", ret); + //Sensor_StopAll(); + //Actuator_StopAll(); + + Pin_Close(); Cleanup(); return 0;