Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -311,6 +311,7 @@
     return result;
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -204,8 +204,6 @@
     }
 }
 
-// ********** Private functions **********
-
 /*********************************************************************//**
  * @brief
  * The handleDrainPumpOffState function handles the drain pump off state of
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -846,10 +846,12 @@
     }
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetHeatersPublishIntervalOverride function overrides the heaters
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -185,6 +185,7 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetLoadCellOverride function overrides the measured load cell data.
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r117bbf0b189fd61be822f6705002a702490a94ed -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 117bbf0b189fd61be822f6705002a702490a94ed)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -14,7 +14,6 @@
 * @date (original) 04-Apr-2020
 *
 ***************************************************************************/
-#include <math.h>
 
 #include "AlarmMgmt.h"
 #include "FPGA.h"
@@ -40,9 +39,6 @@
 #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_SENSORS_ADC_BITS               12U                                             ///< Pressure sensors ADC bits.
-#define PRESSURE_SENSORS_ADC_MAX_COUNT          ( pow(2, PRESSURE_SENSORS_ADC_BITS) - 1 )       ///< Pressure sensors max ADC count.
-
 #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.
@@ -390,7 +386,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
     U16 const inletPressureADCReading = getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE );
 
-    if ( ( inletPressureADCReading == 0 ) || ( inletPressureADCReading >= PRESSURE_SENSORS_ADC_MAX_COUNT ) )
+    if ( ( inletPressureADCReading == 0 ) || ( inletPressureADCReading >= INT_ADC_FULL_SCALE_BITS ) )
     {
         result = SELF_TEST_STATUS_FAILED;
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRESSURE_SENSOR_FAULT, inletPressureADCReading );
@@ -404,6 +400,7 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetPressuresDataPublishIntervalOverride function overrides the
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -507,6 +507,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r117bbf0b189fd61be822f6705002a702490a94ed -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 117bbf0b189fd61be822f6705002a702490a94ed)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -784,10 +784,12 @@
     }
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetMeasuredTemperatureOverride function sets the override value
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -415,10 +415,12 @@
         valvesStatesPublicationTimerCounter = 0;
     }
 }
+
 
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Drivers/InternalADC.h
===================================================================
diff -u -r2fe8834dda9d8f69068c151ff0474d915eef6eb5 -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision 2fe8834dda9d8f69068c151ff0474d915eef6eb5)
+++ firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -29,6 +29,10 @@
  */
 
 // ********** public definitions **********
+
+#define INT_ADC_BITS_PER_CHANNEL        12                      ///< DG internal ADC bits per channel.
+#define INT_ADC_FULL_SCALE_BITS         4095                    ///< DG internal ADC full scale range.
+#define INT_ADC_REF_V                   3.0                     ///< DG internal ADC reference voltage.
 
 /// Enumeration of DG internal ADC channels.
 typedef enum Int_ADC_Channels
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r99f108ac337a30a2407410ca8be9a990cee9758a -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -286,11 +286,13 @@
     }
     return result;
 }
+
 
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetAlarmStateOverride function overrides the state of the alarm active
Index: firmware/App/Services/MessagePayloads.h
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Services/MessagePayloads.h	(.../MessagePayloads.h)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/MessagePayloads.h	(.../MessagePayloads.h)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -19,10 +19,7 @@
 #define __MESSAGE_PAYLOADS_H__
 
 /**
- *  @defgroup MessagePayloads MessagePayloads
- *  @brief Message payloads service module defines the content for system communication message.
- *
- *  @addtogroup MessagePayloads
+ *  @addtogroup SystemCommMessages
  *  @{
  */
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -342,6 +342,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r99f108ac337a30a2407410ca8be9a990cee9758a -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -1009,6 +1009,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 #ifdef DEBUG_ENABLED
     /*********************************************************************//**
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r99f108ac337a30a2407410ca8be9a990cee9758a -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
@@ -300,6 +300,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief