Adapted to latest STEMlab software

diff --git a/discovered.h b/discovered.h
index 1458e2cfac0b5036031a34de617409369e7129f2..e7d18fc281fd1b88595712e80248568a4be41623 100644 (file)
--- a/discovered.h
+++ b/discovered.h
@@ -36,6 +36,8 @@
 #define DEVICE_HERMES_LITE 6
 // 8000DLE uses 10 as the device type in old protocol
 #define DEVICE_ORION2 10 
+// Newer STEMlab hpsdr emulators use 100 instead of 1
+#define DEVICE_STEMLAB 100
 
 #ifdef USBOZY
 #define DEVICE_OZY 7

diff --git a/old_discovery.c b/old_discovery.c
index a2cf009d5f34d1e1e9dcfd29e14a0fc94690044f..620a28b0f99449921cab28a867287e883297fb5d 100644 (file)
--- a/old_discovery.c
+++ b/old_discovery.c
@@ -189,6 +189,10 @@ fprintf(stderr,"discover_receive_thread\n");
                         case DEVICE_ORION2:
                             strcpy(discovered[devices].name,"Orion 2");
                             break;
+                       case DEVICE_STEMLAB:
+                           // In most respects similar to HERMES, but this indicates TCP capability
+                            strcpy(discovered[devices].name,"STEMlab");
+                            break;
                         default:
                             strcpy(discovered[devices].name,"Unknown");
                             break;

diff --git a/old_protocol.c b/old_protocol.c
index 0ac2e797e69a77e0385965511c2d344950dfcecc..4a40492bd863f396071431db3e13a0fec2c919fe 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -637,13 +637,13 @@ static void process_ozy_input_buffer(unsigned char  *buffer) {
               }
               break;
             case 2:
-              if(device==DEVICE_HERMES)  {
+              if(device==DEVICE_HERMES || device==DEVICE_STEMLAB)  {
                 left_sample_double_rx=left_sample_double;
                 right_sample_double_rx=right_sample_double;
               }
               break;
             case 3:
-              if(device==DEVICE_HERMES)  {
+              if(device==DEVICE_HERMES || device==DEVICE_STEMLAB)  {
                 left_sample_double_tx=left_sample_double;
                 right_sample_double_tx=right_sample_double;
                 add_ps_iq_samples(transmitter, left_sample_double_tx,right_sample_double_tx,left_sample_double_rx,right_sample_double_rx);

diff --git a/radio_menu.c b/radio_menu.c
index be2658abb82a93a9deccd2d11f48a9b3c4a8c4b5..2213e401c978cddbfc371dc2ab76f4d584f10b68 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -118,11 +118,6 @@ static void load_filters(void) {
     }
   }
   att_type_changed();
-  if (filter_board == CHARLY25) {
-    if (use_tcp_b) gtk_widget_show(use_tcp_b);
-  } else {
-    if (use_tcp_b) gtk_widget_hide(use_tcp_b);
-  }
 }
 
 static void none_cb(GtkWidget *widget, gpointer data) {
@@ -390,7 +385,8 @@ void radio_menu(GtkWidget *parent) {
     g_signal_connect(apollo_b, "toggled", G_CALLBACK(apollo_cb), NULL);
     g_signal_connect(charly25_b, "toggled", G_CALLBACK(charly25_cb), NULL);
 
-    if (protocol == ORIGINAL_PROTOCOL) {
+    if (protocol == ORIGINAL_PROTOCOL && device==DEVICE_STEMLAB) {
+      // Currently, STEMlab supports TCP switching, but RADIOBERRY might do this as well
       use_tcp_b = gtk_check_button_new_with_label("Use TCP not UDP");
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_tcp_b), use_tcp==1);
       gtk_grid_attach(GTK_GRID(grid), use_tcp_b, x, 6, 1, 1);
@@ -475,7 +471,5 @@ void radio_menu(GtkWidget *parent) {
   sub_menu=dialog;
 
   gtk_widget_show_all(dialog);
-  // Only show this buttion if the C25 filter board is selected
-  if (filter_board != CHARLY25) gtk_widget_hide(use_tcp_b);
 
 }

diff --git a/receiver.c b/receiver.c
index 28176026d450a33251a36c42e6b9e4bbb942f5f7..3db664d0f1b486ff4d240c5a4d3c8c53b096f4e8 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -848,6 +848,7 @@ fprintf(stderr,"create_receiver: id=%d buffer_size=%d fft_size=%d pixels=%d fps=
             case DEVICE_METIS:
             case DEVICE_HERMES:
             case DEVICE_HERMES_LITE:                   
+           case DEVICE_STEMLAB:
               rx->adc=0;
               break;
             default:

diff --git a/rx_menu.c b/rx_menu.c
index 528284aa1831daa0decc78b68b30935cea32e105..129f9540fa61d4b35f82f3ba3f1503cf5ea3ef1c 100644 (file)
--- a/rx_menu.c
+++ b/rx_menu.c
@@ -296,6 +296,7 @@ void rx_menu(GtkWidget *parent) {
           break;
         case DEVICE_HERMES:
         case DEVICE_HERMES_LITE:
+       case DEVICE_STEMLAB:
           n_adc=1;
           break;
         default: 

diff --git a/transmitter.c b/transmitter.c
index b4c17c951caa87d922b8752ff7e3d8392e5331c4..41ba392fde69d5c5d2627cf48092084d5ac5a2af 100644 (file)
--- a/transmitter.c
+++ b/transmitter.c
@@ -329,7 +329,7 @@ static gboolean update_display(gpointer data) {
     double constant1=3.3;
     double constant2=0.095;
 
-       if(protocol==ORIGINAL_PROTOCOL) {
+    if(protocol==ORIGINAL_PROTOCOL) {
       switch(device) {
         case DEVICE_METIS:
           constant1=3.3;