Index: Messages/Unhandled.conf
===================================================================
diff -u -rfa65ef198c64663a4b88e4ba355e9a533d59b67a -r5c8e5289d6db50964ad4559893e51bb97b849967
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision fa65ef198c64663a4b88e4ba355e9a533d59b67a)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 5c8e5289d6db50964ad4559893e51bb97b849967)
@@ -65,14 +65,6 @@
 DG_Heat_Disinfect_Cmd
 U32=Start/Stop
 
-[0x3100]
-DG_Conductivity_Sensors_Data
-F32=Reject Ratio
-F32=CPi
-F32=CPo
-F32=CD1
-F32=CD2
-
 [0x3700]
 DG_Heat_Disinfect_Data
 U32=Heat Disinfect State
@@ -98,11 +90,6 @@
 U32=PWM DC
 U32=Air Trap Valve State
 
-[0x3E00]
-Air_Trap_Data
-U32=Lower Level
-U32=Upper Level
-
 [0x4200]
 DG_Concentrate_Pump_Data
 F32=CP1 Set Speed
@@ -157,11 +144,6 @@
 DG_Fluid_Leak_Data
 U32=Leak State
 
-[0x6C00]
-HD_Blood_Leak_Data
-U32=Leak Status
-U32=Leak State
-
 [0x7800]
 DG_Chem_Disinfect_Cmd
 U32=Start/Stop
@@ -190,6 +172,14 @@
 F32=1.8V FPGA Vaux
 F32=0V FPGA Vpvn
 
+[0x7D00]
+HD_Alarm_Information
+U32=Audio Volume
+F32=Audio Current HG
+F32=Audio Current LG
+F32=Backup Audio Current
+U32=Safety Shutdown
+
 [0x8600]
 DG_Voltages_Data
 F32=1V FPGA
@@ -218,7 +208,7 @@
 F32=R2 Fill Level
 U32=Target rinse count
 U32=Rinse count
-U32 UI State
+U32=UI State
 
 [0x8B00]
 HD_Usage_Data
@@ -228,13 +218,6 @@
 DG_Usage_Data
 F32=Liters
 
-[0x9300]
-Bubble_Data
-U32=Arterial bubble detector status
-U32=Arterial bubble detector state
-U32=Venous bubble detector status
-U32=Venous bubble detector state
-
 [0x9A00]
 HD_Standby_Disinfect_Req
 
@@ -244,9 +227,6 @@
 U32=Reject Reason
 
 [0x9D00]
-DG_POST_Result_Req
-
-[0x9D00]
 HD_Temperature_Data
 F32=Board temperature
 F32=PS 1 temperature
@@ -266,15 +246,73 @@
 [0xA200]
 HD_Switches_Data
 U32=Door switch
+U32=Pump Track Switch
 
 [0xA300]
 HD_Fans_Data
 F32=PWM Duty Cycle
 F32=Target RPM
 F32=Inlet fan 1 RPM
+U32=RPM Alarm Time Offset
 
 [0xA600]
 DG_Dialysate_Flow_Data
 F32=Dialysate Flow Rate
 
+[0xA800]
+U32=Reservoir State
+F32=Active Reservior UF Volume
+F32=Active Reservior Volume spent
+F32=Dilution Level Percent
+F32=Recirculation Level Percent
+U32=Time Depletion ms
+U32=Time wait fill ms
+F32=Temporary ToBeRemoved Target Fill Flow
 
+
+
+
+### Test Support Functions ###
+
+# HD Support Functions
+[0x8000]
+U32=Passcode
+
+[0x8001]
+U32=Reset
+U32=Set Point
+
+[0x8002]
+U32=Reset
+U32=State
+
+[0x8003]
+U32=Reset
+U32=State
+
+[0x8004]
+U32=Reset
+U32=Pattern
+
+[0x8005]
+U32=Reset
+U32=Task
+U32=State
+
+[0x8006]
+U32=Reset
+U32=Alarm ID
+U32=Active
+
+[0x8079]
+U32=Reset
+F32=Duty Cycle
+
+
+# DG Support Functions
+[0xA000]
+U32=Passcode
+
+[0xA04D]
+U32=Reset
+F32=Duty Cycle