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 #49 from RowanHeinrich/patch-5
[matches/MCTX3420.git]
/
server
/
actuator.h
diff --git
a/server/actuator.h
b/server/actuator.h
index
81150e8
..
48e0f29
100644
(file)
--- a/
server/actuator.h
+++ b/
server/actuator.h
@@
-14,13
+14,14
@@
// Might be OK in C++ but not easy in C
/** Number of actuators **/
// Might be OK in C++ but not easy in C
/** Number of actuators **/
-#define NUMACTUATORS
2
+#define NUMACTUATORS
3
/** List of actuator ids (should be of size NUMACTUATORS) **/
typedef enum
{
ACTUATOR_TEST0,
/** List of actuator ids (should be of size NUMACTUATORS) **/
typedef enum
{
ACTUATOR_TEST0,
- ACTUATOR_TEST1
+ ACTUATOR_TEST1,
+ ACTUATOR_TEST2
} ActuatorId;
/** Human readable names for the Actuators **/
} ActuatorId;
/** Human readable names for the Actuators **/
@@
-52,8
+53,6
@@
typedef struct
pthread_cond_t cond;
/** Indicates whether the Actuator is running **/
bool activated;
pthread_cond_t cond;
/** Indicates whether the Actuator is running **/
bool activated;
- /** Indicates whether the Actuator can be actuated or not **/
- bool allow_actuation;
} Actuator;
} Actuator;
UCC
git Repository :: git.ucc.asn.au