Index: MessagePayloads.h
===================================================================
diff -u -r305aea4109b059859deb457ec4ecb682e28569be -re8b9318e9440d9ec7bb391cae32e54444461b087
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision 305aea4109b059859deb457ec4ecb682e28569be)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision e8b9318e9440d9ec7bb391cae32e54444461b087)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
@@ -53,14 +53,28 @@
 typedef struct
 {
     BOOL start;                                         ///< Flag indicating whether to start pre-gen dialysate(TRUE) or stop (FALSE).
+    F32  dialRate;                                      ///< Set dialysate rate (mL/min).
+    F32  dialTemp;                                      ///< Set dialysate temperature (deg C).
+    U32  acidType;                                      ///< Type of acid being used to make dialysate.
+    U32  bicarbType;                                    ///< Type of bicarb being used to make dialysate.
 } PRE_GEN_DIALYSATE_REQ_PAYLOAD_T;
 
+/// Enumeration of operation modes.  These are in order of priority (highest to lowest).
+enum RO_Cmd_Ids
+{
+    RO_PRE_GEN = 0,                                     ///< Pre Generate permeate water mode
+    RO_GEN_WATER,                                       ///< Generate permeate water mode
+    NUM_OF_RO_CMD                                       ///< Number of RO command IDs
+};
+typedef enum RO_Cmd_Ids RO_CMD_ID;  ///< Type for RO command IDS
+
 /// Payload record structure for requesting RO water.
 typedef struct
 {
+    U32 cmdID;                                          ///< Command id of Water Generation from the DD
     BOOL start;                                         ///< Flag indicating whether to start/continue RO water delivery (TRUE) or stop (FALSE).
     U32  roRate;                                        ///< Set RO water rate (mL/min).
-} RO_WATER_REQ_PAYLOAD_T;
+} FP_WATER_REQ_PAYLOAD_T;
 
 /// Pressure data struct.
 typedef struct