Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r1953056032ff6dd26042e5761453a7a499b09364 -r3f8d037ec63961e553b5ec67553332db829c9dac
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 1953056032ff6dd26042e5761453a7a499b09364)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3f8d037ec63961e553b5ec67553332db829c9dac)
@@ -37,9 +37,7 @@
  */
 
 // ********** private definitions **********
-//Testing
-//#define BAL_CHAMBER_DATA_PUBLISH_INTERVAL           ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
-#define BAL_CHAMBER_DATA_PUBLISH_INTERVAL             ( 50 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
+#define BAL_CHAMBER_DATA_PUBLISH_INTERVAL           ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
 
 /// Payload record structure for balancing chamber switch only request
 typedef struct
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r09583a9e0a51bb47dd04c825cd706f5a3774bded -r3f8d037ec63961e553b5ec67553332db829c9dac
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 09583a9e0a51bb47dd04c825cd706f5a3774bded)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 3f8d037ec63961e553b5ec67553332db829c9dac)
@@ -69,9 +69,7 @@
 /// Volume output per pulse.
 #define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
 
-//Testing
-#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 50 / TASK_GENERAL_INTERVAL )                    ///< Interval (ms/task time) at which the concentrate pump is monitored.
-//#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 1000 / TASK_GENERAL_INTERVAL )                    ///< Interval (ms/task time) at which the concentrate pump is monitored.
+#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 1000 / TASK_GENERAL_INTERVAL )                    ///< Interval (ms/task time) at which the concentrate pump is monitored.
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 100 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is controlled.
 #define CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS      ( 10 * MS_PER_SECOND )                              ///< Concentrate pumps speed out of range timeout in milliseconds.
 
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1953056032ff6dd26042e5761453a7a499b09364 -r3f8d037ec63961e553b5ec67553332db829c9dac
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1953056032ff6dd26042e5761453a7a499b09364)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 3f8d037ec63961e553b5ec67553332db829c9dac)
@@ -36,9 +36,7 @@
 #define ALL_VALVES_DEENERGIZED                          0x0000                                                      ///< 0 in U16 bit field for all valves.
 
 #define MAX_VALVE_STATE_MISMATCH_TIMER_COUNT            (100 / TASK_PRIORITY_INTERVAL )                             ///< Maximum time commanded valves state can fail to match read back valve states in a row.
-//Testing
-//#define VALVES_STATE_PUB_INTERVAL                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                  ///< Interval ( ms / task time) at which valves states are published on CAN bus.
-#define VALVES_STATE_PUB_INTERVAL                       ( 50 / TASK_PRIORITY_INTERVAL )                             ///< Interval ( ms / task time) at which valves states are published on CAN bus.
+#define VALVES_STATE_PUB_INTERVAL                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                  ///< Interval ( ms / task time) at which valves states are published on CAN bus.
 #define DATA_PUBLISH_COUNTER_START_COUNT                50                                                          ///< Data publish counter start count.
 
 /// Payload record structure for valve open/close request
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r3ad99e9b4be7e1da99b1eff9061204bba79b96c8 -r3f8d037ec63961e553b5ec67553332db829c9dac
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 3ad99e9b4be7e1da99b1eff9061204bba79b96c8)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 3f8d037ec63961e553b5ec67553332db829c9dac)
@@ -44,7 +44,7 @@
 //#define __PITEST__              1
 
 //Uncomment below if diener concentrate pump used
-//#define __DIENER_CONC_PUMP__      1
+#define __DIENER_CONC_PUMP__      1
 
 //Uncomment below if beta hardware is used
 //#define __BETA_HW_VER__           1
Index: firmware/App/Monitors/Pressure.c
===================================================================
diff -u -r1953056032ff6dd26042e5761453a7a499b09364 -r3f8d037ec63961e553b5ec67553332db829c9dac
--- firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision 1953056032ff6dd26042e5761453a7a499b09364)
+++ firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision 3f8d037ec63961e553b5ec67553332db829c9dac)
@@ -28,9 +28,7 @@
  */
 
 // ********** private definitions **********
-//TODO : Increasing the publish interval
-//#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 PRESSURES_DATA_PUB_INTERVAL                 ( 50 / TASK_PRIORITY_INTERVAL )                                 ///< Interval (ms/task time) at which the pressures data is published on the CAN bus.
+#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 DATA_PUBLISH_COUNTER_START_COUNT            ( 5 )                                                           ///< Data publish counter start count.
 #define PRESSURE_SAMPLE_FILTER_MS                   ( 50 )                                                          ///< Filter pressure data for given time
 #define PRESSURE_TEMP_SAMPLE_FILTER_MS              ( 50 )