Index: NVDataMgmt.c =================================================================== diff -u -r4ddbc7461f66587f1669f69662274f3c8e16cc8e -r3c3b238b87ca93dfe2d456c1a15be92f67beb349 --- NVDataMgmt.c (.../NVDataMgmt.c) (revision 4ddbc7461f66587f1669f69662274f3c8e16cc8e) +++ NVDataMgmt.c (.../NVDataMgmt.c) (revision 3c3b238b87ca93dfe2d456c1a15be92f67beb349) @@ -1619,8 +1619,7 @@ if ( FALSE == hasUsageRecordPassed ) { - // TODO un-comment in DEN-13834 - //enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD ); + enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD ); } // Check if the records' entire CRCs as well as the individual CRCs passed @@ -2767,8 +2766,8 @@ static BOOL isDGUsageRecordValid( void ) { BOOL status = TRUE; - U16 calcCRC = crc16( (U08*)&dgUsageInfoGroup, sizeof( DG_USAGE_INFO_GROUP_T ) - sizeof( U16 ) ); - U16 recordCRC = dgUsageInfoGroup.crc; + U16 calcCRC = crc16( (U08*)&dgUsageInfoGroup, sizeof( DG_USAGE_INFO_RECORD_T ) - sizeof( U16 ) ); + U16 recordCRC = dgUsageInfoGroup.dgUsageInfo.crc; if ( calcCRC != recordCRC ) { @@ -2778,7 +2777,7 @@ dgUsageInfoGroup.dgUsageInfo.roWaterGenSinceLastServiceL = 0.0; dgUsageInfoGroup.dgUsageInfo.roWaterGenTotalL = 0.0; dgUsageInfoGroup.dgUsageInfo.lastResetTimeEpoch = getRTCTimestamp(); - dgUsageInfoGroup.dgUsageInfo.crc = crc16( (U08*)&dgUsageInfoGroup, sizeof( DG_USAGE_INFO_GROUP_T ) - sizeof( U16 ) ); + dgUsageInfoGroup.dgUsageInfo.crc = crc16( (U08*)&dgUsageInfoGroup.dgUsageInfo, sizeof( DG_USAGE_INFO_RECORD_T ) - sizeof( U16 ) ); status = FALSE; activateAlarmNoData( ALARM_ID_DG_INVALID_USAGE_RECORD_CRC );