Index: DDDefs.h
===================================================================
diff -u -rc138b6c9d4f5239d252b6343ed791a97e02c6f44 -ra5a4420cd22b8fa07ec5f5e22ccbd4743f743567
--- DDDefs.h	(.../DDDefs.h)	(revision c138b6c9d4f5239d252b6343ed791a97e02c6f44)
+++ DDDefs.h	(.../DDDefs.h)	(revision a5a4420cd22b8fa07ec5f5e22ccbd4743f743567)
@@ -524,7 +524,7 @@
 };
 typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for bicarb chamber fill exec state enumeration
 
-//Enumeration of Bicarb chmaber drain mode exec states
+/// Enumeration of Bicarb chmaber drain mode exec states
 enum Dry_Bicart_Drain_Exec_States
 {
     DRY_BICART_DRAIN_START_STATE = 0,                                 ///< Initial state of dry bicart drain
@@ -535,6 +535,23 @@
 };
 typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T;    ///< Type for dry bicart fill exec state enumeration
 
+/// Enumeration of conductivity sensors.
+enum Conductivity_Sensors
+{
+    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
+};
+typedef enum Conductivity_Sensors CONDUCTIVITY_SENSORS_T; ///< Type for conductivity sensor enumeration.
 /**@}*/
 
 #endif
Index: MsgDefs.h
===================================================================
diff -u -r108761cd312e0b9b2c1cc73b1df1f07c883049a8 -ra5a4420cd22b8fa07ec5f5e22ccbd4743f743567
--- MsgDefs.h	(.../MsgDefs.h)	(revision 108761cd312e0b9b2c1cc73b1df1f07c883049a8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision a5a4420cd22b8fa07ec5f5e22ccbd4743f743567)
@@ -361,12 +361,9 @@
     MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059,                ///< DD bicarb chamber fill request overrride request
     MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A,                       ///< DD bicarb drain request overrride request
     MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B,                    ///< DD bicarb cartridge select(small-0, large-1) overrride request
+    MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA05C,                              ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors )
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D,             ///< DD conductivity sensor resistance override request
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-    MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100,                              ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors )
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101,             ///< DD conductivity sensor resistance override request
-#endif
-
     MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000,                                        ///< First FP test message ID
     MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE,                ///< FP tester log-in
     MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001,                                      ///< FP reset request
@@ -438,10 +435,8 @@
     MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043,                   ///< FP defeatured generation data publish interval override request
     MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044,                                          ///< FP request for defatured status from Dialin
     MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045,                                         ///< FP response for defatured status to Dialin
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB046,             ///< FP conductivity sensor resistance override request
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-    MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100,             ///< FP conductivity sensor resistance override request
-#endif
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log