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 #52 from jtanx/master
[matches/MCTX3420.git]
/
server
/
sensor.h
diff --git
a/server/sensor.h
b/server/sensor.h
index
bdab0f9
..
182d8ae
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-9,16
+9,18
@@
#include "data.h"
/** Number of sensors **/
#include "data.h"
/** Number of sensors **/
-#define NUMSENSORS
6
+#define NUMSENSORS
8
/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
ANALOG_TEST0,
ANALOG_TEST1,
/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
ANALOG_TEST0,
ANALOG_TEST1,
+ ANALOG_REALTEST,
ANALOG_FAIL0,
DIGITAL_TEST0,
DIGITAL_TEST1,
ANALOG_FAIL0,
DIGITAL_TEST0,
DIGITAL_TEST1,
+ DIGITAL_REALTEST,
DIGITAL_FAIL0
} SensorId;
DIGITAL_FAIL0
} SensorId;
@@
-32,10
+34,8
@@
typedef struct
SensorId id;
/** DataFile to store sensor values in **/
DataFile data_file;
SensorId id;
/** DataFile to store sensor values in **/
DataFile data_file;
- /** Indicates whether the Sensor is
not stopped
**/
+ /** Indicates whether the Sensor is
active or not
**/
bool activated;
bool activated;
- /** Indicates whether the Sensor should record data **/
- bool record_data;
/** Thread the Sensor is running in **/
pthread_t thread;
/** Most recently recorded data **/
/** Thread the Sensor is running in **/
pthread_t thread;
/** Most recently recorded data **/
UCC
git Repository :: git.ucc.asn.au