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 https://github.com/szmoore/MCTX3420
[matches/MCTX3420.git]
/
server
/
sensor.h
diff --git
a/server/sensor.h
b/server/sensor.h
index
bdab0f9
..
2e7bf4a
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-8,20
+8,28
@@
#include "data.h"
#include "data.h"
+
+
/** Number of sensors **/
/** Number of sensors **/
-#define NUMSENSORS
6
+#define NUMSENSORS
10
/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
- ANALOG_TEST0,
- ANALOG_TEST1,
- ANALOG_FAIL0,
- DIGITAL_TEST0,
- DIGITAL_TEST1,
- DIGITAL_FAIL0
+ STRAIN0,
+ STRAIN1,
+ STRAIN2,
+ STRAIN3,
+ PRESSURE0,
+ PRESSURE1,
+ PRESSURE_FEEDBACK,
+ MICROPHONE,
+ ENCLOSURE.
+ DILATOMETER
} SensorId;
} 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];
@@
-32,14
+40,14
@@
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 **/
DataPoint newest_data;
/** Thread the Sensor is running in **/
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