Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 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 ROPump.c
- *
- *  @date 03-Apr-2020
- *  @author S. Nash
- *
- *  @brief Monitor/Controller for RO pump.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 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 ROPump.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
+*
+* @author (original) Sean
+* @date (original) 04-Apr-2020
+*
+***************************************************************************/
 
 #ifndef _VECTORCAST_
     #include <math.h>
@@ -96,7 +97,7 @@
 static PUMP_CONTROL_MODE_T roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;    ///< requested RO pump control mode.
 static PUMP_CONTROL_MODE_T roPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP; ///< currently set RO pump control mode.
 
-static OVERRIDE_U32_T roPumpDataPublishInterval = { 0, 0, 0, 0 };                ///< interval (in ms) at which to publish RO flow data to CAN bus.
+static OVERRIDE_U32_T roPumpDataPublishInterval = { RO_PUMP_DATA_PUB_INTERVAL, RO_PUMP_DATA_PUB_INTERVAL, 0, 0 };   ///< interval (in ms) at which to publish RO flow data to CAN bus.
 static OVERRIDE_U32_T targetROPumpPressure = { 0, 0, 0, 0 };                     ///< Target RO pressure (in PSI).
 static OVERRIDE_F32_T measuredROFlowRateLPM = { 0.0, 0.0, 0.0, 0 };              ///< measured RO flow rate (in LPM).
 static F32 measuredROPumpPressure = 0.0;                                         ///< measured RO pressure (in PSI).
@@ -167,7 +168,7 @@
     }
     else  // requested pressure out of range
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, roPressure )     // TODO - replace 1st param with s/w fault enum
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, roPressure )     // TODO - replace 1st param with s/w fault enum
     }
 
     return result;
@@ -254,7 +255,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, roPumpState )  // TODO - replace 1st param with s/w fault enum
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, roPumpState )  // TODO - replace 1st param with s/w fault enum
             roPumpState = RO_PUMP_OFF_STATE;
             break;
     }