ext data: fix data offset bug

Fix 3 different bugs around ext data

1) same byte used for both MSB and LSB in device ID
2) having data offset due to getData inheritance
3) clear lib config then set flags

Author: cujomalainey

src/RX/ANT_AntRxDataResponse.cpp

@@ -20,23 +20,23 @@ uint8_t AntRxDataResponse::getDataOffset() {
 
 uint16_t AntRxDataResponse::getDeviceNumber() {
     if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
-        return getData(EXTENDEDDATA_DEVICENUMBER_LSB_BYTE) | (getData(EXTENDEDDATA_DEVICENUMBER_LSB_BYTE) << EXTENDEDDATA_DEVICENUMBER_MSB_SHIFT);
+        return AntRxDataResponse::getData(EXTENDEDDATA_DEVICENUMBER_LSB_BYTE) | (AntRxDataResponse::getData(EXTENDEDDATA_DEVICENUMBER_MSB_BYTE) << EXTENDEDDATA_DEVICENUMBER_MSB_SHIFT);
     } else {
         return 0;
     }
 }
 
 uint8_t AntRxDataResponse::getDeviceType() {
     if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
-        return getData(EXTENDEDDATA_DEVICETYPE_BYTE);
+        return AntRxDataResponse::getData(EXTENDEDDATA_DEVICETYPE_BYTE);
     } else {
         return 0;
     }
 }
 
 uint8_t AntRxDataResponse::getTransmissionType() {
     if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
-        return getData(EXTENDEDDATA_TRANSMISSIONTYPE_BYTE);
+        return AntRxDataResponse::getData(EXTENDEDDATA_TRANSMISSIONTYPE_BYTE);
     } else {
         return 0;
     }
@@ -48,7 +48,7 @@ uint8_t AntRxDataResponse::getMeasurementType() {
         if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
             offset += EXTENDEDDATA_CHANNELID_SIZE;
         }
-        return getData(EXTENDEDDATA_MEASUREMENTTYPE_BYTE + offset);
+        return AntRxDataResponse::getData(EXTENDEDDATA_MEASUREMENTTYPE_BYTE + offset);
     } else {
         return 0;
     }
@@ -60,7 +60,7 @@ int8_t AntRxDataResponse::getRSSIValue() {
         if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
             offset += EXTENDEDDATA_CHANNELID_SIZE;
         }
-        return getData(EXTENDEDDATA_RSSIVALUE_BYTE + offset);
+        return AntRxDataResponse::getData(EXTENDEDDATA_RSSIVALUE_BYTE + offset);
     } else {
         return 0;
     }
@@ -72,7 +72,7 @@ int8_t AntRxDataResponse::getThresholdConfigurationValue() {
         if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
             offset += EXTENDEDDATA_CHANNELID_SIZE;
         }
-        return getData(EXTENDEDDATA_THRESHOLDCONFIGURATIONVALUE_BYTE + offset);
+        return AntRxDataResponse::getData(EXTENDEDDATA_THRESHOLDCONFIGURATIONVALUE_BYTE + offset);
     } else {
         return 0;
     }
@@ -87,7 +87,7 @@ uint16_t AntRxDataResponse::getRxTimestamp() {
         if (getFlagByte() & LIB_CONFIG_RSSI) {
             offset += EXTENDEDDATA_RSSIOUTPUT_SIZE;
         }
-        return getData(EXTENDEDDATA_RXTIMESTAMP_LSB_BYTE + offset) | (getData(EXTENDEDDATA_DEVICENUMBER_MSB_BYTE + offset) << EXTENDEDDATA_RXTIMESTAMP_MSB_SHIFT);
+        return AntRxDataResponse::getData(EXTENDEDDATA_RXTIMESTAMP_LSB_BYTE + offset) | (AntRxDataResponse::getData(EXTENDEDDATA_DEVICENUMBER_MSB_BYTE + offset) << EXTENDEDDATA_RXTIMESTAMP_MSB_SHIFT);
     } else {
         return 0;
     }

src/TX/Config/ANT_LibConfig.cpp

@@ -33,7 +33,8 @@ uint8_t LibConfig::getDataLength() {
 #ifdef NATIVE_API_AVAILABLE
 
 uint32_t LibConfig::execute() {
-    return sd_ant_lib_config_set(_config);
+    sd_ant_lib_config_clear(ANT_LIB_CONFIG_MASK_ALL);
+    return sd_ant_lib_config_set(_config | ANT_LIB_CONFIG_RADIO_CONFIG_ALWAYS);
 }
 
 #endif // NATIVE_API_AVAILABLE