Merge branch 'master' of https://github.com/g0orx/pihpsdr

diff --cc about_menu.c
Simple merge

diff --cc cw_menu.c
Simple merge

diff --cc new_protocol.c
Simple merge

diff --cc old_protocol.c
Simple merge

diff --cc radio.c
index 3840da03b2648dfb10d57ac1760791769caafabe,8e0ad6ff1f93a54ab0f91d24f7c37ab880698021..20f4e7918afec2d9ceede3b6b4ca12e35b490dea
--- 1/radio.c
--- 2/radio.c
+++ b/radio.c
@@@ -406,13 -430,87 +430,89 @@@ void start_radio() 
                          radio->protocol==ORIGINAL_PROTOCOL?"Protocol 1":"Protocol 2",
                          radio->software_version/10,
                          radio->software_version%10);
 +#ifdef USBOZY
 +      }
 +#endif
          break;
      }
 -  //}
  
  
+   char p[32];
+   char version[32];
+   char mac[32];
+   char ip[32];
+   char iface[32];
+ 
+   switch(radio->protocol) {
+     case ORIGINAL_PROTOCOL:
+       strcpy(p,"Protocol 1");
+       sprintf(version,"v%d.%d)",
+                    radio->software_version/10,
+                    radio->software_version%10);
+       sprintf(mac,"%02X:%02X:%02X:%02X:%02X:%02X",
+                   radio->info.network.mac_address[0],
+                   radio->info.network.mac_address[1],
+                   radio->info.network.mac_address[2],
+                   radio->info.network.mac_address[3],
+                   radio->info.network.mac_address[4],
+                   radio->info.network.mac_address[5]);
+       sprintf(ip,"%s", inet_ntoa(radio->info.network.address.sin_addr));
+       sprintf(iface,"%s", radio->info.network.interface_name);
+       break;
+     case NEW_PROTOCOL:
+       strcpy(p,"Protocol 2");
+       sprintf(version,"v%d.%d)",
+                    radio->software_version/10,
+                    radio->software_version%10);
+       sprintf(mac,"%02X:%02X:%02X:%02X:%02X:%02X",
+                   radio->info.network.mac_address[0],
+                   radio->info.network.mac_address[1],
+                   radio->info.network.mac_address[2],
+                   radio->info.network.mac_address[3],
+                   radio->info.network.mac_address[4],
+                   radio->info.network.mac_address[5]);
+       sprintf(ip,"%s", inet_ntoa(radio->info.network.address.sin_addr));
+       sprintf(iface,"%s", radio->info.network.interface_name);
+       break;
+ #ifdef SOAPYSDR
+     case SOAPYSDR_PROTOCOL:
+       strcpy(p,"SoapySDR");
+       sprintf(version,"v%d.%d.%d)",
+                    radio->software_version/100,
+                    (radio->software_version%100)/10,
+                    radio->software_version%10);
+       strcpy(mac,"");
+       strcpy(ip,"");
+       strcpy(iface,"");
+       break;
+ #endif
+   }
+ 
+   switch(protocol) {
+     case ORIGINAL_PROTOCOL:
+     case NEW_PROTOCOL:
+ #ifdef USBOZY
+       if(radio->device==DEVICE_OZY) {
+         sprintf(text,"%s (%s) on USB /dev/ozy\n", radio->name, p);
+       } else {
+ #endif
+         sprintf(text,"Starting %s (%s %s)",
+                       radio->name,
+                       p,
+                       version);
+ #ifdef USBOZY
+       }
+ #endif
+       break;
+ #ifdef SOAPYSDR
+     case SOAPYSDR_PROTOCOL:
+       sprintf(text,"Starting %s (%s %s)",
+                     radio->name,
+                     "SoapySDR",
+                     version);
+       break;
+ #endif
+     }
  
    status_text(text);
  

diff --cc radio.h
Simple merge

diff --cc rx_panadapter.c
index f810faa6d0fb2094f576c8774961127586fdd480,58c942b0663fc9d250e25f664e1eb7c717b8d07b..076024d3819372f73aac1c491cab5b6eb4207692
--- 1/rx_panadapter.c
--- 2/rx_panadapter.c
+++ b/rx_panadapter.c
@@@ -300,9 -327,9 +300,9 @@@ void rx_panadapter_update(RECEIVER *rx
      // band edges
      if(band->frequencyMin!=0LL) {
        cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
-       cairo_set_line_width(cr, 2.0);
+       cairo_set_line_width(cr, 1.0);
        if((min_display<band->frequencyMin)&&(max_display>band->frequencyMin)) {
 -        i=(band->frequencyMin-min_display)/(long long)rx->hz_per_pixel;
 +        i=(band->frequencyMin-min_display)/(long long)HzPerPixel;
          cairo_move_to(cr,(double)i,0.0);
          cairo_line_to(cr,(double)i,(double)display_height);
          cairo_stroke(cr);

diff --cc tx_panadapter.c
Simple merge