Index: MsgDefs.h
===================================================================
diff -u -r47eb8eba1938bc41af97255ba88b78aa607d5862 -r80795d4b9cca413fa4fb4d3d2971e3e682d662cd
--- MsgDefs.h	(.../MsgDefs.h)	(revision 47eb8eba1938bc41af97255ba88b78aa607d5862)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 80795d4b9cca413fa4fb4d3d2971e3e682d662cd)
@@ -109,19 +109,21 @@
     MSG_ID_FP_PRE_GEN_WATER_MODE_DATA = 0x4D,                                       ///< FP Pre Generate water mode data.
     MSG_ID_TD_EJECTOR_DATA = 0x4E,                                                  ///< TD ejector data broadcast
     MSG_ID_TD_TREATMENT_SET_POINTS = 0x4F,                                          ///< TD treatment user set points.
-    MSG_ID_FP_BOOST_PUMP_DATA = 0x50,                                               ///< FP broadcast P40 pump data.
-    MSG_ID_TD_SERIAL_RESPONSE = 0x51,                                               ///< TD response to UI serial request.
-    MSG_ID_DD_SERIAL_RESPONSE = 0x52,                                               ///< DD response to UI serial request.
-    MSG_ID_TD_TEMPERATURE_DATA = 0x53,                                              ///< TD Temperature broadcast data.
-    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_GENP_DEF_DATA = 0x58,
-    MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,
-    MSG_ID_FP_VERSION_RESPONSE = 0x5A,
+    MSG_ID_FP_BOOST_PUMP_DATA = 0x50,                                               ///< FP broadcast P40 pump data
+    MSG_ID_TD_SERIAL_RESPONSE = 0x51,                                               ///< TD response to UI serial request
+    MSG_ID_DD_SERIAL_RESPONSE = 0x52,                                               ///< DD response to UI serial request
+    MSG_ID_TD_TEMPERATURE_DATA = 0x53,                                              ///< TD Temperature broadcast data
+    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_GENP_DEF_DATA = 0x58,                                                 ///< FP Generate Permeate Defeatured broadcast data
+    MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,                                              ///< FP Pre Generate Permeate Defeatured broadcast data
+    MSG_ID_FP_VERSION_RESPONSE = 0x5A,                                              ///< FP FW Version response
     MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B,                                   ///< TD treatment paused timer data.
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
+    MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
+
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
@@ -267,10 +269,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
@@ -293,6 +295,19 @@
     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,                    ///< FP RO Pump Target Pressure override request
+    MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021,                        ///< FP RO Pump Target Flow override request
+    MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022,                         ///< FP RO Pump Target PWM override request
+    MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023,                ///< FP Boost Pump Target data publish interval override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024,                 ///< FP Boost Pump Target Pressure override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025,                     ///< FP Boost Pump Target Flow override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026,                      ///< FP RO Pump Target PWM override request
+    MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027,                                     ///< FP Boost Pump Stop request
+    MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028,                                        ///< FP RO Pump Stop request
+    MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xB029,                            ///< FP Safety Shutdown override request
+    MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A,             ///< FP Permeate Tank data publish interval override request
+    MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B,                                ///< FP Alarm State override request
+    MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C,                              ///< FP alarm clear request
 
     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