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
Change times to be relative to this experiment
[matches/MCTX3420.git]
/
server
/
sensor.h
diff --git
a/server/sensor.h
b/server/sensor.h
index
3f833d1
..
1b44673
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-11,6
+11,7
@@
/** Number of sensors **/
#define NUMSENSORS 6
/** Number of sensors **/
#define NUMSENSORS 6
+/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
ANALOG_TEST0,
typedef enum SensorId
{
ANALOG_TEST0,
@@
-21,12
+22,9
@@
typedef enum SensorId
DIGITAL_FAIL0
} SensorId;
DIGITAL_FAIL0
} SensorId;
-
-
/** Human readable names for the sensors **/
extern const char * g_sensor_names[NUMSENSORS];
/** Human readable names for the sensors **/
extern const char * g_sensor_names[NUMSENSORS];
-
/** Structure to represent a sensor **/
typedef struct
{
/** Structure to represent a sensor **/
typedef struct
{
@@
-40,7
+38,6
@@
typedef struct
pthread_t thread;
/** Most recently recorded data **/
DataPoint newest_data;
pthread_t thread;
/** Most recently recorded data **/
DataPoint newest_data;
-
} Sensor;
// Structure to define the warning and error thresholds of the sensors
} Sensor;
// Structure to define the warning and error thresholds of the sensors
UCC
git Repository :: git.ucc.asn.au