git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #37 from jtanx/master
[matches/MCTX3420.git]
/
server
/
main.c
diff --git
a/server/main.c
b/server/main.c
index
d1aaa4c
..
c032eb1
100644
(file)
--- a/
server/main.c
+++ b/
server/main.c
@@
-7,8
+7,11
@@
#include "common.h"
#include "options.h"
#include "sensor.h"
#include "common.h"
#include "options.h"
#include "sensor.h"
+#include "actuator.h"
+#include "control.h"
// --- Standard headers --- //
// --- Standard headers --- //
+#include <syslog.h> // for system logging
#include <signal.h> // for signal handling
// --- Variable definitions --- //
#include <signal.h> // for signal handling
// --- Variable definitions --- //
@@
-66,6
+69,9
@@
int main(int argc, char ** argv)
{
ParseArguments(argc, argv);
{
ParseArguments(argc, argv);
+ //Open the system log
+ openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+ Log(LOGINFO, "Server started");
// signal handler
//TODO: Make this work
/*
// signal handler
//TODO: Make this work
/*
@@
-76,12
+82,20
@@
int main(int argc, char ** argv)
}
*/
Sensor_Init();
}
*/
Sensor_Init();
- Sensor_StartAll("test");
+ Actuator_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);
// 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();
Cleanup();
return 0;
Cleanup();
return 0;
UCC
git Repository :: git.ucc.asn.au