Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r224f096c4d255526eccba9aaa13e36e0e7499f14 -r1e34d32fcfac88792ed72e55953dee721bacd9d5 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 224f096c4d255526eccba9aaa13e36e0e7499f14) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1e34d32fcfac88792ed72e55953dee721bacd9d5) @@ -1451,7 +1451,7 @@ // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DG_USAGE_DATA; - msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( BOOL ); + msg.hdr.payloadLen = sizeof( DG_USAGE_INFO_RECORD_T ); // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record // has been already checked in POST @@ -1460,11 +1460,7 @@ if ( 0 == message->hdr.payloadLen ) { // Fill message payload - memcpy( payloadPtr, &usageInfo.lastHeatDisCompleteDateEpoch, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &usageInfo.lastChemDisCompleteDateEpoch, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &usageInfo.isDisinfected, sizeof( BOOL ) ); + memcpy( payloadPtr, &usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ) ); } // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer