Index: MsgDefs.h
===================================================================
diff -u -radfe554587fd91903cfed42a85ec7c8553814166 -rcc2feba726778c1bb89b70956a11832e7158af1c
--- MsgDefs.h	(.../MsgDefs.h)	(revision adfe554587fd91903cfed42a85ec7c8553814166)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision cc2feba726778c1bb89b70956a11832e7158af1c)
@@ -116,7 +116,10 @@
     MSG_ID_TD_BATTERY_DATA = 0x54,                                                  ///< TD Battery broadcast data
     MSG_ID_FP_FILTER_FLUSH_DATA = 0x55,                                             ///< FP Filter Flush broadcast data
     MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56,                                           ///< FP Permeate Flush broadcast data
-    MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57,                                         ///< FP Concentrate Flush broadcast data
+    MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57,                                        ///< FP Concentrate Flush broadcast data
+    MSG_ID_FP_GENP_DEF_DATA = 0x58,
+    MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,
+    MSG_ID_FP_VERSION_RESPONSE = 0x5A,
 
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
@@ -175,6 +178,9 @@
     MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031,                                    ///< TD set operation mode request
     MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST = 0x8032,                             ///< TD set ejector motor speed request
     MSG_ID_TD_EJECTOR_COMMAND = 0x8033,                                             ///< TD ejector command
+    MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8034,                   ///< TD override request for ejector data publish interval
+    MSG_ID_TD_SET_AIR_TRAP_CONTROL = 0x8035,                                        ///< TD set air trap control to start or stop
+    MSG_ID_TD_HOME_BLOOD_PUMP = 0x8036,                                             ///< TD home blood pump request
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                                        ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,                ///< DD tester log-in
@@ -257,10 +263,10 @@
     MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003,                     ///< FP valve data publish interval override request
     MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004,                            ///< FP valve commanded state override request
     MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005,                         ///< FP valve sensed state override request
-    MSG_ID_FP_BOOST_PUMP_SET_PWM_REQUEST = 0xB006,                                  ///< FP set boost pump PWM request
-    MSG_ID_FP_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007,                        ///< FP override request for boost pump read PWM
-    MSG_ID_FP_BOOST_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008,                           ///< FP override request for boost pump speed (RPM)
-    MSG_ID_FP_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009,               ///< FP boost pumps data publish interval override request
+    MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST = 0xB006,                                  ///< FP set boost pump PWM request
+    MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007,                        ///< FP override request for boost pump read PWM
+    MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008,                           ///< FP override request for boost pump speed (RPM)
+    MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009,                   ///< FP boost pumps data publish interval override request
     MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST = 0xB00A,                                   ///< FP override request for pressure (mmHg)
     MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B,                              ///< FP override request for pressure sensor temperature (deg C)
     MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C,                        ///< FP override request for pressure sensor read count
@@ -283,6 +289,15 @@
     MSG_ID_FP_SET_OPERATION_MODE_REQUEST = 0xB01D,                                  ///< FP set operation mode request
     MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E,            ///< FP operation mode publish interval override
     MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F,        ///< FP temperature sensor publish interval override
+    MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB020,
+    MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021,
+    MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022,
+    MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023,
+    MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024,
+    MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025,
+    MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026,
+    MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027,
+    MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028,
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log