optimize loss recalculation

OpenHD · Aug 9, 2023 · f584076 · f584076
1 parent 085129f
commit f584076
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/HelperSources/NonceSeqNrHelper.h b/src/HelperSources/NonceSeqNrHelper.h
@@ -70,7 +70,8 @@ class NonceSeqNrHelper{
   // recalculate the loss in percentage in fixed intervals
   // resets the received and missing packet count
   void recalculate_loss_if_needed(){
-    if(std::chrono::steady_clock::now()-m_last_loss_perc_recalculation>std::chrono::seconds(2)){
+    const auto elapsed=std::chrono::steady_clock::now()-m_last_loss_perc_recalculation;
+    if(elapsed>=std::chrono::seconds(2) || m_n_received_packets>500){
       m_last_loss_perc_recalculation=std::chrono::steady_clock::now();
       const auto n_total_packets=m_n_received_packets+m_n_missing_packets;
       //m_console->debug("x_n_missing_packets:{} x_n_received_packets:{} n_total_packets:{}",x_n_missing_packets,x_n_received_packets,n_total_packets);

diff --git a/src/WBTxRx.cpp b/src/WBTxRx.cpp
@@ -399,7 +399,10 @@ void WBTxRx::on_new_packet(const uint8_t wlan_idx, const pcap_pkthdr &hdr,
         const auto rssi=parsedPacket->allAntennaValues[0].rssi;
         auto opt_minmaxavg= this_wifi_card_calc.card_rssi.add_and_recalculate_if_needed(rssi);
         if(opt_minmaxavg.has_value()){
-          this_wifi_card_stats.card_dbm=opt_minmaxavg.value().avg;
+          // See below for how this value is calculated on rtl8812au
+          if(m_wifi_cards[wlan_idx].type!=WIFI_CARD_TYPE_RTL8812AU){
+            this_wifi_card_stats.card_dbm=opt_minmaxavg.value().avg;
+          }
           if(m_options.debug_rssi>=1){
             m_console->debug("Card{}:{}",wlan_idx, RSSIAccumulator::min_max_avg_to_string(opt_minmaxavg.value(), false));
           }