Done a bunch of changes to image handling

[matches/MCTX3420.git] / server / sensors / dilatometer.h

diff --git a/server/sensors/dilatometer.h b/server/sensors/dilatometer.h
index 7bb9447..e8be7d1 100644 (file)
--- a/server/sensors/dilatometer.h
+++ b/server/sensors/dilatometer.h
@@ -3,7 +3,7 @@
  * @brief Declarations for functions to deal with dilatometer
  */
 
-#include "common.h"
+#include "../common.h"
 
 //Threshold to determine the edge of the can
 #define THRES 230
@@ -11,7 +11,10 @@
 //Number of samples of the image to take
 #define SAMPLES 600
 
-extern void Dilatometer_Init(); // Initialise the dilatometer
-extern void Dilatometer_Cleanup(); // Cleanup
-extern bool Dilatometer_Read( double * value); // Read the Dilatometer
+//Scaling factor required to change from pixels to mm
+#define SCALE 1 // Note camera has not been calibrated yet so result will be in pixels
+
+extern bool Dilatometer_Init(const char * name, int id); // Initialise the dilatometer
+extern bool Dilatometer_Cleanup(int id); // Cleanup
+extern bool Dilatometer_Read(int id, double * value); // Read the Dilatometer