             default:
                 receiver=useReceiverA;
         }
+        active_receiver = receiver;
         // set the antenna LED and switch the video
         setReceiver(receiver);
     }
 #endif
 
-    // special case for RSSI setup
-    if(state==STATE_RSSI_SETUP)
-    { // RSSI setup
-        if(rssiA < rssi_setup_min_a)
-        {
-            rssi_setup_min_a=rssiA;
-            TV.print(50, SCANNER_LIST_Y_POS, "   ");
-            TV.print(50, SCANNER_LIST_Y_POS, rssi_setup_min_a , DEC);
-        }
-        if(rssiA > rssi_setup_max_a)
-        {
-            rssi_setup_max_a=rssiA;
-            TV.print(110, SCANNER_LIST_Y_POS, "   ");
-            TV.print(110, SCANNER_LIST_Y_POS, rssi_setup_max_a , DEC);
-        }
-
-#ifdef USE_DIVERSITY
-        if(rssiB < rssi_setup_min_b)
-        {
-            rssi_setup_min_b=rssiB;
-        }
-        if(rssiB > rssi_setup_max_b)
-        {
-            rssi_setup_max_b=rssiB;
-        }
-#endif
-    }
 #ifdef USE_DIVERSITY
     if(receiver == useReceiverA || state==STATE_RSSI_SETUP)
     {
 #endif
-        rssi = constrain(rssiA, rssi_min_a, rssi_max_a);    //original 90---250
-        rssi=rssi-rssi_min_a; // set zero point (value 0...160)
-        rssi = map(rssi, 0, rssi_max_a-rssi_min_a , 1, 100);   // scale from 1..100%
+        rssi = rssiA;
 #ifdef USE_DIVERSITY
     }
     else {
-        rssi = constrain(rssiB, rssi_min_b, rssi_max_b);    //original 90---250
-        rssi=rssi-rssi_min_b; // set zero point (value 0...160)
-        rssi = map(rssi, 0, rssi_max_a-rssi_min_b , 1, 100);   // scale from 1..100%
+        rssi = rssiB;
     }
 #endif
     return (rssi);

uint8_t rssi_scaled = 0;
#ifdef USE_DIVERSITY
uint8_t diversity_mode = useReceiverAuto;
#endif
uint8_t hight = 0;
uint8_t state = START_STATE;

#ifdef USE_DIVERSITY
    return readRSSI(-1);
}
uint16_t readRSSI(char receiver)
{
#endif
    uint16_t rssi = 0;
