Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -re324174eeb74c1630c6e913e7dfb65246924cd1f -r87ffed5716c48332d6dc3c5f5a80660614d813c0
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision e324174eeb74c1630c6e913e7dfb65246924cd1f)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 87ffed5716c48332d6dc3c5f5a80660614d813c0)
@@ -194,12 +194,46 @@
     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_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_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_DD_SUBSTITUTION_PUMP_DATA = 0xD5
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
@@ -380,18 +414,6 @@
     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_NVM_GET_RECORD = 0xA05C
-    MSG_ID_DD_NVM_SEND_SYSTEM_RECORD  = 0xA05D
-    MSG_ID_DD_NVM_SET_SYSTEM_RECORD  = 0xA05E
-    MSG_ID_DD_NVM_SEND_SERVICE_RECORD  = 0xA05F
-    MSG_ID_DD_NVM_SET_SERVICE_RECORD  = 0xA060
-    MSG_ID_DD_NVM_SEND_CALIBRATION_RECORD = 0xA061
-    MSG_ID_DD_NVM_SET_CALIBRATION_RECORD = 0xA062
-    MSG_ID_DD_NVM_SEND_INSTITUTIONAL_RECORD  = 0xA063
-    MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD  = 0xA064
-    MSG_ID_DD_NVM_SEND_USAGE_INFO_RECORD  = 0xA065
-    MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD  = 0xA066
-    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