Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r32367c8ede080be47d64c8464825259cc0270ba9 -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 32367c8ede080be47d64c8464825259cc0270ba9)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
@@ -1,23 +1,24 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file ConcentratePumps.c
+* @file    ConcentratePumps.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 30-Sep-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      30-Sep-2021
 *
-* @author (original) Quang Nguyen
-* @date (original) 30-Sep-2020
+* @author  (original)  Quang Nguyen
+* @date    (original)  22-Oct-2020
 *
 ***************************************************************************/
 #include <math.h>
 
 #include "ConcentratePumps.h"
 #include "FPGA.h"
+#include "MessageSupport.h"
 #include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -165,11 +166,21 @@
         calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1_ACID, getFPGACP1HallSensePulseWidth() );
         calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2_BICARB, getFPGACP2HallSensePulseWidth() );
 
-        data.cp1CurrentSetSpeed = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
-        data.cp1MeasuredSpeed   = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
-        data.cp2CurrentSetSpeed = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
-        data.cp2MeasuredSpeed   = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
+        // Get CP1 specifications
+        U08 cp1Direction = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].direction;
+        F32 cp1SetSpeed  = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
+        F32 cp1Speed     = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
 
+        // Get CP2 specifications
+        U08 cp2Direction = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].direction;
+        F32 cp2SetSpeed  = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
+        F32 cp2Speed     = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
+
+        data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0 : cp1SetSpeed );
+        data.cp1MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1Speed * -1.0 : cp1Speed );
+        data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
+        data.cp2MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2Speed * -1.0 : cp2Speed );
+
 #ifndef DISABLE_DIALYSATE_CHECK
         F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) - concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
         F32 const cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) - concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
@@ -179,7 +190,7 @@
 #endif
 
         concentratePumpMonitorTimerCounter = 0U;
-        broadcastConcentratePumpData( &data );
+        broadcastData( MSG_ID_DG_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) );
     }
 }