Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r099095611e541d69aee3afc90ec06a2046836079 -r1f7b5ac840adf6740b023706fcb73691c33a9be7
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 099095611e541d69aee3afc90ec06a2046836079)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
@@ -20,54 +20,54 @@
 # Branch: staging
 @unique
 class MsgIds(DialinEnum):
-    MSG_ID_UNUSED = 0x0                                         
-    MSG_ID_ALARM_STATUS_DATA = 0x1                              
-    MSG_ID_ALARM_TRIGGERED = 0x2                                
-    MSG_ID_ALARM_CLEARED = 0x3                                  
-    MSG_ID_ALARM_CONDITION_CLEARED = 0x4                        
-    MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x5                     
-    MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x6                   
-    MSG_ID_TD_ALARM_INFORMATION_DATA = 0x7                      
-    MSG_ID_DD_ALARM_INFO_DATA = 0x8                             
-    MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x9                  
-    MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0xA         
-    MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0xB    
-    MSG_ID_TD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0xC             
-    MSG_ID_FW_VERSIONS_REQUEST = 0xD                            
+    MSG_ID_UNUSED = 0x0
+    MSG_ID_ALARM_STATUS_DATA = 0x1
+    MSG_ID_ALARM_TRIGGERED = 0x2
+    MSG_ID_ALARM_CLEARED = 0x3
+    MSG_ID_ALARM_CONDITION_CLEARED = 0x4
+    MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x5
+    MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x6
+    MSG_ID_TD_ALARM_INFORMATION_DATA = 0x7
+    MSG_ID_DD_ALARM_INFO_DATA = 0x8
+    MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x9
+    MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0xA
+    MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0xB
+    MSG_ID_TD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0xC
+    MSG_ID_FW_VERSIONS_REQUEST = 0xD
     MSG_ID_TD_VERSION_RESPONSE = 0xE
     MSG_ID_DD_VERSION_RESPONSE = 0xF
-    MSG_ID_UI_CHECK_IN = 0x10                                   
-    MSG_ID_TD_BLOOD_PUMP_DATA = 0x11                            
-    MSG_ID_TD_OP_MODE_DATA = 0x12                               
-    MSG_ID_DD_OP_MODE_DATA = 0x13                               
-    MSG_ID_DD_COMMAND_RESPONSE = 0x14                           
-    MSG_ID_TD_UI_VERSION_INFO_REQUEST = 0x15                    
-    MSG_ID_UI_VERSION_INFO_RESPONSE = 0x16                      
-    MSG_ID_TD_EVENT = 0x17                                      
-    MSG_ID_DD_EVENT = 0x18                                      
-    MSG_ID_TD_DD_ALARMS_REQUEST = 0x19                          
-    MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x1A           
-    MSG_ID_DD_VALVES_STATES_DATA = 0x1B                         
-    MSG_ID_DD_PRESSURES_DATA = 0x1C                             
-    MSG_ID_TD_VOLTAGES_DATA = 0x1D                              
-    MSG_ID_TD_BUBBLES_DATA = 0x1E                               
-    MSG_ID_DD_CONDUCTIVITY_DATA = 0x1F                          
-    MSG_ID_TD_AIR_PUMP_DATA = 0x20                              
-    MSG_ID_TD_SWITCHES_DATA = 0x21                              
-    MSG_ID_POWER_OFF_WARNING = 0x22                             
-    MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23                      
+    MSG_ID_UI_CHECK_IN = 0x10
+    MSG_ID_TD_BLOOD_PUMP_DATA = 0x11
+    MSG_ID_TD_OP_MODE_DATA = 0x12
+    MSG_ID_DD_OP_MODE_DATA = 0x13
+    MSG_ID_DD_COMMAND_RESPONSE = 0x14
+    MSG_ID_TD_UI_VERSION_INFO_REQUEST = 0x15
+    MSG_ID_UI_VERSION_INFO_RESPONSE = 0x16
+    MSG_ID_TD_EVENT = 0x17
+    MSG_ID_DD_EVENT = 0x18
+    MSG_ID_TD_DD_ALARMS_REQUEST = 0x19
+    MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x1A
+    MSG_ID_DD_VALVES_STATES_DATA = 0x1B
+    MSG_ID_DD_PRESSURES_DATA = 0x1C
+    MSG_ID_TD_VOLTAGES_DATA = 0x1D
+    MSG_ID_TD_BUBBLES_DATA = 0x1E
+    MSG_ID_DD_CONDUCTIVITY_DATA = 0x1F
+    MSG_ID_TD_AIR_PUMP_DATA = 0x20
+    MSG_ID_TD_SWITCHES_DATA = 0x21
+    MSG_ID_POWER_OFF_WARNING = 0x22
+    MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23
     MSG_ID_TD_PRESSURE_DATA = 0x24
-    MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25                      
-    MSG_ID_DD_TEMPERATURE_DATA = 0x26                           
-    MSG_ID_DIALYSATE_PUMPS_DATA = 0x27                          
-    MSG_ID_DD_HEATERS_DATA = 0x28                               
-    MSG_ID_DD_LEVEL_DATA = 0x29                                 
-    MSG_ID_TD_AIR_TRAP_DATA = 0x2A                              
-    MSG_ID_TD_VALVES_DATA = 0x2B                                
+    MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25
+    MSG_ID_DD_TEMPERATURE_DATA = 0x26
+    MSG_ID_DIALYSATE_PUMPS_DATA = 0x27
+    MSG_ID_DD_HEATERS_DATA = 0x28
+    MSG_ID_DD_LEVEL_DATA = 0x29
+    MSG_ID_TD_AIR_TRAP_DATA = 0x2A
+    MSG_ID_TD_VALVES_DATA = 0x2B
     MSG_ID_FP_EVENT = 0x2C
     MSG_ID_FP_ALARM_INFO_DATA= 0x2D
-    MSG_ID_DD_BAL_CHAMBER_DATA = 0x2E                           
-    MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F                    
+    MSG_ID_DD_BAL_CHAMBER_DATA = 0x2E
+    MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F
     MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30
     MSG_ID_FP_VALVES_STATES_DATA = 0x31
     MSG_ID_FP_RO_PUMP_DATA = 0x32
@@ -377,9 +377,21 @@
     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_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101
+    
 
     # Placeholder messages
     MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03