X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fcontrol.h;h=7b3511a62b5debf147a5f54558a0f6dc3afec216;hb=a5e70d6d38c216b736c8ff55670872274dc99ff7;hp=a1aa5c733a56933939f23c1fe276afa64d106412;hpb=84282dc8bd6b84d23284742741fab5664ffb25a6;p=matches%2FMCTX3420.git

diff --git a/server/control.h b/server/control.h
index a1aa5c7..7b3511a 100644
--- a/server/control.h
+++ b/server/control.h
@@ -5,19 +5,25 @@
 #ifndef _CONTROL_H
 #define _CONTROL_H
 
-/** Number of actuators **/
-#define NUMACTUATORS 2
+typedef enum ControlModes {
+	CONTROL_START,
+	CONTROL_PAUSE,
+	CONTROL_RESUME,
+	CONTROL_STOP,
+	CONTROL_EMERGENCY
+} ControlModes;
 
-/** List of actuator ids (should be of size NUMACTUATORS) **/
-typedef enum ActuatorId {
-	ACT_PRESSURE,
-	ACT_SOLENOID1
-} ActuatorId;
+/** Invalid filename characters **/
+#define INVALID_CHARACTERS "\"*/:<>?\\|"
+/** The same as INVALID_CHARACTERS, except escaped for use in JSON strings **/
+#define INVALID_CHARACTERS_JSON "\\\"*/:<>?\\\\|"
 
-/** Human readable names for the actuator ids **/
-extern const char * g_actuator_names[NUMACTUATORS];
-
-/** ID codes for all the actuators **/
 extern void Control_Handler(FCGIContext *context, char *params);
+extern const char* Control_SetMode(ControlModes desired_mode, void * arg);
+extern ControlModes Control_GetMode();
+extern const char * Control_GetModeName();
+//extern bool Control_Lock();
+//extern void Control_Unlock();
+extern const struct timeval* Control_GetStartTime();
 
 #endif