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
a499b77
..
182d8ae
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-9,30
+9,24
@@
#include "data.h"
/** Number of sensors **/
#include "data.h"
/** Number of sensors **/
-#define NUMSENSORS 4
-
-/** Safety Values for sensors **/
-//TODO: Probably better to use an array instead
-#define ANALOG_TEST0_SAFETY 1000
-#define ANALOG_TEST1_SAFETY 1000
-#define DIGITAL_TEST0_SAFETY 1
-#define DIGITAL_TEST1_SAFETY 1
-
+#define NUMSENSORS 8
+/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
ANALOG_TEST0,
ANALOG_TEST1,
typedef enum SensorId
{
ANALOG_TEST0,
ANALOG_TEST1,
+ ANALOG_REALTEST,
+ ANALOG_FAIL0,
DIGITAL_TEST0,
DIGITAL_TEST0,
- DIGITAL_TEST1
+ DIGITAL_TEST1,
+ DIGITAL_REALTEST,
+ DIGITAL_FAIL0
} 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];
-
/** Structure to represent a sensor **/
typedef struct
{
/** Structure to represent a sensor **/
typedef struct
{
@@
-40,33
+34,35
@@
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
should record data
**/
- bool
record_data
;
+ /** Indicates whether the Sensor
is active or not
**/
+ bool
activated
;
/** 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;
} Sensor;
+// Structure to define the warning and error thresholds of the sensors
+typedef struct
+{
+ double max_error;
+ double min_error;
+ double max_warn;
+ double min_warn;
+} SensorThreshold;
extern void Sensor_Init(); // One off initialisation of *all* sensors
extern void Sensor_Init(); // One off initialisation of *all* sensors
-extern void Sensor_StartAll(const char * experiment_name); // Start all Sensors recording data
-extern void Sensor_StopAll(); // Stop all Sensors recording data
-extern void Sensor_Start(Sensor * s, const char * experiment_name); // Start a sensor recording datas
-extern void Sensor_Stop(Sensor * s); // Stop a Sensor from recording data
-
+extern void Sensor_SetModeAll(ControlModes mode, void * arg);
+extern void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg);
extern void * Sensor_Loop(void * args); // Main loop for a thread that handles a Sensor
extern bool Sensor_Read(Sensor * s, DataPoint * d); // Read a single DataPoint, indicating if it has changed since the last one
extern void * Sensor_Loop(void * args); // Main loop for a thread that handles a Sensor
extern bool Sensor_Read(Sensor * s, DataPoint * d); // Read a single DataPoint, indicating if it has changed since the last one
-extern void Sensor_CheckData(SensorId id,
DataPoint * d
); // Check a DataPoint
+extern void Sensor_CheckData(SensorId id,
double value
); // Check a DataPoint
extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string Id
extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string Id
extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
-
-
#endif //_SENSOR_H
#endif //_SENSOR_H
+
UCC
git Repository :: git.ucc.asn.au