Commit 44999937 authored by Zhiping Jiang (蒋志平)'s avatar Zhiping Jiang (蒋志平) 💬

fix bug

parent 67878064
......@@ -6,8 +6,8 @@
#include "rxs_enhanced.h"
void featureCodeInterpretation(uint32_t featureCode, struct ExtraInfo * extraInfo) {
extraInfo->hasVersion = extraInfoHasVersion(featureCode);
extraInfo->hasLength = extraInfoHasLength(featureCode);
extraInfo->hasVersion = extraInfoHasVersion(featureCode);
extraInfo->hasMacAddr_cur = extraInfoHasMacAddress_Current(featureCode);
extraInfo->hasMacAddr_rom = extraInfoHasMacAddress_Rom(featureCode);
extraInfo->hasChansel = extraInfoHasChansel(featureCode);
......@@ -42,7 +42,7 @@ void inplaceAddRxExtraInfo(uint8_t *inBytes, uint32_t featureCode, uint8_t *valu
pos += sizeof(struct rx_status_basic);
lengthField_ptr = extraInfoHasLength(*rxFeatureCode) ? (uint16_t *)inBytes + pos : nullptr;
pos += extraInfoHasLength(*rxFeatureCode) ? 2:0;
pos += extraInfoHasVersion(*rxFeatureCode) ? 1:0;
pos += extraInfoHasVersion(*rxFeatureCode) ? 8:0;
pos += extraInfoHasMacAddress_Current(*rxFeatureCode) ? 6:0;
pos += extraInfoHasMacAddress_Rom(*rxFeatureCode) ? 6:0;
pos += extraInfoHasChansel(*rxFeatureCode) ? 4:0;
......
......@@ -41,7 +41,7 @@
struct TxExtraInfoMinSet {
uint32_t txExtraInfoFeatureCode;
uint16_t txExtraInfoLength;
uint8_t txExtraInfoVersion;
uint64_t txExtraInfoVersion;
uint8_t txExtraInfoMacAddr_cur[6];
uint8_t txExtraInfoMacAddr_rom[6];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment