X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensors%2Fdilatometer.c;h=0bbda6b83cdb1800a8e035e65c6ba0f957bd2eb7;hb=d0b1d76f88063c93aa66c5dc9b5a48e2aa4dcfe3;hp=684a42511da5b7d55e03161a142d1bb64073fcbc;hpb=403f26b2bdd8e752e50b63f0a32caf9b31ee2679;p=matches%2FMCTX3420.git

diff --git a/server/sensors/dilatometer.c b/server/sensors/dilatometer.c
index 684a425..0bbda6b 100644
--- a/server/sensors/dilatometer.c
+++ b/server/sensors/dilatometer.c
@@ -68,7 +68,7 @@ void Dilatometer_TestImage()
 /**
  * Cleanup Dilatometer pointers
  */
-void Dilatometer_Cleanup()
+bool Dilatometer_Cleanup(int id)
 {
 	if (g_capture != NULL)
 		cvReleaseCapture(&g_capture);
@@ -80,6 +80,7 @@ void Dilatometer_Cleanup()
 		cvReleaseMat(&g_srcGray);
 	if (g_edges != NULL)
 		cvReleaseMat(&g_edges);
+	return true;
 }
 
 /**
@@ -224,7 +225,7 @@ bool Dilatometer_GetEdge( double * value, int samples)
  * @param val - Will store the read value if successful
  * @returns true on successful read
  */
-bool Dilatometer_Read( double * value)
+bool Dilatometer_Read(int id, double * value)
 {
 	bool result = Dilatometer_GetEdge(value, SAMPLES);
 	return result;
@@ -233,11 +234,12 @@ bool Dilatometer_Read( double * value)
 /**
  * Initialise the dilatometer
  */
-void Dilatometer_Init()
+bool Dilatometer_Init(const char * name, int id)
 {
 	// Make an initial reading (will allocate memory the first time only).
 	double val;
 	Dilatometer_GetEdge(&val, 1); 
+	return true;
 }
 
 // Overlays a line over the given edge position