Index: Messages/Unhandled.conf
===================================================================
diff -u -r021139c5b83337803078c340a8f6363c5e62616d -r295e4d04ba05a73e14fa6050920ef6b334d0e70e
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 021139c5b83337803078c340a8f6363c5e62616d)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 295e4d04ba05a73e14fa6050920ef6b334d0e70e)
@@ -1163,17 +1163,16 @@
 EVENT
 U32=event
 U32=dataType1
-EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
-U32=dataType2
-EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
+union=EVENT_DATA_U32_T=uIntunion=EVENT_DATA_S32_T=sIntunion=EVENT_DATA_F32_T=fltunion=EVENT_DATA_BOOL_T=blnU32=dataType2
+union=EVENT_DATA_U32_T=uIntunion=EVENT_DATA_S32_T=sIntunion=EVENT_DATA_F32_T=fltunion=EVENT_DATA_BOOL_T=bln
 
 [0xA500]
 EVENT
 U32=e
 U32=dataType1
-EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
+union=EVENT_DATA_U32_T=uIntunion=EVENT_DATA_S32_T=sIntunion=EVENT_DATA_F32_T=fltunion=EVENT_DATA_BOOL_T=bln
 U32=dataType2
-EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
+union=EVENT_DATA_U32_T=uIntunion=EVENT_DATA_S32_T=sIntunion=EVENT_DATA_F32_T=fltunion=EVENT_DATA_BOOL_T=bln
 
 [0xA600]
 SET_SERVICE_TIME
@@ -1413,35 +1412,32 @@
 [0x0280]
 OFF_BUTTON__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0380]
 STOP_BUTTON__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0480]
 ALARM_LAMP_PATTERN_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0580]
 WATCOG_TASK_CHECKIN_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x0680]
 ALARM__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x0780]
 ALARM_TIME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x0880]
 BLOOD_FLOW_SET_PT_OVERRIDE
@@ -1452,22 +1448,22 @@
 [0x0980]
 BLOOD_FLOW_MEAS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0A80]
 BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0B80]
 BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0C80]
 BLOOD_FLOW_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0D80]
 TREATMENT_TIME_REMAINING_OVERRIDE
@@ -1476,12 +1472,12 @@
 [0x0E80]
 BLOOD_PUMP_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0F80]
 BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1080]
 DIAL_IN_FLOW_SET_PT_OVERRIDE
@@ -1492,54 +1488,52 @@
 [0x1180]
 DIAL_IN_FLOW_MEAS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1280]
 DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1380]
 DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1480]
 DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1580]
 DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1680]
 DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1780]
 PRESSURE_ARTERIAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x1880]
 PRESSURE_VENOUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x1980]
 OCCLUSION_BLOOD_PUMP_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1A80]
 BLOOD_ROTOR_COUNT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1B80]
 AIR_PUMP_SET
@@ -1548,7 +1542,7 @@
 [0x1C80]
 PRES_OCCL_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1D80]
 SET_RTC_DATE_TIME
@@ -1557,70 +1551,67 @@
 [0x1E80]
 DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1F80]
 DIAL_OUT_UF_REF_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2080]
 DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2180]
 DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2280]
 DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2380]
 DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2480]
 DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2580]
 DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2680]
 SAFETY_SHUTDOWN_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2780]
 ACCEL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2880]
 ACCEL_MAX_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2980]
 ACCEL_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2A80]
 SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2B80]
 SYRINGE_PUMP_OPERATION
@@ -1631,11 +1622,11 @@
 [0x2C80]
 SYRINGE_PUMP_MEASURED_RATE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2D80]
 SET_PARAMETER_TREATMENT_PARAMETER
-U32==uIntORS32==sIntORF32==sFlt
+union=U32==uIntunion=S32==sIntunion=F32==sFlt
 
 [0x2E80]
 VALVES_HOME
@@ -1644,8 +1635,7 @@
 [0x2F80]
 VALVES_POSITION_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x3080]
 VALVES_SET_AIR_TRAP_VALVE
@@ -1661,13 +1651,12 @@
 [0x3280]
 AIR_TRAP_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x3380]
 AIR_TRAP_LEVEL_SENSOR_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x3480]
 SOFTWARE_RESET
@@ -1697,12 +1686,12 @@
 [0x3B80]
 SYRINGE_PUMP_MEASURED_FORCE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x3C80]
 SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x3D80]
 SET_CALIBRATION_RECORD
@@ -1750,124 +1739,120 @@
 [0x4780]
 FLD_LEAK_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4880]
 FLD_LEAK__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4980]
 SYRINGE_PUMP_MEASURED_HOME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4A80]
 SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4B80]
 SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4C80]
 BLOOD_LEAK__SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4D80]
 BLOOD_LEAK_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4E80]
 BLOOD_LEAK_ZERO
 
 [0x5080]
 MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5180]
 MONITORED_VOLTAGES_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5280]
 ALARM_INFO_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5380]
 ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5480]
 ALARM_AUDIO_CURRENT_HG_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5580]
 ALARM_AUDIO_CURRENT_LG_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5680]
 ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5780]
 VALVES_CURRENT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5880]
 VALVES_POSITION_COUNT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5980]
 SYRINGE_PUMP_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5A80]
 SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5B80]
 SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5C80]
 SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5D80]
 BUBBLES__SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5E80]
 BUBBLE_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5F80]
 BLOOD_PRIME_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6080]
 BUBBLE_SELF_TEST
@@ -1876,50 +1861,47 @@
 [0x6180]
 AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6280]
 SWITCHES_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x6380]
 SWITCHES_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6480]
 BATTERY_REMAINING_CAP_MWH_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6580]
 TEMPERATURES_VALUE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x6680]
 TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6780]
 FANS_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6880]
 FANS_RPM_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x6980]
 RINSEBACK_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6A80]
 SEND_SW_CONFIG_RECORD
@@ -1931,57 +1913,57 @@
 [0x6B80]
 ALARM_STATUS_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6C80]
 TREATMENT_TIME__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6D80]
 TREATMENT_RANGES_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6E80]
 TREATMENT_STOP__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x6F80]
 BLOOD_PRIME__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7080]
 RINSEBACK__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7180]
 STANDBY__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7280]
 OP_MODE__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7380]
 PRE_TREATMENT__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7480]
 TREATMENT__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7580]
 POST_TREATMENT__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7680]
 BLOCK_MESSAGE_TRANSMISSION
@@ -2003,12 +1985,12 @@
 [0x7980]
 FANS_DUTY_CYCLE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7A80]
 SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x7B80]
 REQ_CURRENT_TREATMENT_PARAMETERS
@@ -2086,28 +2068,27 @@
 [0x8880]
 DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x8980]
 NV_RECORD_CRC_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x8C80]
 BATTERY_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x8D80]
 BATTERY_CHARGER_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x8E80]
 BATTERY_COMM_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x8F80]
 DIAL_IN_PUMP_HARD_STOP
@@ -2146,58 +2127,53 @@
 [0x9980]
 RAM_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x9A80]
 VALVES_S_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x9B80]
 CAN_RECEIVE_ACK_MESSAGE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x00A0]
 TESTER_LOGIN
 
 [0x01A0]
 ALARM__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x02A0]
 WATCOG_TASK_CHECKIN_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x04A0]
 SET_RTC_DATE_TIME
 
 [0x05A0]
 LOAD_CELL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=indexBOOL=flag
+union=U32=u32union=F32=f32U32=indexBOOL=flag
 
 [0x06A0]
 PRESSURE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x07A0]
 PRESSURE_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x08A0]
 COMMUNICATION_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x09A0]
 SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
@@ -2207,7 +2183,7 @@
 [0x0AA0]
 RO_PUMP_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0BA0]
 DRAIN_PUMP_SET_RPM
@@ -2216,29 +2192,27 @@
 [0x0CA0]
 DRAIN_PUMP_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0DA0]
 LOAD_CELLL_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x0EA0]
 VALVE__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x0FA0]
 VALVES_S_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x10A0]
 TEMPERATURE_SENSORS_VALUE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x11A0]
 START_STOP_PRIMARY_HEATER
@@ -2247,56 +2221,52 @@
 [0x12A0]
 TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x13A0]
 HEATERS_PUBLISH_INTERVAL_ORVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x14A0]
 SAFETY_SHUTDOWN_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x15A0]
 CONDUCTIVITY_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x16A0]
 CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x17A0]
 ACCEL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x18A0]
 ACCEL_MAX_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x19A0]
 ACCEL_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1AA0]
 MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1BA0]
 MONITORED_VOLTAGES_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x1CA0]
 DRAIN_PUMP_TARGET_OUTLET_FLOW
@@ -2305,18 +2275,17 @@
 [0x1DA0]
 SWITCHES_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x1EA0]
 SWITCHES_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x1FA0]
 OP_MODE_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x20A0]
 BLOCK_MESSAGE_TRANSMISSION
@@ -2332,67 +2301,60 @@
 [0x21A0]
 MEASURED_FLOW_SENSORS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=indexBOOL=flag
+union=U32=u32union=F32=f32U32=indexBOOL=flag
 
 [0x22A0]
 SOFTWARE_RESET
 
 [0x23A0]
 CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x24A0]
 CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x25A0]
 UV_REACTORS__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x26A0]
 CONCENTRATE_PUMP__CHANGE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x27A0]
 CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x28A0]
 START_STOP_UV_REACTORS
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2AA0]
 FANS__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2CA0]
 UV_REACTORS_HEALTH_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2DA0]
 THERMISTORS__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x2EA0]
 THERMISTORS_VALUE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x2FA0]
 RO_PUMP_DUTY_CYCLE_OVERRIDE
@@ -2401,8 +2363,7 @@
 [0x30A0]
 VALVES_SENSED__OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x31A0]
 SET_RO_PUMP_TARGET_FLOW
@@ -2463,37 +2424,35 @@
 [0x3FA0]
 FLD_LEAK_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x40A0]
 FLD_LEAK__DETECTOR_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x42A0]
 FILTER_FLUSH_TIME_PERIOD_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x43A0]
 FANS_RPM_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x44A0]
 FLOW__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x45A0]
 STOP_RTC_CLOCK
 
 [0x46A0]
 DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x47A0]
 SUPER_CLEAR_ALARMS
@@ -2502,7 +2461,7 @@
 [0x48A0]
 ALARM_INFO_SEND_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x49A0]
 START_STOP_TRIMMER_HEATER
@@ -2527,12 +2486,12 @@
 [0x4DA0]
 FANS_DUTY_CYCLE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4EA0]
 USED_ACID_VOLUME_ML_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x4FA0]
 SET_FANS_RPM_ALARM_START_TIME_OFFSET
@@ -2541,17 +2500,17 @@
 [0x50A0]
 USED_BICARB_VOLUME_ML_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x51A0]
 FILL_MODE__PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x52A0]
 GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x53A0]
 GET_USAGE_INFO_RECORD
@@ -2580,40 +2539,37 @@
 [0x59A0]
 DRAIN_PUMP_CURRENT_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5AA0]
 DRAIN_PUMP_DIRECTION_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5BA0]
 RO_FEEDBACK_VOLTAGE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5CA0]
 DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x5DA0]
 NV_RECORD_CRC_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5EA0]
 CONC_PUMP_PARK_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x5FA0]
 CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x60A0]
 CONC_PUMP_PARK_COMMAND
@@ -2622,8 +2578,7 @@
 [0x61A0]
 HEATERS_DUTY_CYCLE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x64A0]
 NELSON_DISINFECT_SUPPORT
@@ -2676,36 +2631,35 @@
 [0x70A0]
 DRAIN_MODE__INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x71A0]
 RO_ONLY_MODE_STATUS
 
 [0x72A0]
 RAM_STATUS_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
-U32=index
+union=U32=u32union=F32=f32U32=index
 
 [0x73A0]
 CAN_RECEIVE_ACK_MESSAGE_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x74A0]
 RESERVOIR__INTERVAL_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x75A0]
 TIMER_77C_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0x76A0]
 TIMER_82C_OVERRIDE
 BOOL=reset
-U32=u32ORF32=f32
+union=U32=u32union=F32=f32
 
 [0xFFFF]
 ACK_MESSAGE_THAT_REQRES_ACK