Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r2e56064726838bfb626ec3ea40132c4e3681639a -rd731f3fda9d25e0d63100f648510e9c8cdd21f89 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2e56064726838bfb626ec3ea40132c4e3681639a) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision d731f3fda9d25e0d63100f648510e9c8cdd21f89) @@ -674,7 +674,7 @@ // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DG_SEND_SYSTEM_RECORD; - msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length; + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ); memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); @@ -685,7 +685,7 @@ memcpy( payloadPtr, &length, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, sysRcrdAddress, length ); + memcpy( payloadPtr, sysRcrdAddress, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED ); @@ -713,7 +713,7 @@ // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DG_SEND_SERVICE_RECORD; - msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length; + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ); memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); @@ -724,7 +724,7 @@ memcpy( payloadPtr, &length, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, srvcRcrdAddress, length ); + memcpy( payloadPtr, srvcRcrdAddress, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );