Index: NVDataMgmt.c
===================================================================
diff -u -r77b29084a85f241dd6c83ef838e076bac666b11c -r286aaa14b375a41f915c2bed8b63c41567bb8ac3
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 77b29084a85f241dd6c83ef838e076bac666b11c)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 286aaa14b375a41f915c2bed8b63c41567bb8ac3)
@@ -2764,7 +2764,7 @@
         // CRC did not pass so set all values to default
         dgServiceGroup.dgServiceRecord.lastServiceEpochDate   = 0;
         dgServiceGroup.dgServiceRecord.serviceIntervalSeconds = RECORD_DEFAULT_SERVICE_INTERVAL_S;
-        dgServiceGroup.dgServiceRecord.lastResetTimeEpoch     = getRTCTimestamp(); // TODO un-comment with the next calibration table roll out
+        dgServiceGroup.dgServiceRecord.lastResetTimeEpoch     = getRTCTimestamp();
         dgServiceGroup.dgServiceRecord.crc                    = crc16 ( (U08*)&dgServiceGroup.dgServiceRecord, sizeof( DG_SERVICE_RECORD_T ) - sizeof( U16 ) );
         dgServiceGroup.crc                                    = crc16 ( (U08*)&dgServiceGroup, sizeof( DG_SERVICE_GROUP_T ) - sizeof( U16 ) );
         status                                                = FALSE;
@@ -2795,8 +2795,8 @@
         dgUsageInfoGroup.dgUsageInfo.isDisinfected               = FALSE;
         dgUsageInfoGroup.dgUsageInfo.lastChemicalDisDateEpoch    = 0;
         dgUsageInfoGroup.dgUsageInfo.lastHeatDisDateEpoch        = 0;
-        dgUsageInfoGroup.dgUsageInfo.roWaterGenSinceLastServiceL = 0.0;
-        dgUsageInfoGroup.dgUsageInfo.roWaterGenTotalL            = 0.0;
+        dgUsageInfoGroup.dgUsageInfo.roWaterGenSinceLastServiceL = 0.0F;
+        dgUsageInfoGroup.dgUsageInfo.roWaterGenTotalL            = 0.0F;
         dgUsageInfoGroup.dgUsageInfo.lastResetTimeEpoch          = getRTCTimestamp();
         dgUsageInfoGroup.dgUsageInfo.crc                         = crc16( (U08*)&dgUsageInfoGroup.dgUsageInfo, sizeof( DG_USAGE_INFO_RECORD_T ) - sizeof( U16 ) );
         dgUsageInfoGroup.crc                                     = crc16( (U08*)&dgUsageInfoGroup, sizeof( DG_USAGE_INFO_GROUP_T ) - sizeof( U16 ) );
@@ -3469,8 +3469,8 @@
  * @brief
  * The isHDUsageRecordValid function checks whether the HD usage information
  * is valid or not.
- * @details Inputs: dgUsageInfoGroup
- * @details Outputs: dgUsageInfoGroup
+ * @details Inputs: hdUsageInfoGroup
+ * @details Outputs: hdUsageInfoGroup
  * @return TRUE if the DG usage record is valid otherwise FALSE
  *************************************************************************/
 static BOOL isHDUsageRecordValid( void )