Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7336ffd91e991f7156b01a7f15ed2afd85b62f80 -rd4e5e5e155cd938823ee8eb8b090355e1fcc37a2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7336ffd91e991f7156b01a7f15ed2afd85b62f80)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d4e5e5e155cd938823ee8eb8b090355e1fcc37a2)
@@ -555,25 +555,18 @@
  * @param measuredCP2Speed measured speed for concentrate pump CP2 using hall sense
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastConcentratePumpData( F32 cp1TgtSpeed, F32 cp1MeasuredSpeed, F32 cp2TgtSpeed, F32 cp2MeasuredSpeed )
+BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr )
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    CONCENTRATE_PUMP_DATA_T payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_CONCENTRATE_PUMP_DATA;
     msg.hdr.payloadLen = sizeof( CONCENTRATE_PUMP_DATA_T );
 
-    payload.cp1TargetSpeed   = cp1TgtSpeed;
-    payload.cp1MeasuredSpeed = cp1MeasuredSpeed;
-    payload.cp2TargetSpeed   = cp2TgtSpeed;
-    payload.cp2MeasuredSpeed = cp2MeasuredSpeed;
+    memcpy( &msg.payload, concentratePumpDataPtr, sizeof( CONCENTRATE_PUMP_DATA_T ) );
 
-    memcpy( payloadPtr, &payload, sizeof( CONCENTRATE_PUMP_DATA_T ) );
-
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
 
@@ -689,26 +682,18 @@
  * @param cpo water outlet conductivity data
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastConductivityData( F32 roRejectionRatio, F32 cpi, F32 cpo, F32 cd1, F32 cd2 )
+BOOL broadcastConductivityData( void * conductivityDataPtr )
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    CONDUCTIVITY_DATA_T payload;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_CONDUCTIVITY_DATA;
     msg.hdr.payloadLen = sizeof( CONDUCTIVITY_DATA_T );
 
-    payload.roRejectionRatio = roRejectionRatio;
-    payload.cpi = cpi;
-    payload.cpo = cpo;
-    payload.cd1 = cd1;
-    payload.cd2 = cd2;
+    memcpy( &msg.payload, conductivityDataPtr, sizeof( CONDUCTIVITY_DATA_T ) );
 
-    memcpy( payloadPtr, &payload, sizeof( CONDUCTIVITY_DATA_T ) );
-
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );