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
Get rid of OpenCV for now
[matches/MCTX3420.git]
/
server
/
sensor.h
diff --git
a/server/sensor.h
b/server/sensor.h
index
8ae5660
..
36fdb27
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-14,6
+14,13
@@
/** Number of sensors **/
#define NUMSENSORS 4
/** Number of sensors **/
#define NUMSENSORS 4
+/** Safety Values for sensors **/
+#define ANALOG_TEST0_SAFETY 1000
+#define ANALOG_TEST1_SAFETY 1000
+#define DIGITAL_TEST0_SAFETY 1
+#define DIGITAL_TEST1_SAFETY 1
+
+
typedef enum SensorId {
ANALOG_TEST0,
ANALOG_TEST1,
typedef enum SensorId {
ANALOG_TEST0,
ANALOG_TEST1,
@@
-21,6
+28,13
@@
typedef enum SensorId {
DIGITAL_TEST1
} SensorId;
DIGITAL_TEST1
} SensorId;
+typedef enum
+{
+ JSON, // JSON data
+ CSV, // Comma seperated vector
+ TSV // Tab seperated vector
+} OutputType;
+
/** 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];
@@
-44,6
+58,8
@@
typedef struct
int write_index;
/** Number of points read **/
long points_read;
int write_index;
/** Number of points read **/
long points_read;
+ /** Number of points written to file **/
+ long points_written;
/** Binary file to write data into when buffer is full **/
FILE * file;
/** Thread running the sensor **/
/** Binary file to write data into when buffer is full **/
FILE * file;
/** Thread running the sensor **/
UCC
git Repository :: git.ucc.asn.au