Index: MsgDefs.h
===================================================================
diff -u -r909f3498d27e64aa44eb572ea6cfb4fa98564c0e -r4790df0d328a9e46fe162bbf07eee311b0492297
--- MsgDefs.h	(.../MsgDefs.h)	(revision 909f3498d27e64aa44eb572ea6cfb4fa98564c0e)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 4790df0d328a9e46fe162bbf07eee311b0492297)
@@ -364,12 +364,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
@@ -441,10 +438,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