Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r5994adea1a1022175f9cc4e6dacfa02de3fc45a0 -r5ee0dd4d1d95856defa2a8f20936d5080da62bd5
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5994adea1a1022175f9cc4e6dacfa02de3fc45a0)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5ee0dd4d1d95856defa2a8f20936d5080da62bd5)
@@ -197,10 +197,6 @@
     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_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
@@ -212,31 +208,31 @@
     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_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST = 0xBC
     MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD
-    MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD = 0xBE
+    MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST = 0xBE
     MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF
-    MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0
+    MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST = 0xC0
     MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1
-    MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2
+    MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST = 0xC2
     MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3
-    MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4
+    MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST = 0xC4
     MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5
-    MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6
+    MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST = 0xC6
     MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7
-    MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP = 0xC8
+    MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST = 0xC8
     MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9
-    MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP = 0xCA
+    MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST = 0xCA
     MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB
-    MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP = 0xCC
+    MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST = 0xCC
     MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD
-    MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE
+    MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST = 0xCE
     MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF
-    MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0
+    MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST = 0xD0
     MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1
-    MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2
+    MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST = 0xD2
     MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3
-    MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4
+    MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST = 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
@@ -247,20 +243,20 @@
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC
     MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD
     MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE
-    TBD_DF = 0xDF
-    TBD_E0 = 0xE0
-    TBD_E1 = 0xE1
-    TBD_E2 = 0xE2
-    TBD_E3 = 0xE3
-    TBD_E4 = 0xE4
-    TBD_E5 = 0xE5
-    TBD_E6 = 0xE6
-    TBD_E7 = 0xE7
-    TBD_E8 = 0xE8
-    TBD_E9 = 0xE9
-    TBD_EA = 0xEA
-    TBD_EB = 0xEB
-    TBD_EC = 0xEC
+    MSG_ID_DD_NVM_GET_RECORD_RESPONSE = 0xDF
+    MSG_ID_DD_NVM_SET_SYSTEM_RECORD_RESPONSE = 0xE0
+    MSG_ID_DD_NVM_SET_SERVICE_RECORD_RESPONSE = 0xE1
+    MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD_RESPONSE = 0xE2
+    MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD_RESPONSE = 0xE3
+    MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR_RESPONSE = 0xE4
+    MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR_RESPONSE = 0xE5
+    MSG_ID_DD_NVM_SET_CAL_CONC_PUMP_RESPONSE = 0xE6
+    MSG_ID_DD_NVM_SET_CAL_D12_PUMP_RESPONSE = 0xE7
+    MSG_ID_DD_NVM_SET_CAL_D48_PUMP_RESPONSE = 0xE8
+    MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE_RESPONSE = 0xE9
+    MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE = 0xEA
+    MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE = 0xEB
+    MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xEC
     TBD_ED = 0xED
     TBD_EE = 0xEE
     TBD_EF = 0xEF