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 branch 'master' of github:szmoore/MCTX3420
[matches/MCTX3420.git]
/
server
/
control.h
diff --git
a/server/control.h
b/server/control.h
index
5b51e95
..
7081c3f
100644
(file)
--- a/
server/control.h
+++ b/
server/control.h
@@
-13,13
+13,17
@@
typedef enum ControlModes {
CONTROL_EMERGENCY
} ControlModes;
CONTROL_EMERGENCY
} ControlModes;
-/** ID codes for all the actuators **/
+/** Invalid filename characters **/
+#define INVALID_CHARACTERS "\"*/:<>?\\|. "
+/** The same as INVALID_CHARACTERS, except escaped for use in JSON strings **/
+#define INVALID_CHARACTERS_JSON "\\\"*/:<>?\\\\|. "
+
extern void Control_Handler(FCGIContext *context, char *params);
extern const char* Control_SetMode(ControlModes desired_mode, void * arg);
extern ControlModes Control_GetMode();
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(
ControlModes mode
);
+extern const char * Control_GetModeName();
//extern bool Control_Lock();
//extern void Control_Unlock();
//extern bool Control_Lock();
//extern void Control_Unlock();
-extern const struct time
val
* Control_GetStartTime();
+extern const struct time
spec
* Control_GetStartTime();
#endif
#endif
UCC
git Repository :: git.ucc.asn.au