streamlined

diff --git a/Makefile b/Makefile
index 250d11dc49fd45494ff3baf487ba915b9eee66fe..396096f379e1deb2bce5d434edd6d1c84c2287cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,13 +44,12 @@ UNAME_N=raspberrypi
 #UNAME_N=jetsen
 
 # Additional options that can be chosen at compile time:
-# -DSPLIT_RXTX          if there is more than one receiver, TX panel only "hides" the first one
 # -DPROTOCOL_DEBUG      logs (on stderr) all state changes sent to the SDR (only old protocol)
 # -DDEBUG               activate general debug output
 #
 # leave the list empty if no such option should be used
 
-ADDITIONAL_OPTIONS=
+DEBUGL_OPTION=
 
 
 CC=gcc
@@ -206,7 +205,7 @@ AUDIO_LIBS=-lasound
 
 OPTIONS=-g -Wno-deprecated-declarations $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) $(I2C_OPTIONS) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) \
                $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) $(PSK_OPTIONS) $(STEMLAB_OPTIONS) $(STEMLAB_FIX_OPTION) \
-               -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(ADDITIONAL_OPTIONS) -O3
+               -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION) -O3
 
 LIBS=-lrt -lm -lwdsp -lpthread $(AUDIO_LIBS) $(USBOZY_LIBS) $(PSKLIBS) $(GTKLIBS) $(GPIO_LIBS) $(SOAPYSDRLIBS) $(FREEDVLIBS) $(STEMLAB_LIBS)
 INCLUDES=$(GTKINCLUDES)

diff --git a/Makefile.mac b/Makefile.mac
index f6142e04b228206e724ae3354bc679587b9a4138..a09b6f1947120a88cad10685f3803a72d196901f 100644 (file)
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -44,13 +44,12 @@ UNAME_N=raspberrypi
 #UNAME_N=jetsen
 
 # Additional options that can be chosen at compile time:
-# -DSPLIT_RXTX          if there is more than one receiver, TX panel only "hides" the first one
 # -DPROTOCOL_DEBUG     logs (on stderr) all state changes sent to the SDR (only old protocol)
 # -DDEBUG              activate debug output
 #
 # leave the list empty if no such option should be used
 
-ADDITIONAL_OPTIONS= -DSPLIT_RXTX
+DEBUG_OPTION=
 
 CC=gcc
 LINK=gcc
@@ -210,7 +209,7 @@ AUDIO_LIBS=-lportaudio
 
 OPTIONS=-g -Wno-deprecated-declarations $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) $(I2C_OPTIONS) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) \
                 $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) $(PSK_OPTIONS) $(STEMLAB_OPTIONS) $(STEMLAB_FIX_OPTION) \
-                -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(PORTAUDIO_OPTIONS) $(ADDITIONAL_OPTIONS) -O3
+                -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(PORTAUDIO_OPTIONS) $(DEBUG_OPTION) -O3
 
 LIBS=-lm -lwdsp -lpthread $(AUDIO_LIBS) $(USBOZY_LIBS) $(PSKLIBS) $(GTKLIBS) $(GPIO_LIBS) $(SOAPYSDRLIBS) $(FREEDVLIBS) $(STEMLAB_LIBS)
 INCLUDES=$(GTKINCLUDES)

diff --git a/new_menu.c b/new_menu.c
index dd5fed085333fc38d4cc30e9a9875f60986a509e..b362078f61d6eabb69d55fa65514563ea939dec8 100644 (file)
--- a/new_menu.c
+++ b/new_menu.c
@@ -372,19 +372,6 @@ static gboolean ps_cb (GtkWidget *widget, GdkEventButton *event, gpointer data)
   start_ps();
   return TRUE;
 }
-#else
-static gboolean tt_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) {
-  // even without PURESIGNAL, a two-tone generator is nice-to-have
-  // so whe "PS" button now is a "TT" (two-tone) button.
-  int state=transmitter->twotone?0:1;
-  tx_set_twotone(transmitter,state);
-  if(state) {
-    set_button_text_color(widget,"red");
-  } else {
-    set_button_text_color(widget,"black");
-  }
-  return TRUE;
-}
 #endif
 
 #ifdef GPIO
@@ -492,15 +479,6 @@ void new_menu()
       g_signal_connect (ps_b, "button-press-event", G_CALLBACK(ps_cb), NULL);
       gtk_grid_attach(GTK_GRID(grid),ps_b,(i%5),i/5,1,1);
       i++;
-#else
-      GtkWidget *tt_b=gtk_button_new_with_label("TT");
-      gtk_widget_show(tt_b);
-      gtk_grid_attach(GTK_GRID(grid),tt_b,(i%5),i/5,1,1);
-      g_signal_connect (tt_b, "pressed", G_CALLBACK(tt_cb), NULL);
-      if(transmitter->twotone) {
-        set_button_text_color(tt_b,"red");
-      }
-      i++;
 #endif
 
     GtkWidget *pa_b=gtk_button_new_with_label("PA");