Index: MsgDefs.h
===================================================================
diff -u -rf0bb786528e009ef3479b37a298f7fc5b1f71a12 -ra3d2646055ec0f65f5d328051f8ed4d9996c1ab6
--- MsgDefs.h	(.../MsgDefs.h)	(revision f0bb786528e009ef3479b37a298f7fc5b1f71a12)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision a3d2646055ec0f65f5d328051f8ed4d9996c1ab6)
@@ -354,15 +354,18 @@
     MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053,           ///< DD rinse pump broadcast data override request
     MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054,                     ///< DD rinse pump PWM percent override request
     MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055,                              ///< DD rinse pump turn on/off request
-    MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056,                              ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors )
-    MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057,           ///< DD dry bicart broadcast data overrride request
-    MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058,                  ///< DD dry bicart fill cycle max count overrride request
-    MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059,                    ///< DD dry bicart fill request overrride request
-    MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A,                ///< DD bicarb chamber fill request overrride request
-    MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05B,                       ///< DD bicarb drain request overrride request
-    MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05C,                    ///< DD bicarb cartridge select(small-0, large-1) overrride request
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D,             ///< DD conductivity sensor resistance override request
+    MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA056,           ///< DD dry bicart broadcast data overrride request
+    MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA057,                  ///< DD dry bicart fill cycle max count overrride request
+    MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA058,                    ///< DD dry bicart fill request overrride request
+    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
 
+#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
@@ -434,8 +437,11 @@
     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
     MSG_ID_FP_DEBUG_EVENT = 0xFFF3,                                                 ///< FP debug event text to be logged in event log