CW GPIO lines: new default values. Enable 6m band for STEMlab

diff --git a/gpio.c b/gpio.c
index 653a78f0728280c8692f4b48a999eb97d9cfc34a..e37d90ab0f2a49db6f2b69b057c5e84320d3214c 100644 (file)
--- a/gpio.c
+++ b/gpio.c
@@ -124,9 +124,14 @@ int ENABLE_FUNCTION_BUTTON;
 int FUNCTION_BUTTON;
 
 #ifdef LOCALCW
-int CWL_BUTTON=14;
-int CWR_BUTTON=15;
-int SIDETONE_GPIO=8;
+//
+// WiringPi pins #12, 13, 14 are not used
+// by Controller1 and Controller2_V1
+// (and keep #8,9 reserved for I2C extensions)
+//
+int CWL_BUTTON=13;
+int CWR_BUTTON=14;
+int SIDETONE_GPIO=12;
 int ENABLE_GPIO_SIDETONE=0;
 int ENABLE_CW_BUTTONS=1;
 int CW_ACTIVE_LOW=1;
@@ -1310,8 +1315,13 @@ void gpio_restore_state() {
   }
 
   if(controller==CONTROLLER2_V2) {
-    // turn off as clash of use of pin 14 (WPi)
+    //
+    // In Controller2 V2, no 'free' GPIO pins
+    // are available, so one cannot use any of
+    // of these for CW in the standard setup
+    //
     ENABLE_CW_BUTTONS=0;
+    ENABLE_GPIO_SIDETONE=0;
   }
 
 

diff --git a/old_discovery.c b/old_discovery.c
index 9d53a32743aee0fc5a58e698ae0b181333c99050..c6f1039238a3571b5adcb90b9e1003777734f892 100644 (file)
--- a/old_discovery.c
+++ b/old_discovery.c
@@ -462,9 +462,11 @@ fprintf(stderr,"discover_receive_thread\n");
                        case DEVICE_STEMLAB:
                            // This is in principle the same as HERMES but has two ADCs
                            // (and therefore, can do DIVERSITY).
+                           // There are some problems with the 6m band on the RedPitaya
+                           // but with additional filtering it can be used.
                             strcpy(discovered[devices].name,"STEMlab");
                             discovered[devices].frequency_min=0.0;
-                            discovered[devices].frequency_max=30720000.0;
+                            discovered[devices].frequency_max=61440000.0;
                             break;
                         default:
                             strcpy(discovered[devices].name,"Unknown");

diff --git a/receiver.c b/receiver.c
index 5f9b518cf12bc09e4a25d703e69539c2763fd1de..f4a9e22628cce0aa473abb891ce4081f0f3de484 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -1337,6 +1337,7 @@ static void process_rx_buffer(RECEIVER *rx) {
 void full_rx_buffer(RECEIVER *rx) {
   int error;
 
+  g_mutex_lock(&rx->mutex);
   // noise blanker works on original IQ samples
   if(rx->nb) {
      xanbEXT (rx->id, rx->iq_input_buffer, rx->iq_input_buffer);
@@ -1359,6 +1360,7 @@ void full_rx_buffer(RECEIVER *rx) {
 
 //g_print("full_rx_buffer: rx=%d buffer_size=%d samples=%d\n",rx->id,rx->buffer_size,rx->samples);
   process_rx_buffer(rx);
+  g_mutex_unlock(&rx->mutex);
 }
 
 static int rx_buffer_seen=0;