Some fixes

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

diff --git a/server/sensors/dilatometer.c b/server/sensors/dilatometer.c
index 8d04fb5..b9fb833 100644 (file)
--- 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;           }