Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -ree9c8a27ccb6a9f1f5e18faf9f684935ccf118f4 -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision ee9c8a27ccb6a9f1f5e18faf9f684935ccf118f4)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -19,6 +19,7 @@
 #define __CONDUCTIVITY_SENSORS_H__
 
 #include "DDCommon.h"
+#include "DDDefs.h"
 
 /**
  *  @defgroup ConductivitySensors ConductivitySensors
@@ -38,23 +39,6 @@
 // ********** public definitions **********
 #define CONDUCTIVITY_CAL_CHAR_LENGTH            12
 
-/// Enumeration of conductivity sensors.
-typedef enum ConductivitySensors
-{
-    D17_COND = 0,                                       ///< Bicarb only conductivity sensor - 1
-    FIRST_DD_COND_SENSOR = D17_COND,                    ///< First conductivity sensor
-    D27_COND,                                           ///< Acid and Bicarb mix conductivity sensor - 1
-    D29_COND,                                           ///< Acid and Bicarb mix conductivity sensor - 2
-    D43_COND,                                           ///< Spent dialysate conductivity sensor
-    D74_COND,                                           ///< Bicarb only conductivity sensor - 2
-    LAST_DD_COND_SENSOR = D74_COND,                     ///< Last conductivity sensor
-    P9_COND,                                            ///< Inlet water conductivity sensor
-    FIRST_FP_COND_SENSOR = P9_COND,                     ///< First FP conductivity sensor
-    P18_COND,                                           ///< RO outlet water conductivity sensor
-    LAST_FP_COND_SENSOR = P18_COND,                     ///< Last FP conductivity sensor
-    NUM_OF_CONDUCTIVITY_SENSORS                         ///< Number of conductivity sensors
-} CONDUCTIVITY_SENSORS_T;
-
 /// Enumeration of calibration data
 typedef enum ConductivityCalDataIdx
 {