Index: firmware/App/DDCommon.h =================================================================== diff -u -r0e7ae65d555c75bceb799dceb4ddae44232a382d -r54ffc8f5f44746635d1e3934d942a06f0bda9dc6 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision 0e7ae65d555c75bceb799dceb4ddae44232a382d) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision 54ffc8f5f44746635d1e3934d942a06f0bda9dc6) @@ -101,20 +101,6 @@ U32 compatibilityRev; ///< DD compatibility revision. } DD_VERSIONS_T; -/// Payload record structure for an FP versions message. -typedef struct -{ - U08 major; ///< FP version major revision. - U08 minor; ///< FP version minor revision. - U08 micro; ///< FP version micro revision. - U16 build; ///< FP build version. - U08 fpgaId; ///< FP FPGA ID. - U08 fpgaMajor; ///< FP FPGA major revision. - U08 fpgaMinor; ///< FP FPGA minor revision. - U08 fpgaLab; ///< FP FPGA lab revision. - U32 compatibilityRev; ///< FP compatibility revision. -} FP_VERSIONS_T; - /// Record defining the fields in a UI version request message. typedef struct { Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r0e7ae65d555c75bceb799dceb4ddae44232a382d -r54ffc8f5f44746635d1e3934d942a06f0bda9dc6 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 0e7ae65d555c75bceb799dceb4ddae44232a382d) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 54ffc8f5f44746635d1e3934d942a06f0bda9dc6) @@ -744,7 +744,6 @@ if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) ) { DD_VERSIONS_T ddVersionRecord; - FP_VERSIONS_T fpVersionRecord; // Record UI version information memcpy( (U08*)(&uiVersionRecord), &message->payload, sizeof( UI_VERSIONS_T ) ); @@ -760,16 +759,8 @@ // Send DD version information result = sendMessage( MSG_ID_DD_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) ); - // Build FP version record - fpVersionRecord.major = DD_VERSION_MAJOR; - fpVersionRecord.minor = DD_VERSION_MINOR; - fpVersionRecord.micro = DD_VERSION_MICRO; - fpVersionRecord.build = DD_VERSION_BUILD; - getFPGAVersions( &fpVersionRecord.fpgaId, &fpVersionRecord.fpgaMajor, &fpVersionRecord.fpgaMinor, &fpVersionRecord.fpgaLab ); - fpVersionRecord.compatibilityRev = SW_COMPATIBILITY_REV; - // Send FP version information - result = sendMessage( MSG_ID_FP_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&fpVersionRecord, sizeof( FP_VERSIONS_T ) ); + result = sendMessage( MSG_ID_FP_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) ); } return result;