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
Move nginx configs and update makefile (crypto lib)
[matches/MCTX3420.git]
/
server
/
sensor.h
diff --git
a/server/sensor.h
b/server/sensor.h
index
e51ab0c
..
a259036
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-5,25
+5,22
@@
*/
*/
-
#ifndef _SENSOR_H
#define _SENSOR_H
#ifndef _SENSOR_H
#define _SENSOR_H
-#include "common.h"
-
/** Number of data points to keep in sensor buffers **/
#define SENSOR_DATABUFSIZ 10
/** Number of data points to keep in sensor buffers **/
#define SENSOR_DATABUFSIZ 10
+#define SENSOR_QUERYBUFSIZ 10
+
/** Number of sensors **/
#define NUMSENSORS 1
/** Number of sensors **/
#define NUMSENSORS 1
-#define FILENAMESIZE 10
-
/** Structure to represent data recorded by a sensor at an instant in time **/
typedef struct
{
/** Time at which data was taken **/
/** Structure to represent data recorded by a sensor at an instant in time **/
typedef struct
{
/** Time at which data was taken **/
- float time;
+ struct timeval time_stamp; //TODO: Consider; use float instead?
/** Value of data **/
float value;
} DataPoint;
/** Value of data **/
float value;
} DataPoint;
@@
-39,8
+36,8
@@
typedef struct
int write_index;
/** Offset position in binary file for query thread to read from**/
int read_offset;
int write_index;
/** Offset position in binary file for query thread to read from**/
int read_offset;
- /**
F
ile to write data into when buffer is full **/
-
char filename[FILENAMESIZE]
;
+ /**
Binary f
ile to write data into when buffer is full **/
+
FILE * file
;
/** Thread running the sensor **/
pthread_t thread;
/** Mutex to protect access to stuff **/
/** Thread running the sensor **/
pthread_t thread;
/** Mutex to protect access to stuff **/
@@
-49,12
+46,16
@@
typedef struct
} Sensor;
} Sensor;
-/** Array of Sensors **/
-extern Sensor g_sensors[];
-extern void Sensor_Init(Sensor * s, int id); // Initialise sensor
+
+extern void Sensor_Spawn(); // Initialise sensor
+extern void Sensor_Join(); //Join sensor threads
extern void * Sensor_Main(void * args); // main loop for sensor thread; pass a Sensor* cast to void*
extern void * Sensor_Main(void * args); // main loop for sensor thread; pass a Sensor* cast to void*
+extern int Sensor_Query(Sensor * s, DataPoint * buffer, int bufsiz); // fill buffer with sensor data
+
+extern void Sensor_Handler(FCGIContext *context, char * params);
+
#endif //_SENSOR_H
#endif //_SENSOR_H
UCC
git Repository :: git.ucc.asn.au