Small changes.

diff --git a/Makefile b/Makefile
index 5dc4cfd04a509853fe0ec1e1a34cabfcc7142507..3157f98b1ed54889afbd8ad3a980c64af655b61e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,10 @@ LOCALCW_HEADERS= iambic.h
 LOCALCW_OBJS   = iambic.o
 endif
 
+ifeq ($(UNAME_S), Darwin)
+GPIO_INCLUDE=
+endif
+
 ifeq ($(GPIO_INCLUDE),GPIO)
 GPIO_OPTIONS=-D GPIO
 GPIOD_VERSION=$(shell pkg-config --modversion libgpiod)

diff --git a/midi2.c b/midi2.c
index a5dc7d24b8b77b8a041c55b24282109c66769823..e23a1bb047ffca9bf410bfad9126198d7442557d 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -57,21 +57,7 @@ void NewMidiEvent(enum MIDIevent event, int channel, int note, int val) {
            // Found matching entry
            switch (desc->event) {
                case MIDI_NOTE:
-                    if (desc->type == MIDI_KEY) {
-                      switch (desc->action) {
-                        case CW_LEFT:
-                        case CW_RIGHT:
-                        case CW_KEYER:
-                        case PTT:
-                          // deliver message for note-on and note-off
-                          DoTheMidi(desc->action, desc->type, val);
-                          break;
-                        default:
-                          // deliver only note-on messages
-                          if (val == 1) DoTheMidi(desc->action, desc->type, val);
-                          break;
-                      }
-                    }
+                    DoTheMidi(desc->action, desc->type, val);
                     break;
                case MIDI_CTRL:
                    if (desc->type == MIDI_KNOB) {

diff --git a/new_menu.c b/new_menu.c
index 4eebec4133ae0ba8c6a85d733dad6ebee63353a7..29d8b9f4b46bac0e7535795daadce4e0451e5c55 100644 (file)
--- a/new_menu.c
+++ b/new_menu.c
@@ -501,12 +501,12 @@ void new_menu()
     {
       GtkWidget *restart_b=gtk_button_new_with_label("Restart");
       g_signal_connect (restart_b, "button-press-event", G_CALLBACK(restart_cb), NULL);
-      gtk_grid_attach(GTK_GRID(grid),restart_b,2,0,2,1);
+      gtk_grid_attach(GTK_GRID(grid),restart_b,2,0,1,1);
     }
 
     GtkWidget *exit_b=gtk_button_new_with_label("Exit piHPSDR");
     g_signal_connect (exit_b, "button-press-event", G_CALLBACK(exit_cb), NULL);
-    gtk_grid_attach(GTK_GRID(grid),exit_b,4,0,2,1);
+    gtk_grid_attach(GTK_GRID(grid),exit_b,3,0,2,1);
 
     i=5;
 

diff --git a/radio.c b/radio.c
index 0a4b918b8bb935b65e33909bafab50c9a33eb5cf..d53b766f29780496444acd0e533f8331e2f1cd11 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -689,7 +689,7 @@ void start_radio() {
   protocol=radio->protocol;
   device=radio->device;
 
-  // init atlas_penelop flag
+  // init atlas_penelope flag
   atlas_penelope = 0;  // default: no penelope
   if (protocol == ORIGINAL_PROTOCOL && device == DEVICE_METIS) {
     //
@@ -1122,6 +1122,12 @@ void start_radio() {
 
   iqswap=0;
 
+//
+// In most cases, ALEX is the best default choice for the filter board.
+// here we set filter_board to a different default value for some
+// "special" hardware. The choice made here only applies if the filter_board
+// is not specified in the props fil
+//
 #ifdef SOAPYSDR
   if(device==SOAPYSDR_USB_DEVICE) {
     iqswap=1;
@@ -1130,6 +1136,15 @@ void start_radio() {
   }
 #endif
 
+  if ((protocol == ORIGINAL_PROTOCOL && device == DEVICE_HERMES_LITE2) ||
+      (protocol == NEW_PROTOCOL && device == NEW_DEVICE_HERMES_LITE2))  {
+    filter_board = N2ADR;
+  }
+
+  if (protocol == ORIGINAL_PROTOCOL && device == DEVICE_STEMLAB) {
+    filter_board = CHARLY25;
+  }
+
   /*
   adc_attenuation[0]=0;
   adc_attenuation[1]=0;