Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r0953a2a6940f9f096fa98cc1e8a5578deab4d8ef -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 0953a2a6940f9f096fa98cc1e8a5578deab4d8ef)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.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 DrainPump.c
- *
- *  @date 07-Apr-2020
- *  @author S. Nash
- *
- *  @brief Monitor/Controller for drain 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 DrainPump.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 22-Jul-2020
+*
+* @author (original) Sean
+* @date (original) 08-Apr-2020
+*
+***************************************************************************/
 
 #ifndef _VECTORCAST_
     #include <math.h>
@@ -39,7 +40,7 @@
 
 // ********** private definitions **********
 
-#define DRAIN_PUMP_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< interval (ms/task time) at which the RO Pump data is published on the CAN bus
+#define DRAIN_PUMP_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< interval (ms/task time) at which the Drain Pump data is published on the CAN bus
 
 #define DRP_CONTROL_INTERVAL                   ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< interval (ms/task time) at which the Drain pump is controlled
 
@@ -83,7 +84,7 @@
 static PUMP_CONTROL_MODE_T drainPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;    ///< requested drain pump control mode.
 static PUMP_CONTROL_MODE_T drainPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP; ///< currently set drain pump control mode.
 
-static OVERRIDE_U32_T drainPumpDataPublishInterval = { 0, 0, 0, 0 };                ///< interval (in ms) at which to publish RO flow data to CAN bus.
+static OVERRIDE_U32_T drainPumpDataPublishInterval = { DRAIN_PUMP_DATA_PUB_INTERVAL, DRAIN_PUMP_DATA_PUB_INTERVAL, 0, 0 };  ///< interval (in ms) at which to publish RO flow data to CAN bus.
 static OVERRIDE_U32_T targetDrainPumpSpeed = { 0, 0, 0, 0 };                        ///< Target RO pressure (in PSI).
 
 static U32 drainControlTimerCounter = 0;                                            ///< determines when to perform control on drain pump
@@ -195,7 +196,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, drainPumpState )  // TODO - replace 1st param with s/w fault enum
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, drainPumpState )  // TODO - replace 1st param with s/w fault enum
             drainPumpState = DRAIN_PUMP_OFF_STATE;
             break;
     }
@@ -495,5 +496,3 @@
 
     return result;
 }
-
-