simplified

StonedDawg · Jan 16, 2021 · 8976e11 · 8976e11
1 parent 4e20dc8
commit 8976e11
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/src/rx_main.cpp b/src/src/rx_main.cpp
@@ -321,19 +321,15 @@ void ICACHE_RAM_ATTR HWtimerCallbackTock()
         int32_t rssi = (antenna == 0) ? LPF_UplinkRSSI0.SmoothDataINT : LPF_UplinkRSSI1.SmoothDataINT;
 
         // if rssi drop 5 from strongest rssi
-         if ((rssi < (prevRSSI - 5) ) && antennaSwitched2 >= 30){
+         if ((rssi < (prevRSSI - 5) ) && antennaSwitched2 >= DIVERSITY_ANTENNA_INTERVAL){
             otherRSSI = rssi;
             switchAntenna();
             antennaSwitched = 1;
             antennaSwitched2 = 0; 
-         } else if(antennaSwitched2 < 30){
-             prevRSSI = rssi;
-             antennaSwitched2++;
-         } else { //overwrite prev rssi with stronger rssi val
-             if(rssi > prevRSSI){
+         } else if(rssi > prevRSSI || antennaSwitched2 < DIVERSITY_ANTENNA_INTERVAL){
                  prevRSSI = rssi;
+                 antennaSwitched2++;
              }
-         }
          //if there is a packet drop
         if (((!LQCALC.packetReceivedForPreviousFrame()) && antennaSwitched == 0)) {
             otherRSSI = rssi;