From ea89b0843d87eac64f12213fb01afc1b9a23f677 Mon Sep 17 00:00:00 2001 From: John Melton G0ORX Date: Sun, 23 Feb 2020 17:48:48 +0000 Subject: [PATCH] Added ability to enable/disable protocols for discovery --- discovery.c | 45 ++++++++++---- protocols.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++ protocols.h | 31 ++++++++++ 3 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 protocols.c create mode 100644 protocols.h diff --git a/discovery.c b/discovery.c index ff175a8..5252ff0 100644 --- a/discovery.c +++ b/discovery.c @@ -53,6 +53,7 @@ #include "gpio.h" #include "configure.h" #endif +#include "protocols.h" static GtkWidget *discovery_dialog; static DISCOVERED *d; @@ -204,6 +205,11 @@ static gboolean midi_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) } #endif +static gboolean protocols_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { + configure_protocols(discovery_dialog); + return TRUE; +} + #ifdef GPIO static gboolean gpio_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { configure_gpio(discovery_dialog); @@ -252,6 +258,9 @@ static gboolean tcp_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) void discovery() { //fprintf(stderr,"discovery\n"); + + protocols_restore_state(); + selected_device=0; devices=0; @@ -288,23 +297,31 @@ void discovery() { #endif #ifdef STEMLAB_DISCOVERY + if(enable_stemlab) { #ifdef NO_AVAHI - status_text("Looking for STEMlab WEB apps"); + status_text("Looking for STEMlab WEB apps"); #else - status_text("STEMlab (Avahi) ... Discovering Devices"); + status_text("STEMlab (Avahi) ... Discovering Devices"); #endif - stemlab_discovery(); + stemlab_discovery(); + } #endif - status_text("Protocol 1 ... Discovering Devices"); - old_discovery(); + if(enable_protocol_1) { + status_text("Protocol 1 ... Discovering Devices"); + old_discovery(); + } - status_text("Protocol 2 ... Discovering Devices"); - new_discovery(); + if(enable_protocol_2) { + status_text("Protocol 2 ... Discovering Devices"); + new_discovery(); + } #ifdef SOAPYSDR - status_text("SoapySDR ... Discovering Devices"); - soapy_discovery(); + if(enable_soapy_protocol) { + status_text("SoapySDR ... Discovering Devices"); + soapy_discovery(); + } #endif status_text("Discovery"); @@ -532,9 +549,9 @@ fprintf(stderr,"%p Protocol=%d name=%s\n",d,d->protocol,d->name); g_signal_connect (discover_b, "button-press-event", G_CALLBACK(discover_cb), NULL); gtk_grid_attach(GTK_GRID(grid),discover_b,1,i,1,1); - GtkWidget *exit_b=gtk_button_new_with_label("Exit"); - g_signal_connect (exit_b, "button-press-event", G_CALLBACK(exit_cb), NULL); - gtk_grid_attach(GTK_GRID(grid),exit_b,2,i,1,1); + GtkWidget *protocols_b=gtk_button_new_with_label("Protocols"); + g_signal_connect (protocols_b, "button-press-event", G_CALLBACK(protocols_cb), NULL); + gtk_grid_attach(GTK_GRID(grid),protocols_b,2,i,1,1); #ifdef MIDI GtkWidget *midi_b=gtk_button_new_with_label("ImportMIDI"); @@ -559,6 +576,10 @@ fprintf(stderr,"%p Protocol=%d name=%s\n",d,d->protocol,d->name); gtk_grid_attach(GTK_GRID(grid),tcpaddr,2,i,1,1); gtk_entry_set_text(GTK_ENTRY(tcpaddr), ipaddr_tcp); + GtkWidget *exit_b=gtk_button_new_with_label("Exit"); + g_signal_connect (exit_b, "button-press-event", G_CALLBACK(exit_cb), NULL); + gtk_grid_attach(GTK_GRID(grid),exit_b,3,i,1,1); + gtk_container_add (GTK_CONTAINER (content), grid); gtk_widget_show_all(discovery_dialog); fprintf(stderr,"showing device dialog\n"); diff --git a/protocols.c b/protocols.c new file mode 100644 index 0000000..dca2a13 --- /dev/null +++ b/protocols.c @@ -0,0 +1,170 @@ +/* Copyright (C) +* 2020 - John Melton, G0ORX/N6LYT +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "protocols.h" +#include "property.h" + + +static GtkWidget *dialog; + +gboolean enable_protocol_1; +gboolean enable_protocol_2; +#ifdef SOAPYSDR +gboolean enable_soapy_protocol; +#endif +#ifdef STEMLAB_DISCOVERY +gboolean enable_stemlab; +#endif + +void protocols_save_state() { + char value[80]; + + clearProperties(); + sprintf(value,"%d",enable_protocol_1); + setProperty("enable_protocol_1",value); + sprintf(value,"%d",enable_protocol_2); + setProperty("enable_protocol_2",value); +#ifdef SOAPYSDR + sprintf(value,"%d",enable_soapy_protocol); + setProperty("enable_soapy_protocol",value); +#endif +#ifdef STEMLAB_DISCOVERY + sprintf(value,"%d",enable_stemlab); + setProperty("enable_stemlab",value); +#endif + + saveProperties("protocols.props"); + +} + +void protocols_restore_state() { + char *value; + + loadProperties("protocols.props"); + enable_protocol_1=TRUE; + value=getProperty("enable_protocol_1"); + if(value) enable_protocol_1=atoi(value); + enable_protocol_2=TRUE; + value=getProperty("enable_protocol_2"); + if(value) enable_protocol_2=atoi(value); +#ifdef SOAPYSDR + enable_soapy_protocol=TRUE; + value=getProperty("enable_soapy_protocol"); + if(value) enable_soapy_protocol=atoi(value); +#endif +#ifdef STEMLAB_DISCOVERY + enable_stemlab=TRUE; + value=getProperty("enable_stemlab"); + if(value) enable_stemlab=atoi(value); +#endif + clearProperties(); +} + +static gboolean close_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { + if(dialog!=NULL) { + protocols_save_state(); + gtk_widget_destroy(dialog); + } + return TRUE; +} + +static void protocol_1_cb(GtkToggleButton *widget, gpointer data) { + enable_protocol_1=gtk_toggle_button_get_active(widget); +} + +static void protocol_2_cb(GtkToggleButton *widget, gpointer data) { + enable_protocol_2=gtk_toggle_button_get_active(widget); +} + +#ifdef SOAPYSDR +static void soapy_protocol_cb(GtkToggleButton *widget, gpointer data) { + enable_soapy_protocol=gtk_toggle_button_get_active(widget); +} +#endif + +#ifdef STEMLAB_DISCOVERY +static void stemlab_cb(GtkToggleButton *widget, gpointer data) { + enable_stemlab=gtk_toggle_button_get_active(widget); +} +#endif + +void configure_protocols(GtkWidget *parent) { + int row; + + dialog=gtk_dialog_new_with_buttons("Protocols",GTK_WINDOW(parent),GTK_DIALOG_DESTROY_WITH_PARENT,NULL,NULL); + GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + GtkWidget *grid=gtk_grid_new(); + gtk_grid_set_row_homogeneous(GTK_GRID(grid),TRUE); + + row=0; + + GtkWidget *close_b=gtk_button_new_with_label("Close"); + g_signal_connect (close_b, "button_press_event", G_CALLBACK(close_cb), NULL); + gtk_grid_attach(GTK_GRID(grid),close_b,0,row,1,1); + row++; + + GtkWidget *b_enable_protocol_1=gtk_check_button_new_with_label("Enable Protocol 1"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_protocol_1), enable_protocol_1); + gtk_widget_show(b_enable_protocol_1); + g_signal_connect(b_enable_protocol_1,"toggled",G_CALLBACK(protocol_1_cb),NULL); + gtk_grid_attach(GTK_GRID(grid),b_enable_protocol_1,0,row,1,1); + row++; + + GtkWidget *b_enable_protocol_2=gtk_check_button_new_with_label("Enable Protocol 2"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_protocol_2), enable_protocol_2); + gtk_widget_show(b_enable_protocol_2); + g_signal_connect(b_enable_protocol_2,"toggled",G_CALLBACK(protocol_2_cb),NULL); + gtk_grid_attach(GTK_GRID(grid),b_enable_protocol_2,0,row,1,1); + row++; + +#ifdef SOAPYSDR + GtkWidget *b_enable_soapy_protocol=gtk_check_button_new_with_label("Enable SoapySDR Protocol"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_soapy_protocol), enable_soapy_protocol); + gtk_widget_show(b_enable_soapy_protocol); + g_signal_connect(b_enable_soapy_protocol,"toggled",G_CALLBACK(soapy_protocol_cb),NULL); + gtk_grid_attach(GTK_GRID(grid),b_enable_soapy_protocol,0,row,1,1); + row++; +#endif + +#ifdef STEMLAB_DISCOVERY + GtkWidget *b_enable_stemlab=gtk_check_button_new_with_label("Enable Stemlab"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_stemlab), enable_stemlab); + gtk_widget_show(b_enable_stemlab); + g_signal_connect(b_enable_stemlab,"toggled",G_CALLBACK(stemlab_cb),NULL); + gtk_grid_attach(GTK_GRID(grid),b_enable_stemlab,0,row,1,1); + row++; +#endif + + gtk_container_add(GTK_CONTAINER(content),grid); + + gtk_widget_show_all(dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + +} + diff --git a/protocols.h b/protocols.h new file mode 100644 index 0000000..d4618ff --- /dev/null +++ b/protocols.h @@ -0,0 +1,31 @@ +/* Copyright (C) +* 2020 - John Melton, G0ORX/N6LYT +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +*/ + +extern gboolean enable_protocol_1; +extern gboolean enable_protocol_2; +#ifdef SOAPYSDR +extern gboolean enable_soapy_protocol; +#endif +#ifdef STEMLAB_DISCOVERY +gboolean enable_stemlab; +#endif + +extern void protocols_save_state(); +extern void protocols_restore_state(); +extern void configure_protocols(GtkWidget *parent); -- 2.45.2