X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=blobdiff_plain;f=server%2Fsensors%2Fdilatometer.h;h=e8be7d1fb37aaadc0332049d250b4c0c227986b4;hp=7bb9447dc4624217033a08a555ccbcd5a0e30a64;hb=69d9f5d6774384f76c75248907304b0fbd66bbd1;hpb=08d2355bfc1f7d895171c78e03d823d361dbe161

diff --git a/server/sensors/dilatometer.h b/server/sensors/dilatometer.h
index 7bb9447..e8be7d1 100644
--- 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