Index: MsgDefs.h
===================================================================
diff -u -r80e48d5bd23c62e0bc8f00e69fb213ce17f74e0e -r782b7df2c8dc7eb2ac0cb770b9a3baa0b12873b2
--- MsgDefs.h	(.../MsgDefs.h)	(revision 80e48d5bd23c62e0bc8f00e69fb213ce17f74e0e)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 782b7df2c8dc7eb2ac0cb770b9a3baa0b12873b2)
@@ -109,17 +109,17 @@
     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.
 
 #ifdef __PUMPTEST__
@@ -293,15 +293,16 @@
     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_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_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