* @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
//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
+// Canny Edge algorithm variables
+#define BLUR 5
+#define LOWTHRESHOLD 30
+#define RATIO 3
+#define KERNELSIZE 3
+
+//Scaling factor required to change from pixels to um
+#define SCALE 1 // Note camera has not been calibrated yet so result will be in pixels
+
+/**
+ * Enum of Dilatometer IDs
+ */
+typedef enum
+{
+ DIL_POS,
+ DIL_DIFF
+} DilatometerID;
+
+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