Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,17 +7,15 @@
 *
 * @file ROPump.c
 *
-* @author (last) Sean Nash
-* @date (last) 08-Jul-2020
+* @author (last) Quang Nguyen
+* @date (last) 21-Jul-2020
 *
 * @author (original) Sean
 * @date (original) 04-Apr-2020
 *
 ***************************************************************************/
 
-#ifndef _VECTORCAST_
-    #include <math.h>
-#endif
+#include <math.h>
 
 #include "etpwm.h"
 #include "mibspi.h"
@@ -144,8 +142,8 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure, roPumpPWMDutyCyclePct
- * @param roPressure : new target RO pressure
- * @param mode : new control mode
+ * @param roPressure new target RO pressure
+ * @param mode new control mode
  * @return TRUE if new target pressure is set, FALSE if not
  *************************************************************************/
 BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode )
@@ -168,7 +166,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;
@@ -255,7 +253,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;
     }
@@ -267,7 +265,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return isROPumpOn
  *************************************************************************/
 BOOL isReverseOsmosisPumpOn( void )
@@ -386,7 +383,7 @@
  * @details
  * Inputs : none
  * Outputs : PWM duty cycle zeroed
- * @param newPWM : new duty cycle % to apply to PWM
+ * @param newPWM new duty cycle % to apply to PWM
  * @return none
  *************************************************************************/
 static void setROPumpControlSignalPWM( F32 newPWM )
@@ -511,9 +508,7 @@
     return result;
 }
 
-/**@}*/
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -526,7 +521,7 @@
  * @details
  * Inputs : none
  * Outputs : roPumpDataPublishInterval
- * @param value : override RO pump data publish interval with (in ms)
+ * @param value override RO pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value )
@@ -575,7 +570,7 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure
- * @param value : override target RO pressure (in PSI)
+ * @param value override target RO pressure (in PSI)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetTargetROPumpPressureOverride( U32 value )
@@ -600,7 +595,6 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure
- * @param none
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetTargetROPumpPressureOverride( void )
@@ -626,7 +620,7 @@
  * @details
  * Inputs : none
  * Outputs : measuredROFlowRateLPM
- * @param value : override measured RO pump motor speed (in LPM)
+ * @param value override measured RO pump motor speed (in LPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetMeasuredROFlowRateOverride( F32 value )
@@ -650,7 +644,6 @@
  * @details
  * Inputs : none
  * Outputs : measuredROFlowRateLPM
- * @param none
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredROFlowRateOverride( void )
@@ -666,3 +659,5 @@
 
     return result;
 }
+
+/**@}*/