Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r8ea0a9904718b6e9527c4a7d6cb79a80b8fffc97 -rb106d94fa757d98b7092155bfd0ae16dd36b1c1a
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 8ea0a9904718b6e9527c4a7d6cb79a80b8fffc97)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b106d94fa757d98b7092155bfd0ae16dd36b1c1a)
@@ -192,11 +192,16 @@
     MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA
     MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB
     MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC
-    MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD
+    MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD
     MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE
     MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF
     MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2
+    MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3
+    MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4
+    MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5
+    MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6
+    MSG_ID_TD_POWER_OFF_REQUEST = 0xB7
     MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8
     MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9
 
@@ -379,10 +384,29 @@
     MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059
     MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A
     MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B
+    MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA05C
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F
+    MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060
+    MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061
+    MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062
+    MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063
+    MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064
+    MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065
+    MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066
+    MSG_ID_DD_BICARB_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA067
+    MSG_ID_DD_DIALYSATE_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA068
+    MSG_ID_DD_DIALYSATE_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA069
+    MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST = 0xA06A
+    MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST = 0xA06B
+    MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C
+    MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D
+    MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E
+    MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071
 
-    MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101
-
     # Placeholder messages
     MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
     MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04
@@ -457,13 +481,16 @@
     MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043
     MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044
     MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045
-    MSG_ID_FP_SET_OP_SUB_MODE_REQUEST = 0xB046
-    
+    MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047
+    MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048
     MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049
     MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D
+    MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E
 
-    MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100
-
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2
     MSG_ID_FP_DEBUG_EVENT = 0xFFF3