Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -rc1ef106ed0f97dc998230c6e154aa2362aa476d8 -r28a4756da770f48c81ab421135c2012550705c74
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision c1ef106ed0f97dc998230c6e154aa2362aa476d8)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 28a4756da770f48c81ab421135c2012550705c74)
@@ -33,16 +33,16 @@
 
 // ********** private definitions **********
 
-#define PUMP_PRESSURE_ZERO                      777                                             ///< ADC counts equivalent to 0 PSI for pump in/out pressure sensors.
-#define PUMP_PRESSURE_PSIA_PER_COUNT            0.06434                                         ///< PSIA per ADC count conversion factor for pump in/out pressure sensors.
-#define PUMP_PRESSURE_PSIA_TO_PSI_OFFSET        14.7                                            ///< Subtract this offset to convert PSIA to PSI.
+#define PUMP_PRESSURE_ZERO                          777                                             ///< ADC counts equivalent to 0 PSI for pump in/out pressure sensors.
+#define PUMP_PRESSURE_PSIA_PER_COUNT                0.06434                                         ///< PSIA per ADC count conversion factor for pump in/out pressure sensors.
+#define PUMP_PRESSURE_PSIA_TO_PSI_OFFSET            14.7                                            ///< Subtract this offset to convert PSIA to PSI.
 
-#define PRESSURE_SAMPLES_TO_AVERAGE             (200 / TASK_PRIORITY_INTERVAL)                  ///< Averaging pressure data over the reporting interval.
-#define PRESSURE_AVERAGE_MULTIPLIER             (1.0 / (F32)PRESSURE_SAMPLES_TO_AVERAGE)        ///< Optimization - multiplying is faster than dividing.
+#define PRESSURE_SAMPLES_TO_AVERAGE                 ( 200 / TASK_PRIORITY_INTERVAL )                ///< Averaging pressure data over the reporting interval.
+#define PRESSURE_AVERAGE_MULTIPLIER                 ( 1.0 / (F32)PRESSURE_SAMPLES_TO_AVERAGE )      ///< Optimization - multiplying is faster than dividing.
 
-#define MIN_INLET_WATER_PRESSURE                25                                              ///< Minimum water input pressure.
-#define INLET_WATER_PRESSURE_PERSISTENCE_COUNT  ( 5 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Persistence count for pressure out of range error.
-#define PRESSURES_DATA_PUB_INTERVAL             ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Interval (ms/task time) at which the pressures data is published on the CAN bus.
+#define MIN_INLET_WATER_PRESSURE                    25                                              ///< Minimum water input pressure.
+#define INLET_WATER_PRESSURE_PERSISTENCE_PERIOD     ( 5 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range error.
+#define PRESSURES_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Interval (ms/task time) at which the pressures data is published on the CAN bus.
 
 /// Defined states for the pressures monitor state machine.
 typedef enum PresOccl_States
@@ -88,9 +88,8 @@
 /*********************************************************************//**
  * @brief
  * The initPressures function initializes the Pressures module.
- * @details
- * Inputs : none
- * Outputs : Pressures module initialized.
+ * @details Inputs: none
+ * @details Outputs: Pressures module initialized.
  * @return none
  *************************************************************************/
 void initPressures( void )
@@ -112,18 +111,17 @@
     pressuresDataPublicationTimerCounter = 0;
 
     initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_LOW_PRESSURE, ALARM_ID_INLET_WATER_LOW_PRESSURE,
-                         FALSE, INLET_WATER_PRESSURE_PERSISTENCE_COUNT, INLET_WATER_PRESSURE_PERSISTENCE_COUNT );
+                         FALSE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
     initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_PRESSURE_FAULT, ALARM_ID_INLET_WATER_PRESSURE_FAULT,
-                         FALSE, INLET_WATER_PRESSURE_PERSISTENCE_COUNT, INLET_WATER_PRESSURE_PERSISTENCE_COUNT );
+                         FALSE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
 }
 
 /*********************************************************************//**
  * @brief
  * The execPressures function executes the pressures' monitor state machine
  * and publish pressures' data.
- * @details
- * Inputs : pressuresState
- * Outputs : pressuresState
+ * @details Inputs: pressuresState
+ * @details Outputs: pressuresState
  * @return none
  *************************************************************************/
 void execPressures( void )
@@ -153,9 +151,8 @@
  * @brief
  * The handlePressuresInitState function handles the pressures initialize state
  * of the pressures monitor state machine.
- * @details
- * Inputs : none
- * Outputs : none
+ * @details Inputs: none
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static PRESSURE_STATE_T handlePressuresInitState( void )
@@ -169,9 +166,8 @@
  * @brief
  * The handlePressuresContReadState function handles the continuous read state
  * of the pressures monitor state machine.
- * @details
- * Inputs : pressureFilterCounter
- * Outputs : pressure sensor values updated
+ * @details Inputs: pressureFilterCounter
+ * @details Outputs: pressure sensor values updated
  * @return next state
  *************************************************************************/
 static PRESSURE_STATE_T handlePressuresContReadState( void )
@@ -222,9 +218,8 @@
 /*********************************************************************//**
  * @brief
  * The getPublishPressuresDataInterval function gets the pressure data publish internval.
- * @details
- * Inputs : pressuresDataPublishInterval
- * Outputs : none
+ * @details Inputs: pressuresDataPublishInterval
+ * @details Outputs: none
  * @return the current pressures data publication interval (in task intervals).
  *************************************************************************/
 static U32 getPublishPressuresDataInterval( void )
@@ -243,9 +238,8 @@
  * @brief
  * The checkInletPressure function checks inlet water pressure value
  * and triggers an alarm when pressure value is out of allowed range.
- * @details
- * Inputs : RO pump inlet pressure sensor value
- * Outputs : Triggers low pressure persistent alarm
+ * @details Inputs: RO pump inlet pressure sensor value
+ * @details Outputs: Triggers low pressure persistent alarm
  * @return none
  *************************************************************************/
 void checkInletPressure( void )
@@ -260,9 +254,8 @@
  * @brief
  * The checkInletPressureFault function checks inlet water pressure value
  * and triggers a machine fault when pressure value is out of allowed range.
- * @details
- * Inputs : RO pump inlet pressure sensor value
- * Outputs : Triggers pressure fault persistent alarm
+ * @details Inputs: RO pump inlet pressure sensor value
+ * @details Outputs: Triggers pressure fault persistent alarm
  * @return none
  *************************************************************************/
 void checkInletPressureFault( void )
@@ -276,9 +269,8 @@
 /*********************************************************************//**
  * @brief
  * The getMeasuredArterialPressure function gets the current arterial pressure.
- * @details
- * Inputs : arterialPressure
- * Outputs : none
+ * @details Inputs: arterialPressure
+ * @details Outputs: none
  * @param pressureID pressure sensor ID
  * @return the current arterial pressure (in mmHg).
  *************************************************************************/
@@ -308,9 +300,8 @@
 /*********************************************************************//**
  * @brief
  * The publishPressuresData function publishes DG pressures data at a set interval.
- * @details
- * Inputs : pressuresDataPublicationTimerCounter
- * Outputs : Pressures data are published to CAN bus
+ * @details Inputs: pressuresDataPublicationTimerCounter
+ * @details Outputs: Pressures data are published to CAN bus
  * @return none
  *************************************************************************/
 static void publishPressuresData( void )
@@ -344,9 +335,8 @@
 /*********************************************************************//**
  * @brief
  * The execPressureSelfTest function executes the pressures self-test's state machine.
- * @details
- * Inputs : pressuresSelfTestState
- * Outputs : pressuresSelfTestState
+ * @details Inputs: pressuresSelfTestState
+ * @details Outputs: pressuresSelfTestState
  * @return PressuresSelfTestResult (SELF_TEST_STATUS_T)
  *************************************************************************/
 SELF_TEST_STATUS_T execPressureSelfTest( void )
@@ -380,9 +370,8 @@
  * The handleSelfTestADCCheck function checks whether the ADC reads and
  * report status back. If the reads are above the maximum 12bit ADC count
  * or equals zero, it will throw an alarm.
- * @details
- * Inputs : ADC reading for RO pump inlet pressure sensor
- * Outputs : Performed ADC check self-test.
+ * @details Inputs: ADC reading for RO pump inlet pressure sensor
+ * @details Outputs: Performed ADC check self-test.
  * @return result (SELF_TEST_STATUS_T)
  *************************************************************************/
 static SELF_TEST_STATUS_T handleSelfTestADCCheck( void )
@@ -409,9 +398,8 @@
  * @brief
  * The testSetPressuresDataPublishIntervalOverride function overrides the
  * pressure data publish interval.
- * @details
- * Inputs : none
- * Outputs : pressuresDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: pressuresDataPublishInterval
  * @param value value to override pressure data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -435,9 +423,8 @@
  * @brief
  * The testResetPressuresDataPublishIntervalOverride function resets the override
  * of the pressure and occlusion data publish interval.
- * @details
- * Inputs : none
- * Outputs : pressuresDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: pressuresDataPublishInterval
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetPressuresDataPublishIntervalOverride( void )
@@ -458,8 +445,8 @@
  * @brief
  * The testSetDGPressureSensorOverride function overrides the value of the
  * specified pressure sensor with a given value.
- * Inputs : none
- * Outputs : pressures[]
+ * @details Inputs: none
+ * @details Outputs: pressures[]
  * @param sensor pressure sensor ID
  * @param value override value for pressure data
  * @return TRUE if override successful, FALSE if not
@@ -485,9 +472,8 @@
  * @brief
  * The testResetDGPressureSensorOverride function resets the override of the \n
  * specified DG pressure sensor.
- * @details
- * Inputs : none
- * Outputs : pressures[]
+ * @details Inputs: none
+ * @details Outputs: pressures[]
  * @param sensor pressure sensor ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/