* [EchoProbe] Add support for the 802.11ax High-Doppler mode and Exte…

…nded-Range (HE-ER-SU) mode
wifisensing · Dec 14, 2021 · d12f4ef · d12f4ef
1 parent f7c21b7
commit d12f4ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog of PicoScenes Plugin Development Kit (PDK)
 
+## 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
 

diff --git a/plugin-echoprobe/EchoProbeInitiator.cxx b/plugin-echoprobe/EchoProbeInitiator.cxx
@@ -269,10 +269,8 @@ std::shared_ptr<PicoScenesFrameBuilder> EchoProbeInitiator::buildBasicFrame(uint
     fp->setNumberOfExtraSounding(parameters.numESS.value_or(0));
     fp->setChannelCoding((ChannelCodingEnum) parameters.coding.value_or((uint32_t) ChannelCodingEnum::BCC));
     fp->setTxHEExtendedRange(parameters.txHEExtendedRange.value_or(false));
-    if(parameters.heHighDoppler.value()){
-        fp->setHEHighDoppler(true);
-        fp->setHEMidamblePeriodicity(parameters.heHighDoppler.value());
-    }
+    fp->setHEHighDoppler(parameters.heHighDoppler.value_or(false));
+    fp->setHEMidamblePeriodicity(parameters.heHighDoppler.value_or(10));
     fp->getFrame()->txParameters.idleTime = parameters.ifs.value_or(20e-6);
 
     fp->setDestinationAddress(parameters.inj_target_mac_address->data());

diff --git a/plugin-echoprobe/EchoProbePlugin.cxx b/plugin-echoprobe/EchoProbePlugin.cxx
@@ -42,7 +42,7 @@ void EchoProbePlugin::initialization() {
             ("gi", po::value<uint32_t>(), "Guarding Interval [400, 800, 1600, 3200], 800 as default")
             ("coding", po::value<std::string>(), "Code scheme [LDPC, BCC], BCC as default")
             ("extended-range", "Enable 11ax extended range")
-            ("high-doppler", po::value<uint32_t>(), "High doppler [10, 20], 10 as default")
+            ("high-doppler", po::value<uint32_t>()->default_value(10), "Enabling 802.11ax High Doppler mode with the Midamble Periodicity of 10 or 20, 10 as default")
             ("injector-content", po::value<std::string>(), "Content type for injector mode [full, header, ndp]")
             ("ifs", po::value<std::string>(), "Inter-Frame Spacing in seconds, 20e-6 as default");
 
@@ -255,9 +255,9 @@ void EchoProbePlugin::parseAndExecuteCommands(const std::string &commandString)
                 parameters.heHighDoppler = true;
                 parameters.heMidamblePeriodicity = heMidamblePeriodicity;
             } else
-                throw std::invalid_argument(fmt::format("[EchoProbe Plugin]: invalid high doppler value: {}.\n", heMidamblePeriodicity));
+                throw std::invalid_argument(fmt::format("[EchoProbe Plugin]: invalid 802.11 High-Doppler Midamble Periodicity: {}. Only 10 or 20 acceptable. \n", heMidamblePeriodicity));
 
-        }else{
+        } else {
             throw std::invalid_argument(fmt::format("[EchoProbe Plugin]: Only packet format of 11ax supports high doppler."));
         }
     }