* [EchoProbe] Fix connection lost bug during freq shifting

changelog.md

@@ -1,69 +1,94 @@
 # Changelog of PicoScenes Plugin Development Kit (PDK)
 
+## Apr. 25, 2022
+
+    * [EchoProbe] Fix connection lost bug during freq shifting
 
 ## Apr. 6, 2022
+
     * [EchoProbe][UDPForward] Add support for SoapySDR-based SDR devices
 
 ## Mar. 17, 2022
+
     * [UDPForward] Fix bug
 
 ## Mar. 16, 2022
+
     * [UDPForward] Bring back this plugin, simplified to only --forward-to option, like "--forward-to 127.0.0.1:50000"
 
 ## Feb. 21, 2022
+
     * [EchoProbe] Support lookback for X310 or multi-channel SDR
 
 ## Feb. 14, 2022
+
     * [EchoProbe] Implement NDP frame transmission
 
 ## Feb. 2, 2022
+
     * [All] plugins now skips the parsing Tx parameters
 
 ## Dec. 25, 2021
+
     * [EchoProbe] minor udpate
 
 ## Dec. 14, 2021
+
     * [EchoProbe] Add support for the 802.11ax High-Doppler mode and Extended-Range (HE-ER-SU) mode
 
 ## Dec. 4, 2021
+
     * Remove phased-array plugin temporarily
 
 ## Nov. 12, 2021
+
     * [EchoProbe] Apt to AX200/AX210 device type
 
 ## Nov. 5, 2021
+
     * [EchoProbe] Fix bug 
 
 ## Nov. 1, 2021
+
     * [EchoProbe] Add --5300 option for AX200 Tx
 
 ## Oct. 1, 2021 -- Happy China National Day!
+
     * [All] Adapt to new PicoScenes Platform
 
 ## Sep. 1, 2021
+
     * [EchoProbe] Adapt to nic->getMacAddressPhy() method
 
 ## Aug. 31, 2021
+
     * [EchoProbe] Add support for MVM-based NIC
-    
+
 ## Aug. 11, 2021
+
     * [EchoProbe] Fix a bug
 
 ## July 11, 2021
+
     * [EchoProbe] Add --output option for EchoProbe plugin, from which users can specify the file name of the generated .csi file
 
 ## May 21, 2021
+
     * [PhasedCOTSArray] start coding for this plugin
 
 ## May 17, 2021
+
     * [Platform] Adapt to platform's big merge
 
 ## Feb. 20, 2021
+
     * [Platform] Update to adapt new NICPortal of Platform
 
 ## Feb. 19, 2021
+
     * [EchoProbe] Stop Tx/Rx service when initiator / injector job finishes.
 
 ## Jan. 30, 2021
+
     * [EchoProbe] Improve round-trip measurement responsiveness for SDR
     * Add changelog

plugin-echoprobe/EchoProbeResponder.cxx

@@ -138,19 +138,13 @@ std::vector<PicoScenesFrameBuilder> EchoProbeResponder::makeRepliesForEchoProbeF
     frameBuilder.setPicoScenesFrameType(EchoProbeFreqChangeACKFrameType);
     frameBuilder.setMCS(0);
     frameBuilder.setGuardInterval(GuardIntervalEnum::GI_800);
-    frameBuilder.setDestinationAddress(rxframe.standardHeader.addr3.data());
-    if (nic->getDeviceType() == PicoScenesDeviceType::QCA9300) {
-        auto macNIC = std::dynamic_pointer_cast<MAC80211CSIExtractableNIC>(nic);
-        frameBuilder.setSourceAddress(macNIC->getFrontEnd()->getMacAddressPhy().data());
-        frameBuilder.set3rdAddress(macNIC->getMacAddressDev().data());
-    }
-    if (nic->getDeviceType() == PicoScenesDeviceType::IWL5300) {
-        frameBuilder.setDestinationAddress(PicoScenesFrameBuilder::magicIntel123456.data());
-        frameBuilder.setSourceAddress(PicoScenesFrameBuilder::magicIntel123456.data());
-        frameBuilder.set3rdAddress(PicoScenesFrameBuilder::broadcastFFMAC.data());
-    } else if (nic->getDeviceType() == PicoScenesDeviceType::USRP) {
-        frameBuilder.setSourceAddress(nic->getFrontEnd()->getMacAddressPhy().data());
-        frameBuilder.set3rdAddress(nic->getFrontEnd()->getMacAddressPhy().data());
+    frameBuilder.setDestinationAddress(PicoScenesFrameBuilder::magicIntel123456.data());
+    frameBuilder.setSourceAddress(PicoScenesFrameBuilder::magicIntel123456.data());
+    frameBuilder.set3rdAddress(nic->getFrontEnd()->getMacAddressPhy().data());
+
+    if (parameters.inj_for_intel5300.value_or(false)) {
+        frameBuilder.setForceSounding(false);
+        frameBuilder.setChannelCoding(ChannelCodingEnum::BCC); // IWL5300 doesn't support LDPC coding.
     }
     frameBuilder.setTaskId(rxframe.PicoScenesHeader->taskId);
     frameBuilder.setTxId(rxframe.PicoScenesHeader->txId);