Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rfef2e486f7165f6a22617a3b0535f938967b1aee -r39677168af0080bcab76ef65ef90875f830e1913 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision fef2e486f7165f6a22617a3b0535f938967b1aee) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 39677168af0080bcab76ef65ef90875f830e1913) @@ -3275,16 +3275,14 @@ { MESSAGE_T msg; HD_SERVICE_RECORD_T service; - DG_SERVICE_AND_USAGE_DATA_T dgData; U08 *payloadPtr = msg.payload; getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM ); - getHDVersionDGServiceAndUsageData( &dgData ); // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_HD_SERVICE_SCHEDULE_DATA; - msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ); + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ); if ( 0 == message->hdr.payloadLen ) { @@ -3293,12 +3291,6 @@ payloadPtr += sizeof( U32 ); service.serviceIntervalSeconds = ( 0 == service.lastServiceEpochDate ? 0 : service.serviceIntervalSeconds ); memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceEpochDate, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - dgData.dgServiceRecord.serviceIntervalSeconds = ( 0 == dgData.dgServiceRecord.lastServiceEpochDate ? 0 : - dgData.dgServiceRecord.serviceIntervalSeconds ); - memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, sizeof( U32 ) ); } // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer @@ -7498,7 +7490,7 @@ // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_DG_SERVICE_RECORD_REQUEST; + msg.hdr.msgID = MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD; msg.hdr.payloadLen = 0; // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer