Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r69db0a9ed734905964a1e79bf80ff3723b7cf509 -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 69db0a9ed734905964a1e79bf80ff3723b7cf509)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f)
@@ -200,7 +200,7 @@
     MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3
     MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4
     MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5
-
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
@@ -297,7 +297,7 @@
     MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005
     MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006
     MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007
-    MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008
+    MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008
     MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009
     MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A
     MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B
@@ -380,14 +380,27 @@
     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_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA06E
     MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F
 
-    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