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
0fe2136
..
3de48e0
100644
(file)
--- a/
server/sensor.h
+++ b/
server/sensor.h
@@
-59,6
+59,13
@@
typedef struct
struct timespec sample_time;
/** Number of averages per sample **/
int averages;
struct timespec sample_time;
/** Number of averages per sample **/
int averages;
+ /** Current data **/
+ DataPoint current_data;
+
+ /** Summed data **/
+ DataPoint averaged_data;
+ /** Number of points read so far before applying average **/
+ int num_read;
@@
-78,6
+85,8
@@
extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a s
extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
+extern DataPoint Sensor_LastData(int id);
+
extern const char * Sensor_GetName(int id);
extern const char * Sensor_GetName(int id);
UCC
git Repository :: git.ucc.asn.au