X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensors%2Fdilatometer.c;h=b9fb8337cd543095b274b5c9e30e587f0defd2ed;hb=4272becc415bc659ea14650793559dcf15372a8b;hp=8d04fb59b8174899695aba7610a7ddfb11232faf;hpb=6f3369862370d744055eb9a60876b8dc29d51611;p=matches%2FMCTX3420.git

diff --git a/server/sensors/dilatometer.c b/server/sensors/dilatometer.c
index 8d04fb5..b9fb833 100644
--- a/server/sensors/dilatometer.c
+++ b/server/sensors/dilatometer.c
@@ -179,7 +179,7 @@ bool Dilatometer_GetExpansion( int id, double * value, int samples)
 	Log(LOGDEBUG, "GET IMAGE?");
 
 	IplImage * frame = NULL;
-	result = Camera_GetImage( 0, 1600, 1200 ,&frame); // Get a 1600x1200 image and place it into src
+	result = Camera_GetImage( 0, 800, 600,&frame); // Get a 1600x1200 image and place it into src
 	Log(LOGDEBUG, "Got image...");
 
 	// If an error occured when capturing image then return
@@ -263,8 +263,8 @@ bool Dilatometer_GetExpansion( int id, double * value, int samples)
 				{	
 					// Find the rate of expansion and convert to mm. Will give a negative result for compression.
 					*value = (average - lastPosition) * SCALE *2;
-					lastPosition = average;	// Current position now becomes the last position
 				}
+				lastPosition = average;	// Current position now becomes the last position
 				return result;
 			default:
 				return false;  		}