Do not show power/swr on SOAPY, since these values are not

present there.

diff --git a/meter.c b/meter.c
index 3040de24b4e373448724a528349c4a96bc868790..7704677c6ae40e0a50694e1795ccbec465a00bce 100644 (file)
--- a/meter.c
+++ b/meter.c
@@ -674,30 +674,35 @@ if(analog_meter) {
             CAIRO_FONT_WEIGHT_BOLD);
       cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
 
-      if(level>max_level || max_count==10) {
+      if (protocol == ORIGINAL_PROTOCOL || protocol == NEW_PROTOCOL) {
+       //
+       // Power levels not available for Soapy
+       //
+        if(level>max_level || max_count==10) {
           max_level=level;
           max_count=0;
-      }
-      max_count++;
+        }
+        max_count++;
 
-      sprintf(sf,"FWD: %d%s",(int)max_level,units);
-      cairo_move_to(cr, 10, 35);
-      cairo_show_text(cr, sf);
+        sprintf(sf,"FWD: %d%s",(int)max_level,units);
+        cairo_move_to(cr, 10, 35);
+        cairo_show_text(cr, sf);
 
-      if (swr > transmitter->swr_alarm) {
-        cairo_set_source_rgb(cr, 1.0, 0.2, 0.0);  // display SWR in red color
-      } else {
-        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); // display SWR in white color
-      }
+        if (swr > transmitter->swr_alarm) {
+          cairo_set_source_rgb(cr, 1.0, 0.2, 0.0);  // display SWR in red color
+        } else {
+          cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); // display SWR in white color
+        }
 
 
-      cairo_select_font_face(cr, DISPLAY_FONT,
+        cairo_select_font_face(cr, DISPLAY_FONT,
             CAIRO_FONT_SLANT_NORMAL,
             CAIRO_FONT_WEIGHT_BOLD);
-      cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
-      sprintf(sf,"SWR: %1.1f:1",swr);
-      cairo_move_to(cr, 10, 55);
-      cairo_show_text(cr, sf);
+        cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
+        sprintf(sf,"SWR: %1.1f:1",swr);
+        cairo_move_to(cr, 10, 55);
+        cairo_show_text(cr, sf);
+      }
 
       cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);  // revert to white color
 

diff --git a/tx_panadapter.c b/tx_panadapter.c
index 19b94eb55c0a2e0f5e50d5defec1f0a98ed71aa9..0bd5da4ceab5f59ac2d5b47b563b46626392ee5e 100644 (file)
--- a/tx_panadapter.c
+++ b/tx_panadapter.c
@@ -404,31 +404,41 @@ void tx_panadapter_update(TRANSMITTER *tx) {
     char text[64];
     cairo_set_source_rgb(cr,1.0,0.2,0.0);
     cairo_set_font_size(cr, DISPLAY_FONT_SIZE3);
+    int row=0;
 
-    if(transmitter->fwd<0.0001 || band->disablePA || !pa_enabled) {
-      sprintf(text,"FWD %0.3f W",transmitter->exciter);
-    } else {
-      static int max_count=0;
-      static double max_level=0.0;
-      if(transmitter->fwd > max_level || max_count==10) {
+
+    if (protocol == ORIGINAL_PROTOCOL || protocol == NEW_PROTOCOL) {
+      //
+      // Power values not available for SoapySDR
+      //
+      if(transmitter->fwd<0.0001 || band->disablePA || !pa_enabled) {
+        sprintf(text,"FWD %0.3f W",transmitter->exciter);
+      } else {
+        static int max_count=0;
+        static double max_level=0.0;
+        if(transmitter->fwd > max_level || max_count==10) {
           max_level=transmitter->fwd;
           max_count=0;
+        }
+        max_count++;
+        sprintf(text,"FWD %0.1f W",max_level);
       }
-      max_count++;
-      sprintf(text,"FWD %0.1f W",max_level);
+      row += 15;
+      cairo_move_to(cr,10,row);
+      cairo_show_text(cr, text);
+      //
+      // Since colour is already red, no special
+      // action for "high SWR" warning
+      //
+      sprintf(text,"SWR 1:%1.1f",transmitter->swr);
+      row +=15;
+      cairo_move_to(cr,10,row);
+      cairo_show_text(cr, text);
     }
-    cairo_move_to(cr,10,15);
-    cairo_show_text(cr, text);
-    //
-    // Since colour is already red, no special
-    // action for "high SWR" warning
-    //
-    sprintf(text,"SWR 1:%1.1f",transmitter->swr);
-    cairo_move_to(cr,10,30);
-    cairo_show_text(cr, text);
 
+    row +=15;
     sprintf(text,"ALC %2.1f dB",transmitter->alc);
-    cairo_move_to(cr,10,45);
+    cairo_move_to(cr,10,row);
     cairo_show_text(cr, text);
 
   }