respect CHARLY25 preamps in RX panadapter

diff --git a/rx_panadapter.c b/rx_panadapter.c
index ea68b99de947849b8d2089602191f5a83ba7cd3a..14eb2b53c7052cecec7caedcb909b59bf825d285 100644 (file)
--- a/rx_panadapter.c
+++ b/rx_panadapter.c
@@ -394,6 +394,10 @@ void rx_panadapter_update(RECEIVER *rx) {
   samples[display_width-1]=-200.0;
   s1=(double)samples[0]+(double)adc_attenuation[rx->adc];
   if (filter_board == ALEX && rx->adc == 0) s1 += (double)(10*rx->alex_attenuation);
+  if (filter_board == CHARLY25) {
+    if (rx->preamp) s1 -= 18.0;
+    if (rx->dither) s1 -= 18.0;
+  }
 #ifdef SOAPYSDR
   if(protocol==SOAPYSDR_PROTOCOL) {
     s1-=rx->rf_gain;
@@ -407,6 +411,10 @@ void rx_panadapter_update(RECEIVER *rx) {
   for(i=1;i<display_width;i++) {
     s2=(double)samples[i]+(double)adc_attenuation[rx->adc];
     if (filter_board == ALEX && rx->adc == 0) s2 += (double)(10*rx->alex_attenuation);
+    if (filter_board == CHARLY25) {
+      if (rx->preamp) s2 -= 18.0;
+      if (rx->dither) s2 -= 18.0;
+    }
 #ifdef SOAPYSDR
     if(protocol==SOAPYSDR_PROTOCOL) {
       s2-=rx->rf_gain;