second-last step in the "big merge"

diff --git a/Makefile b/Makefile
index 8d27d2bc514e90aed8e2fd2d4c34ab42c1e28963..4ce22b9bbade2e186e9265bfde57eabe610eb9f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -122,17 +122,21 @@ PTT_OPTIONS=-D PTT
 endif
 
 ifeq ($(GPIO_INCLUDE),GPIO)
-  GPIO_OPTIONS=-D GPIO
-  GPIO_LIBS=-lwiringPi
-  GPIO_SOURCES= \
+GPIOD_VERSION=$(shell pkg-config --modversion libgpiod)
+ifeq ($(GPIOD_VERSION),1.2)
+GPIOD_OPTIONS=-D OLD_GPIOD
+endif
+GPIO_OPTIONS=-D GPIO
+GPIO_LIBS=-lwiringPi
+GPIO_SOURCES= \
   configure.c \
   i2c.c \
   encoder_menu.c
-  GPIO_HEADERS= \
+GPIO_HEADERS= \
   configure.h \
   i2c.h \
   encoder_menu.h
-  GPIO_OBJS= \
+GPIO_OBJS= \
   configure.o \
   i2c.o \
   encoder_menu.o
@@ -310,6 +314,8 @@ ext.c \
 error_handler.c \
 cwramp.c \
 protocols.c \
+css.c \
+actions.c \
 switch_menu.c \
 gpio.c
 
@@ -381,6 +387,8 @@ led.h \
 ext.h \
 error_handler.h \
 protocols.h \
+css.h \
+actions.h \
 switch_menu.h \
 gpio.h
 
@@ -451,6 +459,8 @@ ext.o \
 error_handler.o \
 cwramp.o \
 protocols.o \
+css.o \
+actions.o \
 switch_menu.o \
 gpio.o
 

diff --git a/actions.c b/actions.c
new file mode 100644 (file)
index 0000000..6d4177f
--- /dev/null
+++ b/actions.c
@@ -0,0 +1,3 @@
+/*
+ * This file left empty intentionally
+ */

diff --git a/actions.h b/actions.h
new file mode 100644 (file)
index 0000000..6d4177f
--- /dev/null
+++ b/actions.h
@@ -0,0 +1,3 @@
+/*
+ * This file left empty intentionally
+ */

diff --git a/css.c b/css.c
new file mode 100644 (file)
index 0000000..c8b9ae3
--- /dev/null
+++ b/css.c
@@ -0,0 +1,26 @@
+#include <gtk/gtk.h>
+
+char *css=
+"  #small {\n"
+"    padding: 0;\n"
+"    font-family: Sans;\n"
+"    font-size: 12px;\n"
+"    }\n"
+;
+
+void load_css() {
+  GtkCssProvider *provider;
+  GdkDisplay *display;
+  GdkScreen *screen;
+
+  g_print("%s\n",__FUNCTION__);
+  provider = gtk_css_provider_new ();
+  display = gdk_display_get_default ();
+  screen = gdk_display_get_default_screen (display);
+  gtk_style_context_add_provider_for_screen (screen,
+                                             GTK_STYLE_PROVIDER(provider),
+                                             GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+  gtk_css_provider_load_from_data(provider, css, -1, NULL);
+  g_object_unref (provider);
+}

diff --git a/discovery.c b/discovery.c
index d6e9ab78ad539668bd059f20988d78ad5689a37b..ef8011461fa0bac74e2e8dd058bbb0172b5c6aae 100644 (file)
--- a/discovery.c
+++ b/discovery.c
@@ -44,6 +44,7 @@
 #endif
 #include "ext.h"
 #ifdef GPIO
+#include "actions.h"
 #include "gpio.h"
 #include "configure.h"
 #endif

diff --git a/exit_menu.c b/exit_menu.c
index 0ba81a3a7e5481f9cb52d3220aff4b4bf9678af0..8811ed71530486717496cb0b2330caa4b2f29b7f 100644 (file)
--- a/exit_menu.c
+++ b/exit_menu.c
@@ -32,6 +32,7 @@
 #ifdef SOAPYSDR
 #include "soapy_protocol.h"
 #endif
+#include "actions.h"
 #include "gpio.h"
 
 static GtkWidget *parent_window=NULL;

diff --git a/main.c b/main.c
index ec18f8ac783511830d836f9d127060f8a7656bdc..4fb2ced1c7304ecc151b3197f843ad4127f504cb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -41,8 +41,11 @@
 #include "main.h"
 #include "channel.h"
 #include "discovered.h"
+#ifdef GPIO
+#include "actions.h"
 #include "configure.h"
 #include "gpio.h"
+#endif
 #include "wdsp.h"
 #include "new_menu.h"
 #include "radio.h"
@@ -177,6 +180,10 @@ static int init(void *data) {
 
   audio_get_cards();
 
+  // wait for get_cards to complete
+  //g_mutex_lock(&audio_mutex);
+  //g_mutex_unlock(&audio_mutex);
+
   cursor_arrow=gdk_cursor_new(GDK_ARROW);
   cursor_watch=gdk_cursor_new(GDK_WATCH);
 

diff --git a/main.h b/main.h
index 91bf17eadcf0d7349c351d6fc10019e72583e925..bf1e33fda8d82bf17df14b88d21cfb2b62270e59 100644 (file)
--- a/main.h
+++ b/main.h
@@ -24,7 +24,7 @@
 extern struct utsname unameData;
 
 enum {
-  NO_CONTROLLER=0,
+  NO_CONTROLLER,
   CONTROLLER1,
   CONTROLLER2_V1,
   CONTROLLER2_V2

diff --git a/new_menu.c b/new_menu.c
index c732a504b759c147a0277ccced9e417343ed0d5c..b8311cbc210a748cee68c39344acc1bb30009fb6 100644 (file)
--- a/new_menu.c
+++ b/new_menu.c
@@ -57,7 +57,10 @@
 #include "vfo_menu.h"
 #include "fft_menu.h"
 #include "main.h"
+#ifdef GPIO
 #include "gpio.h"
+#include "actions.h"
+#endif
 #include "old_protocol.h"
 #include "new_protocol.h"
 #ifdef CLIENT_SERVER
@@ -590,6 +593,12 @@ void new_menu()
 
     switch(controller) {
       case NO_CONTROLLER:
+       {
+        GtkWidget *switches_b=gtk_button_new_with_label("Switches");
+        g_signal_connect (switches_b, "button-press-event", G_CALLBACK(switch_cb), NULL);
+        gtk_grid_attach(GTK_GRID(grid),switches_b,(i%5),i/5,1,1);
+        i++;
+        }
         break;
       case CONTROLLER1:
       case CONTROLLER2_V1:

diff --git a/radio_menu.c b/radio_menu.c
index dfea4cb9afec9f1812965d8548fdf65d261a3071..8145b7df28562d78aaaecf3318393ae2ede395b1 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -39,7 +39,10 @@
 #ifdef SOAPYSDR
 #include "soapy_protocol.h"
 #endif
+#ifdef GPIO
+#include "actions.h"
 #include "gpio.h"
+#endif
 #include "vfo.h"
 #include "ext.h"
 #ifdef CLIENT_SERVER

diff --git a/switch_menu.c b/switch_menu.c
index 19db8372c8fe07392398b547ff504d6e56c643b4..68b71c25e488a2701579616f31bb775ab9691c1f 100644 (file)
--- a/switch_menu.c
+++ b/switch_menu.c
@@ -134,7 +134,13 @@ void switch_menu(GtkWidget *parent) {
   col=0;
 
   switch(controller) {
-    default:
+    case NO_CONTROLLER:
+      // Nothing to do in this pihpsdr version
+      {
+      GtkWidget *text_w=gtk_label_new("Nothing to do here with the  'No Controller' option!     ");
+      gtk_grid_attach(GTK_GRID(grid),text_w,1,1,3,1);
+      col++;
+      }
       break;
     case CONTROLLER1:
       {

diff --git a/toolbar.h b/toolbar.h
index 5a1b8879783cb419a0b82ae981cf0e84af8281f6..bc544963cb43c3bb92f8754984fea07c8c12f071 100644 (file)
--- a/toolbar.h
+++ b/toolbar.h
@@ -20,11 +20,11 @@
 #ifndef _TOOLBAR_H
 #define _TOOLBAR_H
 
+#include "gpio.h"
 #define MAX_FUNCTION 5
 
 extern int function;
 
-
 void update_toolbar_labels();
 void ptt_update(int state);
 void mox_update(int state);

diff --git a/tx_panadapter.c b/tx_panadapter.c
index 217460422b6286b927520dc40869e7cf0a7b079b..8c272c69cbb401a09c9476a7dc78349812932e3b 100644 (file)
--- a/tx_panadapter.c
+++ b/tx_panadapter.c
@@ -35,6 +35,7 @@
 #include "tx_panadapter.h"
 #include "vfo.h"
 #include "mode.h"
+#include "actions.h"
 #ifdef GPIO
 #include "gpio.h"
 #endif