switched to autostart option from John's repo

diff --git a/discovery.c b/discovery.c
index d7efd4aa38d75f1be7fb70c2637806c30a102ae4..2f546ea74a1a49b9f6e919aaba81f1cf78d0b31b 100644 (file)
--- a/discovery.c
+++ b/discovery.c
@@ -363,58 +363,9 @@ void discovery() {
 
   status_text("Discovery");
   
-#ifdef AUTOSTART_OPTION
-//
-// An option suggested by Chris AG5RR / VK3ICM
-//
-// If a radio is found with a specific hardware address told to piHPSDR,
-// then it is started immediately at this point
-//
-   char *myradio=getenv("STARTMYHARDWARE");
-   g_print("GETENV returns %p\n", myradio);
-   if (myradio && devices > 0) {
-     int mymac[6];
-     mymac[5]=-1;
-     g_print("Consider starting radio with HW addr=%s\n", myradio);
-     sscanf(myradio,"%02x.%02x.%02x.%02x.%02x.%02x",          &mymac[0],&mymac[1],&mymac[2],&mymac[3],&mymac[4],&mymac[5]);
-     g_print("HW addr parsed=%02x.%02x.%02x.%02x.%02x.%02x\n", mymac[0] ,mymac[1], mymac[2], mymac[3], mymac[4], mymac[5]);
-     for (int i=0; i < devices; i++) {
-       d=&discovered[i];
-#ifdef USBOZY
-       if (d->device == DEVICE_OZY) break;             // no MAC addr available
-#endif
-#ifdef SOAPYSDR
-       if (d->protocol == SOAPYSDR_PROTOCOL) break;    // no MAC addr available
-#endif
-#ifdef STEMLAB_DISCOVERY
-       if (d->protocol == STEMLAB_PROTOCOL) break;     // no MAC addr available (at this point)
-#endif
-       if(d->status!=STATE_AVAILABLE) break;           // in use or other problem
-       // not on the same subnet so cannot start it (but allow APIPA!)
-       if (strncmp(inet_ntoa(d->info.network.address.sin_addr),"169.254.",8)) {
-         if((d->info.network.interface_address.sin_addr.s_addr&d->info.network.interface_netmask.sin_addr.s_addr) != (d->info.network.address.sin_addr.s_addr&d->info.network.interface_netmask.sin_addr.s_addr)) break;
-       }
-//
-//     Now we consider starting THIS radio, if the HW address matches
-//
-       if (d->info.network.mac_address[0] != mymac[0]) break;
-       if (d->info.network.mac_address[1] != mymac[1]) break;
-       if (d->info.network.mac_address[2] != mymac[2]) break;
-       if (d->info.network.mac_address[3] != mymac[3]) break;
-       if (d->info.network.mac_address[4] != mymac[4]) break;
-       if (d->info.network.mac_address[5] != mymac[5]) break;
-//
-//     all tests passed. Start this radio
-//
-       radio=d;
-       start_radio();
-       return;
-     }
-   }
-#endif
-
     fprintf(stderr,"discovery: found %d devices\n", devices);
     gdk_window_set_cursor(gtk_widget_get_window(top_window),gdk_cursor_new(GDK_ARROW));
+
     discovery_dialog = gtk_dialog_new();
     gtk_window_set_transient_for(GTK_WINDOW(discovery_dialog),GTK_WINDOW(top_window));
     gtk_window_set_title(GTK_WINDOW(discovery_dialog),"piHPSDR - Discovery");
@@ -581,6 +532,16 @@ fprintf(stderr,"%p Protocol=%d name=%s\n",d,d->protocol,d->name);
       }
     }
 
+
+    g_print("%s: devices=%d autostart=%d\n",__FUNCTION__,devices,autostart);
+
+    if(devices==1 && autostart) {
+        d=&discovered[0];
+       if(d->status==STATE_AVAILABLE) {
+          if(start_cb(NULL,NULL,(gpointer)d)) return;
+       }
+    }
+
 #ifdef CLIENT_SERVER
 
     loadProperties("remote.props");

diff --git a/protocols.c b/protocols.c
index dca2a13429da03afc04fb3eeb1024656dc69fe5e..006ab2da5ea415fdc4539f7619b8eb645871bea8 100644 (file)
--- a/protocols.c
+++ b/protocols.c
@@ -41,6 +41,7 @@ gboolean enable_soapy_protocol;
 #ifdef STEMLAB_DISCOVERY
 gboolean enable_stemlab;
 #endif
+gboolean autostart;
 
 void protocols_save_state() {
   char value[80];
@@ -59,6 +60,8 @@ void protocols_save_state() {
   setProperty("enable_stemlab",value);
 #endif
 
+  sprintf(value,"%d",autostart);
+  setProperty("autostart",value);
   saveProperties("protocols.props");
   
 }
@@ -83,6 +86,10 @@ void protocols_restore_state() {
   value=getProperty("enable_stemlab");
   if(value) enable_stemlab=atoi(value);
 #endif
+  autostart=FALSE;
+  value=getProperty("autostart");
+  if(value) autostart=atoi(value);
+
   clearProperties();
 }
 
@@ -114,6 +121,10 @@ static void stemlab_cb(GtkToggleButton *widget, gpointer data) {
 }
 #endif
 
+static void autostart_cb(GtkToggleButton *widget, gpointer data) {
+  autostart=gtk_toggle_button_get_active(widget);
+}
+
 void configure_protocols(GtkWidget *parent) {
   int row;
 
@@ -161,6 +172,13 @@ void configure_protocols(GtkWidget *parent) {
   row++;
 #endif
 
+  GtkWidget *b_autostart=gtk_check_button_new_with_label("Auto start if only one device");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_autostart), autostart);
+  gtk_widget_show(b_autostart);
+  g_signal_connect(b_autostart,"toggled",G_CALLBACK(autostart_cb),NULL);
+  gtk_grid_attach(GTK_GRID(grid),b_autostart,0,row,1,1);
+  row++;
+
   gtk_container_add(GTK_CONTAINER(content),grid);
 
   gtk_widget_show_all(dialog);

diff --git a/protocols.h b/protocols.h
index d4618ff1077b31a6eba8d2a5df2a12155d5873f8..2034b1197e0a826cdf136d56df78668820db88ae 100644 (file)
--- a/protocols.h
+++ b/protocols.h
@@ -23,8 +23,9 @@ extern gboolean enable_protocol_2;
 extern gboolean enable_soapy_protocol;
 #endif
 #ifdef STEMLAB_DISCOVERY
-gboolean enable_stemlab;
+extern gboolean enable_stemlab;
 #endif
+extern gboolean autostart
 
 extern void protocols_save_state();
 extern void protocols_restore_state();