Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r4fc29aead7deff5ba3ddb4c9e1290fc0d5b2b6e8 -r91453afc6587154bac43f0bab1da721fff9517e4
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 4fc29aead7deff5ba3ddb4c9e1290fc0d5b2b6e8)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 91453afc6587154bac43f0bab1da721fff9517e4)
@@ -192,16 +192,67 @@
     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_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_TREATMENT_LOG_AVERAGE_DATA = 0xAD
+    MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE
+    MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF
+    MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0
     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_DD_SUBSTITUTION_PUMP_DATA = 0xB5
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6
+    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
+    MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0xBA
+    MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0xBB
+    MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD = 0xBC
+    MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD
+    MSG_ID_DD_NVM_SET_SERVICE_RECORD = 0xBE
+    MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF
+    MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0
+    MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1
+    MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2
+    MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3
+    MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4
+    MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5
+    MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6
+    MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7
+    MSG_ID_DD_NVM_SET_CAL_CONC_PUMP = 0xC8
+    MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9
+    MSG_ID_DD_NVM_SET_CAL_D12_PUMP = 0xCA
+    MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB
+    MSG_ID_DD_NVM_SET_CAL_D48_PUMP = 0xCC
+    MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD
+    MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE
+    MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF
+    MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0
+    MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1
+    MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2
+    MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3
+    MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4
+    MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5
+    MSG_ID_UI_SETUP_CONNECTION_CONFIRM_REQUEST = 0xD6
+    MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE = 0xD7
+    MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8
+    MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9
+    MSG_ID_TD_UI_CANCEL_REQUEST = 0xDA
+    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC
+    MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST  = 0xDD
+    MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE = 0xDE
+    MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD = 0xDF
+    MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE = 0xE0
+    MSG_ID_UI_TD_NVM_SET_SERVICE_RECORD = 0xE1
+    MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xE2
+    MSG_ID_UI_TD_NVM_SET_INSTITUTIONAL_RECORD = 0xE3
+    MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xE4
+    MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0xE5
+    MSG_ID_TD_NVM_CAL_RESPONSE = 0xE6
+    MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0xE7
 
+    
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
@@ -298,7 +349,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
@@ -399,7 +450,7 @@
     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_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071