Radioberry corrections from Johan PA3GSB

diff --git a/discovery.c b/discovery.c
index 7256e500da017627c3094c91f68afcf091fe2837..22432bc7a1e4010cc9600eaed94b4d7c57379334 100644 (file)
--- a/discovery.c
+++ b/discovery.c
@@ -460,7 +460,7 @@ fprintf(stderr,"%p Protocol=%d name=%s\n",d,d->protocol,d->name);
           break;
 #ifdef SOAPYSDR
         case SOAPYSDR_PROTOCOL:
-          sprintf(text,"%s (Protocol SOAPY_SDR %s) on USB",d->name,d->info.soapy.version);
+          sprintf(text,"%s (Protocol SOAPY_SDR %s) via Soapy lib",d->name,d->info.soapy.version);
           break;
 #endif
 #ifdef STEMLAB_DISCOVERY

diff --git a/radio.c b/radio.c
index 0980512b01422cbff913663662d115647ea5a0e6..a945efbf769640bf7a0268a456c723d9e0ac506e 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -742,13 +742,24 @@ void start_radio() {
 
   status_text(text);
 
-  sprintf(text,"piHPSDR: %s (%s %s) %s (%s) on %s",
-                          radio->name,
-                          p,
-                          version,
-                          ip,
-                          mac,
-                          iface);
+  switch (protocol) {
+    case ORIGINAL_PROTOCOL:
+    case NEW_PROTOCOL:
+      sprintf(text,"piHPSDR: %s (%s %s) %s (%s) on %s",
+                   radio->name,
+                   p,
+                   version,
+                   ip,
+                   mac,
+                   iface);
+      break;
+    case SOAPSDR_PROTOCOL:
+      sprintf(text,"piHPSDR: %s (%s %s",
+                   radio->name,
+                   p,
+                   version);
+      break;
+  }
 
   gtk_window_set_title (GTK_WINDOW (top_window), text);
 
@@ -1746,6 +1757,9 @@ void set_attenuation(int value) {
       case NEW_PROTOCOL:
         schedule_high_priority();
         break;
+      case SOAPYSDR_PROTOCOL:
+        soapy_protocol_set_gain(active_receiver,value * 1.0);
+        break;
     }
 }
 

diff --git a/rigctl.c b/rigctl.c
index 94aefd0dd0f823865d604d8011a693a76bcafd15..d2cb35dbf9b65710e0320a611b593a02bf0a4e09 100644 (file)
--- a/rigctl.c
+++ b/rigctl.c
@@ -3843,6 +3843,10 @@ int launch_serial () {
         mutex_b_exists = 1;
      }
      
+     //
+     // We *must* open the port non-blocking, otherwise launch_serial may block
+     // for a long time if e.g. the serial cable is un-plugged
+     //
      fd = open (ser_port, O_RDWR | O_NOCTTY | O_NONBLOCK);
      if (fd < 0)
      {
@@ -3857,15 +3861,19 @@ int launch_serial () {
         return 0;
      }
 
+     //
+     // Note that we use hard-wired settings here: 8 data bits, no parity, 1 stop bit
+     //
      TTY.c_cflag &= ~CSIZE;
      TTY.c_cflag |= CS8;
      // enable receiver, set local mode
      TTY.c_cflag |= (CLOCAL | CREAD);
-     // no parity
      TTY.c_cflag &= ~PARENB;
-     // 1 stop bit
      TTY.c_cflag &= ~CSTOPB;
 
+     //
+     // Set baud rate for input and output
+     //
      cfsetispeed(&TTY, serial_baud_rate);
      cfsetospeed(&TTY, serial_baud_rate);
 
@@ -3875,8 +3883,8 @@ int launch_serial () {
      TTY.c_oflag &= ~OPOST;
 
      // timeouts
-     TTY.c_cc[VMIN] = 0;
-     TTY.c_cc[VTIME] =5;
+     TTY.c_cc[VMIN] = 0; // Do not block if nothing is in the input queue
+     TTY.c_cc[VTIME] =5; // A "pause" of 0.5 bytes after successfully receiving one byte indicates nothing more is to come
 
      if (tcsetattr(fd, TCSANOW, &TTY)) {
         fprintf (stderr,"RIGCTL: Error %d setting attributes: %s: %s\n", errno, ser_port, strerror (errno));

diff --git a/soapy_discovery.c b/soapy_discovery.c
index 8b50de9ed2c6e4d4a0e4bb55b096e01cd1a96d1b..ae8cd019f4ff0ac28bc075c7ed6827ba1230e31b 100644 (file)
--- a/soapy_discovery.c
+++ b/soapy_discovery.c
@@ -124,6 +124,8 @@ static void get_info(char *driver) {
     sample_rate=768000;
   } else if(strcmp(driver,"rtlsdr")==0) {
     sample_rate=1048576;
+  } else if(strcmp(driver,"radioberry")==0) {
+    sample_rate=48000;
   } else {
     sample_rate=1048576;
   }
@@ -215,6 +217,8 @@ static void get_info(char *driver) {
     }
     if(strcmp(driver,"lime")==0) {
       sprintf(discovered[devices].info.soapy.version,"fw=%s gw=%s hw=%s p=%s", fw_version, gw_version, hw_version, p_version);
+    } else if (strcmp(driver,"radioberry")==0) {
+      sprintf(discovered[devices].info.soapy.version,"fw=%s gw=%s", fw_version, gw_version);
     } else {
       strcpy(discovered[devices].info.soapy.version,"");
     }