Index: Messages/Unhandled.conf
===================================================================
diff -u -r79a7e75b55af2c0046d331de3d4004a1905263d0 -r628387da7cedf059651f6a8024e9d5127391db4a
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 79a7e75b55af2c0046d331de3d4004a1905263d0)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 628387da7cedf059651f6a8024e9d5127391db4a)
@@ -30,9 +30,6 @@
 #--duplicate_key_on
 
 
-[0x0000]
-UNUSED
-
 [0x0100]
 OFF_BUTTON_PRESS
 U08=userRequest
@@ -339,7 +336,19 @@
 [0x2A00]
 VALVES_S
 U16=valvesStatus
-U08=valvesSensedState[NUM_OF_VALVES]
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
+U08=valvesSensedState
 
 [0x2B00]
 START_STOP_TRIMMER_HEATER
@@ -910,7 +919,12 @@
 F32=backupAudioCurr
 BOOL=safetyShutdown
 BOOL=acPowerLost
-U08=uiAlarmButtonBlocks[NUM_OF_ALARM_BUTTON_BLOCKERS]
+U08=uiAlarmButtonBlocks
+U08=uiAlarmButtonBlocks
+U08=uiAlarmButtonBlocks
+U08=uiAlarmButtonBlocks
+U08=uiAlarmButtonBlocks
+U08=uiAlarmButtonBlocks
 
 [0x7E00]
 POST_TX_NEXT
@@ -937,9 +951,6 @@
 [0x8200]
 SERVICE_RECORD_FROM
 
-[0x8300]
-MSG_AVAILABLE_4
-
 [0x8400]
 HEAT_DISINFECT_TIME
 U32=heatDisinfectTargetTime
@@ -1078,7 +1089,16 @@
 ACTIVE_ALARMS_LIST
 BOOL=accepted
 U32=rejectionReason
-U32=activeAlarmList[=MAX_ALARM_LIST_SIZE=]
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
+U32=activeAlarmList
 
 [0x9900]
 SERIAL_NUMBER
@@ -1140,9 +1160,9 @@
 EVENT
 U32=event
 U32=dataType1
-EVENT_DATAS_T=data1
+EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
 U32=dataType2
-EVENT_DATAS_T=data2
+EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
 
 [0xA500]
 EVENT
@@ -1247,9 +1267,6 @@
 [0xB800]
 USAGE_INFO
 
-[0xB900]
-MSG_AVAILABLE_9
-
 [0xBA00]
 CONFIRMATION
 U32=temp_request
@@ -1381,961 +1398,1300 @@
 U32=badFillSignal
 U32=badFillState
 
-### Test Support Functions ###
-
-# With Test Support Functions, Denali apps send a Success/Fail response over the
-# same msg_id but on a different channel. TBD on how the log will display the responses.
-
-## HD Support Functions
-
 [0x0080]
-HD_Login
-U32=character
+TESTER_LOGIN
 
 [0x0180]
-HD_Dialysate_Outlet_Flow_Set_Point
-U32=Reset
-U32=Set_Point
-U32=Mode
+DIAL_OUT_FLOW_SET_PT_OVERRIDE
+BOOL=reset
+S32=setPt
+U32=ctrlMode
 
 [0x0280]
-HD_Off_Button_State
-U32=Reset
-U32=State
+OFF_BUTTON__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0380]
-HD_Stop_Button_State
-U32=Reset
-U32=State
+STOP_BUTTON__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0480]
-HD_Alarm_Lamp
-U32=Reset
-U32=Pattern
+ALARM_LAMP_PATTERN_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0580]
-HD_Watch_Task_Checkin
-U32=Reset
-U32=Task
-U32=State
+WATCOG_TASK_CHECKIN_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x0680]
-HD_Alarm_State
-U32=Reset
-U32=Alarm_ID
-U32=is_Active
+ALARM__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x0780]
-HD_Alarm_Start
-U32=Reset
-U32=Alarm_ID
-U32=Start
+ALARM_TIME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x0880]
-HD_Blood_Flow_Set_Point
-U32=Reset
-U32=Set_Point
-U32=Mode
+BLOOD_FLOW_SET_PT_OVERRIDE
+BOOL=reset
+S32=setPt
+U32=ctrlMode
 
 [0x0980]
-HD_Blood_Flow_Meas_Rate
-U32=Reset
-F32=Flow_Rate
+BLOOD_FLOW_MEAS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0A80]
-HD_Blood_Pump_Meas_MC_Spd
-U32=Reset
-F32=RPM
+BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0B80]
-HD_Blood_Pump_Meas_MC_Current
-U32=Reset
-F32=mA
+BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0C80]
-HD_Blood_Flow_Broadcast_Interval
-U32=Reset
-U32=ms
+BLOOD_FLOW_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0D80]
-HD_Treatment_Time_Remaining
-U32=Reset
-U32=sec
+TREATMENT_TIME_REMAINING_OVERRIDE
+U32=payload
 
 [0x0E80]
-HD_Blood_Pump_Meas_Spd
-U32=Reset
-F32=RPM
+BLOOD_PUMP_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0F80]
-HD_Blood_Pump_Meas_Rotor_Spd
-U32=Reset
-F32=RPM
+BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1080]
-HD_Dial_Inlet_Flow_Set_Point
-U32=Reset
-U32=Set_Point
-U32=Mode
+DIAL_IN_FLOW_SET_PT_OVERRIDE
+BOOL=reset
+S32=setPt
+U32=ctrlMode
 
 [0x1180]
-HD_Dial_Inlet_Flow_Meas_Rate
-U32=Reset
-F32=Flow_Rate
+DIAL_IN_FLOW_MEAS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1280]
-HD_Dial_Inlet_Pump_Meas_MC_Spd
-U32=Reset
-F32=RPM
+DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1380]
-HD_Dial_Inlet_Pump_Meas_MC_Current
-U32=Reset
-F32=mA
+DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1480]
-HD_Dial_Inlet_Flow_Broadcast_Interval
-U32=Reset
-U32=ms
+DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1580]
-HD_Dial_Inlet_Pump_Meas_Spd
-U32=Reset
-F32=RPM
+DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1680]
-HD_Dial_Inlet_Pump_Meas_Rotor_Spd
-U32=Reset
-F32=RPM
+DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1780]
-HD_Arterial_Pressure
-U32=Reset
-F32=mmHg
+PRESSURE_ARTERIAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1880]
-HD_Venous_Pressure
-U32=Reset
-F32=mmHg
+PRESSURE_VENOUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1980]
-HD_Blood_Pump_Occlusion
-U32=Reset
-U32=counts
+OCCLUSION_BLOOD_PUMP_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1A80]
-HD_Blood_Pump_Rotor_Count
-U32=Reset
-U32=counts
+BLOOD_ROTOR_COUNT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1B80]
-HD_Arterial_Pressure_Offset_Request
-U32=Reset
-F32=offset
+AIR_PUMP_SET
+U32=payLoad
 
 [0x1C80]
-HD_Pressure_Occlusion_Interval
-U32=Reset
-U32=ms
+PRES_OCCL_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1D80]
-HD_Set_RTC_Date_Time
-U32=Time_Stamp_in_epoch
+SET_RTC_DATE_TIME
+U32=years
 
 [0x1E80]
-HD_Dial_Outlet_Pump_Broadcast_Interval
-U32=Reset
-U32=ms
+DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1F80]
-HD_UF_Ref_Volume
-U32=Reset
-F32=mL
+DIAL_OUT_UF_REF_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2080]
-HD_UF_Measured_Volume
-U32=Reset
-F32=mL
+DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2180]
-HD_Dial_Outlet_Pump_Meas_MC_Spd
-U32=Reset
-F32=RPM
+DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2280]
-HD_Dial_Outlet_Pump_Meas_MC_Current
-U32=Reset
-F32=mA
+DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2380]
-HD_Dial_Outlet_Pump_Meas_Spd
-U32=Reset
-F32=RPM
+DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2480]
-HD_Dial_Outlet_Pump_Rotor_Spd
-U32=Reset
-F32=RPM
+DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2580]
-HD_Dial_Outlet_Load_Cell
-U32=Reset
-F32=Grams
-U32=Sensor
+DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2680]
-HD_Safety_Shutdown
-U32=Reset
-U32=Activate
+SAFETY_SHUTDOWN_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2780]
-HD_Accelerometer_Axis
-U32=Reset
-F32=g
-U32=Axis
+ACCEL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2880]
-HD_Accelerometer_Max_Axis
-U32=Reset
-F32=g
-U32=Axis
+ACCEL_MAX_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2980]
-HD_Accelerometer_Broadcast_Interval
-U32=Reset
-U32=ms
+ACCEL_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2A80]
-HD_Syringe_Pump_Broadcast_Interval
-U32=Reset
-U32=ms
+SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2B80]
-HD_Syringe_Pump_Operation_Request
-U32=Operation
-F32=Rate
-F32=Volume
+SYRINGE_PUMP_OPERATION
+U32=syringePumpOp
+F32=rate
+F32=volume
 
 [0x2C80]
-HD_Syringe_Pump_Measured_Rate
-U32=Reset
-F32=Rate
+SYRINGE_PUMP_MEASURED_RATE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
-# We use one cmd for all the different data types when setting treatment parameters
-# and we cant "overload". S32 covers most but not all (U32 parameters are small). F32 data types will be malformed
-# in the log file.
 [0x2D80]
-HD_Set_Treatment_Parameter
-U32=Reset
-S32=value
-U32=Parameter
+SET_PARAMETER_TREATMENT_PARAMETER
+U32==uIntORS32==sIntORF32==sFlt
 
 [0x2E80]
-HD_Home_Valve
-U32=Reset
-U32=Valve
+VALVES_HOME
+U32=valve
 
 [0x2F80]
-HD_Set_Valve
-U32=Reset
-U32=Position
-U32=Valve
+VALVES_POSITION_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x3080]
-HD_Set_Air_Trap_Position
-U32=Reset
-U32=Position
+VALVES_SET_AIR_TRAP_VALVE
+U32=valveState
 
 [0x3180]
-HD_Set_Valve_PWM
-U32=Reset
+VALVES_SET_PWM_OVERRIDE
+BOOL=reset
 U32=valve
-U32=PWM
-U32=Direction
+U32=pwm
+U32=direction
 
 [0x3280]
-HD_Air_Trap_Broadcast_Interval
-U32=Reset
-U32=ms
+AIR_TRAP_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x3380]
-HD_Air_Trap_Level_Sensor_Override
-U32=Reset
-U32=Air_liquid
-U32=Level
+AIR_TRAP_LEVEL_SENSOR_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x3480]
-HD_reset_request
+SOFTWARE_RESET
 
 [0x3580]
-HD_Get_Software_Config
-U32=Reset_Maybe
-U32=TBD
+GET_SW_CONFIG_RECORD
 
 [0x3680]
-HD_Set_Software_Config
-U32=Reset_Maybe
-U32=TBD
+SET_SW_CONFIG_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x3780]
-HD_Blood_Pump_Home
+BLOOD_PUMP_HOME
 
 [0x3880]
-HD_Dial_Inlet_Pump_Home
+DIAL_IN_PUMP_HOME
 
 [0x3980]
-HD_Dial_Outlet_Home
+DIAL_OUT_PUMP_HOME
 
 [0x3A80]
-HD_Clear_All_Alarms
-U32=Key
+SUPER_CLEAR_ALARMS
+U32=key
 
 [0x3B80]
-HD_Syringe_Pump_Measured_Force
-U32=Reset
-F32=Volts
+SYRINGE_PUMP_MEASURED_FORCE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x3C80]
-HD_Syringe_Pump_Measured_Detect
-U32=Reset
-F32=Volts
+SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x3D80]
-HD_Set_HD_Calibration_Record
+SET_CALIBRATION_RECORD
 
 [0x3E80]
-HD_Get_HD_Calibration_Record
+GET_CALIBRATION_RECORD
 
 [0x3F80]
-HD_Send_HD_Calibration_Record
+SEND_CALIBRATION_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=calRcrdAddress
 
 [0x4080]
-HD_Set_HD_System_Record
+SET_SYSTEM_RECORD
 
 [0x4180]
-HD_Get_HD_System_Record
+GET_SYSTEM_RECORD
 
 [0x4280]
-HD_Send_HD_System_Record
+SEND_SYSTEM_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=sysRcrdAddress
 
 [0x4380]
-HD_Get_Service_Record
+GET_SERVICE_RECORD
 
 [0x4480]
-HD_Set_System_Record
+SET_SERVICE_RECORD
 
 [0x4580]
-HD_Send_System_Record
+SEND_SERVICE_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=srvcRcrdAddress
 
 [0x4680]
-HD_HD_Operation_Mode
-U32=Mode
+SET_OP_MODE
+U32=mode
 
 [0x4780]
-HD_HD_Fluid_Leak_State
+FLD_LEAK_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x4880]
-HD_HD_Blood_Leak_State
+FLD_LEAK__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x4980]
-HD_Syringe_Pump_Measured_Home
-U32=Reset
-F32=Volts
+SYRINGE_PUMP_MEASURED_HOME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x4A80]
-HD_Syringe_Pump_Measured_Position
-U32=Reset
-S32=Position
+SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x4B80]
-HD_Syringe_Pump_Measured_Volume
-U32=Reset
-F32=mL
+SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
+[0x4C80]
+BLOOD_LEAK__SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x4D80]
+BLOOD_LEAK_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x4E80]
+BLOOD_LEAK_ZERO
+
 [0x5080]
-HD_Voltages_Broadcast_Interval
-U32=Reset
-U32=ms
+MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5180]
-HD_Voltage_Request
-U32=Reset
-F32=V
-U32=signal_ID
+MONITORED_VOLTAGES_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x5280]
-HD_Alarm_Info_Broadcast_Interval
-U32=Reset
-U32=ms
+ALARM_INFO_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5380]
-HD_Alarm_Audio_Volume
-U32=Reset
-U32=Volume
+ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5480]
-HD_Alarm_Audio_Current_HG
-U32=Reset
-F32=mA
+ALARM_AUDIO_CURRENT_HG_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5580]
-HD_Alarm_Audio_Current_LG
-U32=Reset
-F32=mA
+ALARM_AUDIO_CURRENT_LG_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5680]
-HD_Alarm_Audio_Backup_Current
-U32=Reset
-F32=mA
+ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5780]
-HD_Valves_Current
-U32=Reset
-U32=Valve
-F32=mA
+VALVES_CURRENT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x5880]
-HD_Valves_Position
-U32=Reset
-U32=Valve
-U32=Position
+VALVES_POSITION_COUNT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x5980]
-HD_Syringe_Pump_Status
-U32=Reset
-U32=Status
+SYRINGE_PUMP_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5A80]
-HD_Syringe_Pump_Encoder_Status
-U32=Reset
-U32=Status
+SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5B80]
-HD_Syringe_Pump_ADC_DAC_Status
-U32=Reset
-U32=Status
+SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5C80]
-HD_Syringe_Pump_ADC_Read_Counter
-U32=Reset
-U32=Counter
+SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5D80]
-HD_Air_Bubble_Broadcast_Interval
-U32=Reset
-U32=ms
+BUBBLES__SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x5E80]
-HD_Air_Bubble_Sensor
-U32=Reset
-U32=Status
+BUBBLE_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x5F80]
-HD_Blood_Prime_Volume
-U32=Reset
-U32=Volume
+BLOOD_PRIME_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6080]
-HD_Bubble_Sensor_Self_Test_Request
-U32=Reset
-U32=Value
+BUBBLE_SELF_TEST
+U32=payload
 
 [0x6180]
-HD_Fan_RPM_Alarm_Start_Time
-U32=Reset
-U32=Seconds
+AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6280]
-HD_Switch_Status
-U32=Reset
-U32=Status
+SWITCHES_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x6380]
-HD_Switch_Broadcast_Interval
-U32=Reset
-U32=ms
+SWITCHES_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
-# Currently not implemented but in message list.
 [0x6480]
-HD_Battery_Remaining
-U32=Reset
-U32=value
+BATTERY_REMAINING_CAP_MWH_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6580]
-HD_Temperatures
-U32=Reset
-U32=Sensor
-F32=Temp
+TEMPERATURES_VALUE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x6680]
-HD_Temperatures_Broadcast_Interval
-U32=Reset
-U32=m2
+TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6780]
-HD_Fans_Broadcast_Interval
-U32=Reset
-U32=ms
+FANS_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6880]
-HD_Fans_RPM
-U32=Reset
-U32=FanID
-F32=RPM
+FANS_RPM_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x6980]
-HD_Rinseback_Volume
-U32=Reset
-F32=Volume
+RINSEBACK_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6A80]
-HD_Send_SW_Config_Record
-U32=Reset
-F32=TBD
+SEND_SW_CONFIG_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=swRcrdAddress
 
 [0x6B80]
-HD_Send_SW_Config_Record
-U32=Reset
-F32=TBD
+ALARM_STATUS_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6C80]
-HD_Treatment_Time_Broadcast_Interval
-U32=Reset
-U32=ms
+TREATMENT_TIME__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6D80]
-HD_Treatment_Ranges_Broadcast_Interval
-U32=Reset
-U32=ms
+TREATMENT_RANGES_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6E80]
-HD_Treatment_Stop_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+TREATMENT_STOP__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x6F80]
-HD_Blood_Prime_Broadcast_Interval
-U32=Reset
-U32=ms
+BLOOD_PRIME__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7080]
-HD_Rinseback_Broadcast_Interval
-U32=Reset
-U32=ms
+RINSEBACK__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7180]
-HD_Standby_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+STANDBY__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7280]
-HD_Operation_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+OP_MODE__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7380]
-HD_Pre_Treatment_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+PRE_TREATMENT__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7480]
-HD_Treatment_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+TREATMENT__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7580]
-HD_Post_Treatment_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+POST_TREATMENT__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7680]
-HD_Message_Block
-U16=Msg_Id_1
-U16=Msg_Id_2
-U16=Msg_Id_3
-U16=Msg_Id_4
-U16=Msg_Id_5
-U16=Msg_Id_6
-U16=Msg_Id_7
-U16=Msg_Id_8
+BLOCK_MESSAGE_TRANSMISSION
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
 
 [0x7780]
-HD_Syringe_Pump_DAC_Calibrate_Force_Sensor
-F32=Volts
+SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE
 
 [0x7880]
-HD_Stop_RTC_Clock
+STOP_RTC_CLOCK
 
 [0x7980]
-HD_Fans_Duty_Cycle
-U32=Reset
-F32=Duty_Cycle
+FANS_DUTY_CYCLE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7A80]
-HD_Syringe_pump_Heparin_Bolus_Target_Rate
-U32=Reset
-F32=Heparin_Rate
+SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x7B80]
-HD_Current_Treatment_Parameters_Request
+REQ_CURRENT_TREATMENT_PARAMETERS
 
 [0x7C80]
-HD_Current_Treatment_Parameters_Response
-U32=Blood_Flow
-U32=Dialysate_Flow
-U32=Duration
-U32=Heparin_Stop_Time
-U32=Saline_Bolus
-U32=Acid_Concentrate
-U32=Bicarbonate_Concentrate
-U32=Dialyzer_Type
-U32=Heparin_Type
-U32=Blood_Pressure_Measure_Interval
-U32=Rinseback_Flow_Rate
-S32=Arterial_Pressure_Limit_Low
-S32=Arterial_Pressure_Limit_High
-S32=Venous_Pressure_Limit_Low
-S32=Venous_Pressure_Limit_High
-F32=Heparin_Dispensing_Rate
-F32=Heparin_Bolus_Volume
-F32=Dialysate_Temperature
-F32=Uf_Volume
+RES_CURRENT_TREATMENT_PARAMETERS
+U32=accepted
+U32=bloodFlowRate_mL_min
+U32=dialysateFlowRate_mL_min
+U32=treatmentDuration_min
+U32=heparinPreStop_min
+U32=salineBolusVolume_mL
+U32=acidConcentrate
+U32=bicarbConcentrate
+U32=dialyzerType
+U32=heparinType
+U32=bloodPressureMeasurementInterval_min
+U32=rinsebackFlowRate_mL_min
+S32=arterialPressureLimitWindow_mmHg
+S32=venousPressureLimitWindow_mmHg
+S32=venousPressureLimitAsymmetric_mmHg
+F32=heparinDispenseRate_mL_hr
+F32=heparinBolusVolume_mL
+F32=dialysateTemperature_degCF32=uFVolume_L
 
-## DG Support Functions
+[0x7D80]
+SET_FANS_RPM_ALARM_START_TIME_OFFSET
+U32=rpmTimeOffset
 
+[0x7E80]
+GET_USAGE_INFO_RECORD
+
+[0x7F80]
+SET_USAGE_INFO_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
+
+[0x8080]
+SEND_USAGE_INFO_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=usageInfoAddress
+
+[0x8180]
+SET_BLOOD_LEAK_2_EMB_MODE
+
+[0x8280]
+SET_BLOOD_LEAK_EMB_MODE_COMMAND
+U08=command
+U16=commandPayload
+
+[0x8380]
+SEND_BLOOD_LEAK_EMB_MODE
+U08=cmd
+U32=responseLen
+U08=response
+
+[0x8480]
+SEND_ALARMS_COMMAND
+
+[0x8580]
+BLOOD_PUMP_SET_PWM
+F32=payLoad
+
+[0x8680]
+DIAL_IN_SET_PWM
+F32=payLoad
+
+[0x8780]
+DIAL_OUT_SET_PWM
+F32=payLoad
+
+[0x8880]
+DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x8980]
+NV_RECORD_CRC_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x8C80]
+BATTERY_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x8D80]
+BATTERY_CHARGER_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x8E80]
+BATTERY_COMM_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x8F80]
+DIAL_IN_PUMP_HARD_STOP
+
+[0x9080]
+DIAL_OUT_PUMP_HARD_STOP
+
+[0x9180]
+BLOOD_PUMP_HARD_STOP
+
+[0x9280]
+CHECK_IN
+
+[0x9380]
+ENABLE_VENOUS_BUBBLE_ALARM_DETECTION
+BOOL=enabled
+
+[0x9480]
+GET_TEST_CONFIGURATION
+
+[0x9580]
+SEND_TEST_CONFIGURATION
+U32=configStatus
+
+[0x9680]
+RESET_ALL_TEST_CONFIGURATIONS
+
+[0x9780]
+SET_TEST_CONFIGURATION
+BOOL=reset
+U32=config
+
+[0x9880]
+SIGNAL_RECOVER_FROM_FAULT_MODE
+
+[0x9980]
+RAM_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x9A80]
+VALVES_S_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x9B80]
+CAN_RECEIVE_ACK_MESSAGE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
 [0x00A0]
-DG_Login
-U32=character
+TESTER_LOGIN
 
 [0x01A0]
-DG_Alarm_State
-U32=Reset
-U32=State
-U32=Alarm_ID
+ALARM__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x02A0]
-DG_Watchdog_Check_In
-U32=Reset
-U32=State
-U32=Task
+WATCOG_TASK_CHECKIN_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x04A0]
-DG_Set_RTC_Date_Time
-U32=Time_Stamp_in_epoch
+SET_RTC_DATE_TIME
 
 [0x05A0]
-DG_Load_Cell
-U32=Reset
-F32=State
-U32=Sensor
+LOAD_CELL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=indexBOOL=flag
 
 [0x06A0]
-DG_Pressure
-U32=Reset
-F32=State
-U32=Sensor
+PRESSURE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x07A0]
-DG_Pressure_Broadcast_Interval
-U32=Reset
-U32=ms
+PRESSURE_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
+[0x08A0]
+COMMUNICATION_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x09A0]
+SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
+F32=primaryTargetTemp
+F32=trimmerTargetTemp
+
 [0x0AA0]
-DG_RO_Pump_Broadcast_Interval
-U32=Reset
-U32=ms
+RO_PUMP_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0BA0]
-DG_Drain_Pump_Set_RPM
-U32=RPM
+DRAIN_PUMP_SET_RPM
+U32=payLoad
 
 [0x0CA0]
-DG_Drain_Pump_Broadcast_Interval
-U32=Reset
-U32=ms
+DRAIN_PUMP_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0DA0]
-DG_Load_Cell_Broadcast_Interval
-U32=Reset
-U32=ms
+LOAD_CELLL_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x0EA0]
-DG_Valve_State
-U32=Reset
-U32=State
-U32=Valve
+VALVE__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x0FA0]
-DG_Valve_Broadcast_Interval
-U32=Reset
-U32=ms
+VALVES_S_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x10A0]
-DG_Temperature_Sensor_Value
-U32=Reset
-F32=Temperature
-U32=Sensor
+TEMPERATURE_SENSORS_VALUE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x11A0]
-DG_Start_Stop_Prim_Heater
-U32=Start_Stop
+START_STOP_PRIMARY_HEATER
+U32=startingHeater
 
 [0x12A0]
-DG_Temperature_Sensor_Broadcast_Interval
-U32=Reset
-U32=ms
+TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x13A0]
-DG_Heaters_Broadcast_Interval
-U32=Reset
-U32=ms
+HEATERS_PUBLISH_INTERVAL_ORVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x14A0]
-DG_Safety_Shutdown
+SAFETY_SHUTDOWN_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x15A0]
-DG_Conductivity_Sensors
-U32=Reset
-F32=Value
-U32=Sensor
+CONDUCTIVITY_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x16A0]
-DG_Conductivity_Broadcast_Interval
-U32=Reset
-U32=ms
+CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x17A0]
-DG_Accelerometer_Axis
-U32=Reset
-F32=Magnitude
-U32=Axis
+ACCEL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x18A0]
-DG_Accelerometer_Max_Axis
-U32=Reset
-F32=Magnitude
-U32=Axis
+ACCEL_MAX_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x19A0]
-DG_Accelerometer_Broadcast_Interval
-U32=Reset
-U32=ms
+ACCEL_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1AA0]
-DG_Voltages_Broadcast_Interval
-U32=Reset
-U32=ms
+MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1BA0]
-DG_Monitored_Voltages
-U32=Reset
-F32=Volts
-U32=Sensor
+MONITORED_VOLTAGES_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x1CA0]
-DG_Outlet_Target_Pressure
-U32=Reset
-F32=Pressure
+DRAIN_PUMP_TARGET_OUTLET_FLOW
+F32=payLoad
 
 [0x1DA0]
-DG_Switches_Status
-U32=Status
+SWITCHES_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x1EA0]
-DG_Switches_Broadcast_Interval
-U32=Reset
-U32=ms
+SWITCHES_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x1FA0]
-DG_Operation_Mode_Broadcast_Interval
-U32=Reset
-U32=ms
+OP_MODE_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x20A0]
-DG_Message_Block
-U16=Msg_Id_1
-U16=Msg_Id_2
-U16=Msg_Id_3
-U16=Msg_Id_4
-U16=Msg_Id_5
-U16=Msg_Id_6
-U16=Msg_Id_7
-U16=Msg_Id_8
+BLOCK_MESSAGE_TRANSMISSION
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
+U16=blockedMessages
 
 [0x21A0]
-DG_Heat_Disinfect_Broadcast_Interval
-U32=Reset
-U32=ms
+MEASURED_FLOW_SENSORS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=indexBOOL=flag
 
 [0x22A0]
-DG_Reset_Request
+SOFTWARE_RESET
 
 [0x23A0]
-DG_Concentrate_Pump_Meas_Spd
-U32=Reset
-F32=Speed
-U32=Pump_ID
+CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x24A0]
-DG_Concentrate_Pump_Target_Spd
-U32=Reset
-F32=Speed
-U32=Pump_ID
+CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x25A0]
-DG_UV_Reactors_Broadcast_Interval
-U32=Reset
-U32=ms
+UV_REACTORS__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x26A0]
-DG_Concentrate_Pump_State_Change
-U32=On_Off
+CONCENTRATE_PUMP__CHANGE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x27A0]
-DG_Concentrate_Pump_Broadcast_Interval
-U32=Reset
-U32=ms
+CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x28A0]
-DG_UV_Reactor_Start_Stop
-U32=Start_Stop
-U32=Reactor
+START_STOP_UV_REACTORS
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2AA0]
-DG_Fans_Data_Broadcast_Interval
-U32=Reset
-U32=ms
+FANS__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2CA0]
-DG_UV_Reactors_Health
-U32=Reset
-U32=Health
+UV_REACTORS_HEALTH_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2DA0]
-DG_Thermistors_Broadcast_Interval
-U32=Reset
-U32=ms
+THERMISTORS__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x2EA0]
-DG_Thermistors_Value
-U32=Reset
-U32=Sensor
-F32=Temperature
+THERMISTORS_VALUE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x2FA0]
-DG_RO_Pump_Duty_Cycle
-U32=Reset
-F32=Duty_Cycle
+RO_PUMP_DUTY_CYCLE_OVERRIDE
+F32=payLoad
 
 [0x30A0]
-DG_RO_Meas_Flow_Rate
-U32=Reset
-F32=Lpm
+VALVES_SENSED__OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x31A0]
-DG_RO_Target_Flow_Rate
-U32=Reset
-F32=Lpm
+SET_RO_PUMP_TARGET_FLOW
+F32=payload
 
 [0x32A0]
-DG_RO_Target_Pressure
-U32=Reset
-F32=Lpm
+RO_PUMP_TARGET_PRESSURE_OVERRIDE
+U32=payload
 
-# TBD on how calibration will be logged.
 [0x33A0]
-DG_Set_Calibration_Record
+SET_CALIBRATION_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x34A0]
-DG_Get_Calibration_Record
+GET_CALIBRATION_RECORD
 
 [0x35A0]
-DG_Send_Calibration_Record
+SEND_CALIBRATION_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=calRcrdAddress
 
 [0x36A0]
-DG_Set_System_Record
+SET_SYSTEM_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x37A0]
-DG_Get_System_Record
+GET_SYSTEM_RECORD
 
 [0x38A0]
-DG_Send_System_Record
+SEND_SYSTEM_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=sysRcrdAddress
 
 [0x39A0]
-DG_Set_Service_Record
+GET_SERVICE_RECORD
 
 [0x3AA0]
-DG_Get_Service_Record
+SET_SERVICE_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x3BA0]
-DG_Send_Service_Record
+SEND_SERVICE_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=srvcRcrdAddress
 
-[0x3CA0]
-DG_Get_Scheduled_Runs
-
-[0x3DA0]
-DG_Set_Scheduled_Runs
-
-[0x3EA0]
-DG_Send_Scheduled_Runs
-
 [0x3FA0]
-DG_Fluid_Leak_Broadcast_Interval
-U32=Reset
-U32=ms
+FLD_LEAK_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x40A0]
-DG_Fluid_Leak_Detector
-U32=Reset
-U32=Health
+FLD_LEAK__DETECTOR_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x42A0]
-DG_Filter_Flush_Time_Period
-U32=Reset
-U32=ms
+FILTER_FLUSH_TIME_PERIOD_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x43A0]
-DG_Fans_RPM
-U32=Reset
-U32=Fan_ID
-F32=RPM
+FANS_RPM_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x44A0]
-DG_Flow_Sensor_Broadcast_Interval
-U32=Reset
-U32=ms
+FLOW__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x45A0]
-DG_Stop_RTC_Clock
+STOP_RTC_CLOCK
 
 [0x46A0]
-DG_Flow_Sensor_Broadcast_Interval
-U32=Reset
-U32=RPM
+DRAIN_PUMP_MEASURED_RPM_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
 
 [0x47A0]
-DG_Clear_All_Alarms
+SUPER_CLEAR_ALARMS
+U32=key
 
 [0x48A0]
-DG_Alarm_Info_Broadcast_Interval
-U32=Reset
-U32=ms
+ALARM_INFO_SEND_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
 
 [0x49A0]
-DG_Fans_RPM_Alarm_Time_Offset
-U32=Reset
-U32=Seconds
+START_STOP_TRIMMER_HEATER
+BOOL=startingHeater
 
 [0x4AA0]
-DG_Get_Software_Config
+GET_SW_CONFIG_RECORD
 
 [0x4BA0]
-DG_Set_Software_Config
+SET_SW_CONFIG_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x4CA0]
-DG_Send_Software_Config
+SEND_SW_CONFIG_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=swRcrdAddress
 
 [0x4DA0]
-DG_Fans_Duty_Cycle
-U32=Reset
-F32=Duty_Cycle
+FANS_DUTY_CYCLE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x4EA0]
+USED_ACID_VOLUME_ML_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x4FA0]
+SET_FANS_RPM_ALARM_START_TIME_OFFSET
+U32=rpmTimeOffset
+
+[0x50A0]
+USED_BICARB_VOLUME_ML_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x51A0]
+FILL_MODE__PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x52A0]
+GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x53A0]
+GET_USAGE_INFO_RECORD
+
+[0x54A0]
+SET_USAGE_INFO_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
+
+[0x55A0]
+SEND_USAGE_INFO_RECORD
+U32=payloadCurrNum
+U32=payloadTotalNum
+U32=length
+U08=usageInfoAddress
+
+[0x56A0]
+SET_OP_MODE
+U32=mode
+
+[0x57A0]
+RESERVOIR_TARE
+U32=res
+
+[0x59A0]
+DRAIN_PUMP_CURRENT_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x5AA0]
+DRAIN_PUMP_DIRECTION_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x5BA0]
+RO_FEEDBACK_VOLTAGE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x5CA0]
+DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x5DA0]
+NV_RECORD_CRC_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x5EA0]
+CONC_PUMP_PARK_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x5FA0]
+CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x60A0]
+CONC_PUMP_PARK_COMMAND
+U32=pumpIdx
+
+[0x61A0]
+HEATERS_DUTY_CYCLE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x64A0]
+NELSON_DISINFECT_SUPPORT
+U32=payload
+
+[0x65A0]
+SET_DIALYSATE_MIXING_RATIOS
+F32=acidMixingRatio
+F32=bicarbMixingRatio
+
+[0x66A0]
+SET_TEST_CONFIGURATION
+BOOL=reset
+U32=config
+
+[0x67A0]
+GET_TEST_CONFIGURATION
+
+[0x68A0]
+SEND_TEST_CONFIGURATION
+U32=configStatus
+
+[0x69A0]
+RESET_ALL_TEST_CONFIGURATIONS
+
+[0x6AA0]
+CHECK_IN
+
+[0x6BA0]
+GET_LOAD_CELLS_TARE_VALUES
+
+[0x6CA0]
+SET_LOAD_CELLS_TARE_VALUES
+F32=payload
+F32=payload
+F32=payload
+F32=payload
+
+[0x6DA0]
+SEND_LOAD_CELLS_TARE_VALUES
+
+[0x6EA0]
+SET_COND_SENSOR_CAL_TABLE
+U32=sensorId
+U32=calTableId
+
+[0x6FA0]
+SIGNAL_RECOVER_FROM_FAULT_MODE
+
+[0x70A0]
+DRAIN_MODE__INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x71A0]
+RO_ONLY_MODE_STATUS
+
+[0x72A0]
+RAM_STATUS_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+U32=index
+
+[0x73A0]
+CAN_RECEIVE_ACK_MESSAGE_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0x74A0]
+RESERVOIR__INTERVAL_OVERRIDE
+BOOL=reset
+U32=u32ORF32=f32
+
+[0xFFFF]
+ACK_MESSAGE_THAT_REQRES_ACK
+