Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -200,7 +200,7 @@
         checkPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
 #endif
 
-        concentratePumpMonitorTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        concentratePumpMonitorTimerCounter = 0;
         broadcastData( MSG_ID_DG_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) );
     }
 }
Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -174,7 +174,7 @@
 
         calcRORejectionRatio();
 
-        conductivityDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        conductivityDataPublicationTimerCounter = 0;
         data.roRejectionRatio                   = roRejectionRatio;
 
         data.cpi = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
Index: firmware/App/Controllers/DialysateFlow.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -178,7 +178,7 @@
         dialysateFlowData.measuredDialysateFlowRate = getMeasuredDialysateFlowRate();
         broadcastData( MSG_ID_DG_DIALYSATE_FLOW_METER_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&dialysateFlowData,
                        sizeof( DIALYSATE_FLOW_METER_DATA_T ) );
-        dialysateFlowDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dialysateFlowDataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -674,7 +674,7 @@
 
         broadcastData( MSG_ID_DRAIN_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&drainPumpData, sizeof( DRAIN_PUMP_DATA_T ) );
 
-        drainPumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        drainPumpDataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r72376b7008cfe0e1a8213b547116561d28acd55a -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 72376b7008cfe0e1a8213b547116561d28acd55a)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -553,7 +553,7 @@
 
         broadcastData( MSG_ID_DG_FANS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&fansData, sizeof( FANS_DATA_T ) );
 
-        fansPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        fansPublishCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -137,7 +137,7 @@
         U32 state = (U32)getFluidLeakState();
 
         broadcastData( MSG_ID_DG_FLUID_LEAK_STATE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&state, sizeof( U32 ) );
-        fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        fluidLeakStatePublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -837,7 +837,7 @@
 
         broadcastData( MSG_ID_DG_HEATERS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( HEATERS_DATA_T ) );
 
-        dataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r2e8f3ec597cde3a18d286e05ea34dddc4f79172a -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 2e8f3ec597cde3a18d286e05ea34dddc4f79172a)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -251,7 +251,7 @@
         // Broadcast small filtered load cell data
         broadcastData( MSG_ID_LOAD_CELL_READINGS, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&loadCellData, sizeof( LOAD_CELL_DATA_T ) );
 
-        loadCellDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        loadCellDataPublicationTimerCounter = 0;
     }
 
     // Monitor the load cells drift
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -363,7 +363,7 @@
 
         broadcastData( MSG_ID_DG_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( PRESSURES_DATA_T ) );
 
-        pressuresDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        pressuresDataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -825,7 +825,7 @@
 
 
         broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
-        roPumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        roPumpDataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -185,7 +185,7 @@
         data.dialysateCap   = (U32)getSwitchStatus( DIALYSATE_CAP );
         data.fluidDoor      = (U32)getSwitchStatus( FLUID_DOOR );
 
-        switchesDataPublicationCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        switchesDataPublicationCounter = 0;
 
         broadcastData( MSG_ID_DG_SWITCHES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( SWITCHES_DATA_T ) );
     }
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -877,7 +877,7 @@
 
         broadcastData( MSG_ID_DG_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
 
-        dataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -340,7 +340,7 @@
         broadcastData( MSG_ID_DG_THERMISTORS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&sensorsData, sizeof( THERMISTORS_DATA_T ) );
 
         // Reset the counter
-        dataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublishCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/UVReactors.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -467,7 +467,7 @@
 
         broadcastData( MSG_ID_DG_UV_REACTORS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&uvReactorsData, sizeof( UV_REACTORS_DATA_T ) );
 
-        dataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublishCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -34,7 +34,7 @@
 
 #define MAX_VALVE_STATE_MISMATCH_COUNT              3                                                               ///< Maximum number of times commanded valves state can fail to match read back valve states in a row.
 
-#define VALVES_STATE_PUB_INTERVAL                   ( 500 / 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.
 
 // ********** private data **********
@@ -430,7 +430,7 @@
         U16 valvesStatus = getFPGAValveStates();
         broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&valvesStatus, sizeof( U16 ) );
 
-        valvesStatesPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        valvesStatesPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -300,7 +300,7 @@
         data.adc24VTrimmerHtr = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_V );
 
         broadcastData( MSG_ID_DG_VOLTAGES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( VOLTAGES_DATA_PAYLOAD_T ) );
-        voltagesDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        voltagesDataPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -381,7 +381,7 @@
 
         broadcastData( MSG_ID_DG_OP_MODE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) );
 
-        dataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublishCounter = 0;
     }
 }
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -276,7 +276,7 @@
         U32 safetyActivated = (U32)isSafetyShutdownActivated();
 
         broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&safetyActivated, sizeof( U32 ) );
-        alarmInfoPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        alarmInfoPublicationTimerCounter = 0;
     }
 }
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -r986abcfcf047822cad1a10c1ee0924a80dd5f512
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
@@ -150,7 +150,7 @@
         data.timereservoirFill          = heatersTempCalc.timeReservoirFillMS;
 
         broadcastData( MSG_ID_DG_RESERVOIRS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( RESERVOIR_DATA_T ) );
-        dataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+        dataPublishCounter = 0;
     }
 }