Manual merge with John's update

diff --git a/Makefile b/Makefile
index 651843a0c6cd9f8ffa140aa6b8f70d6452a5d7b2..f852ff2825e017b5d5ebd8366ccc550b35c8511f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ PURESIGNAL_INCLUDE=PURESIGNAL
 # USBOZY_INCLUDE=USBOZY
 
 # uncomment the line to below include support local CW keyer
-#LOCALCW_INCLUDE=LOCALCW
+LOCALCW_INCLUDE=LOCALCW
 
 # uncomment the line below for SoapySDR
 #SOAPYSDR_INCLUDE=SOAPYSDR

diff --git a/action_dialog.c b/action_dialog.c
index a60fd71eee5170fa418e9c0cd813c216887d2aa3..f60063d685ced1b704e991c2f0d997a32bf81629 100644 (file)
--- a/action_dialog.c
+++ b/action_dialog.c
@@ -7,6 +7,7 @@ typedef struct _choice {
   int action;
   GtkWidget *button;
   gulong signal_id;
+  struct _choice *previous;
 } CHOICE;
 
 static GtkWidget *dialog;
@@ -26,6 +27,8 @@ static void action_select_cb(GtkWidget *widget,gpointer data) {
 
 int action_dialog(GtkWidget *parent,int filter,int currentAction) {
   int i,j;
+  CHOICE *previous=NULL;
+  CHOICE *choice=NULL;
 
   action=currentAction;
   previous_button=NULL;
@@ -44,15 +47,18 @@ int action_dialog(GtkWidget *parent,int filter,int currentAction) {
   for(i=0;i<ACTIONS;i++) {
     if((ActionTable[i].type&filter) || (ActionTable[i].type==TYPE_NONE)) {
       GtkWidget *button=gtk_toggle_button_new_with_label(ActionTable[i].str);
-      gtk_widget_set_name(button,"small_button");
+      gtk_widget_set_name(button,"small_toggle_button");
       gtk_grid_attach(GTK_GRID(grid),button,j%GRID_WIDTH,j/GRID_WIDTH,1,1);
       if(ActionTable[i].action==currentAction) {
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),TRUE);
       }
-      CHOICE *choice=g_new0(CHOICE,1);
+      choice=g_new0(CHOICE,1);
       choice->action=i;
       choice->button=button;
       choice->signal_id=g_signal_connect(button,"toggled",G_CALLBACK(action_select_cb),choice);
+      choice->previous=previous;
+      previous=choice;
+
       if(ActionTable[i].action==currentAction) {
         previous_button=button;
         previous_signal_id=choice->signal_id;
@@ -68,6 +74,12 @@ int action_dialog(GtkWidget *parent,int filter,int currentAction) {
   if(result!=GTK_RESPONSE_ACCEPT) {
     action=currentAction;
   }
+  // free up choice structures
+  while(previous!=NULL) {
+    choice=previous;
+    previous=choice->previous;
+    g_free(choice);
+  }
   return action;
 }
 

diff --git a/actions.c b/actions.c
index 370c76e6231c01c1de8f0bc380748eb1852818ad..dceff4f70aac35553968dca721cfa6e147ae9eb4 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -183,6 +183,21 @@ ACTION_TABLE ActionTable[] = {
   {ACTIONS,            "",                     NULL,           TYPE_NONE}
 };
 
+static gint timer=0;
+static gboolean timer_released;
+
+static int timeout_cb(gpointer data) {
+  if(timer_released) {
+    g_free(data);
+    timer=0;
+    return FALSE;
+  }
+  // process the action;
+  process_action(data);
+  return TRUE;
+}
+
+
 
 int process_action(void *data) {
   PROCESS_ACTION *a=(PROCESS_ACTION *)data;
@@ -194,8 +209,9 @@ int process_action(void *data) {
   FILTER *filter;
   int new_val;
   int i;
+  gboolean free_action=TRUE;
 
-  g_print("%s: action=%d mode=%d value=%d\n",__FUNCTION__,a->action,a->mode,a->val);
+  //g_print("%s: action=%d mode=%d value=%d\n",__FUNCTION__,a->action,a->mode,a->val);
   switch(a->action) {
 
     case A_SWAP_B:
@@ -956,11 +972,25 @@ int process_action(void *data) {
     case RIT_MINUS:
       if(a->mode==PRESSED) {
         vfo_rit(active_receiver->id,-1);
+       if(timer==0) {
+         timer=g_timeout_add(250,timeout_cb,a);
+         timer_released=FALSE;
+       }
+       free_action=FALSE;
+      } else {
+       timer_released=TRUE;
       }
       break;
     case RIT_PLUS:
       if(a->mode==PRESSED) {
         vfo_rit(active_receiver->id,1);
+       if(timer==0) {
+         timer=g_timeout_add(250,timeout_cb,a);
+         timer_released=FALSE;
+       }
+       free_action=FALSE;
+      } else {
+       timer_released=TRUE;
       }
       break;
     case RIT_RX1:
@@ -1193,6 +1223,7 @@ int process_action(void *data) {
         value=10000.0;
       }
       transmitter->xit=(int)value;
+      transmitter->xit_enabled=(value!=0);
       if(protocol==NEW_PROTOCOL) {
         schedule_high_priority();
       }
@@ -1202,6 +1233,10 @@ int process_action(void *data) {
       if(a->mode==PRESSED) {
         if(can_transmit) {
           transmitter->xit=0;
+          transmitter->xit_enabled=0;
+          if(protocol==NEW_PROTOCOL) {
+            schedule_high_priority();
+          }
           g_idle_add(ext_vfo_update, NULL);
         }
       }
@@ -1228,6 +1263,7 @@ int process_action(void *data) {
             value=10000.0;
           }
           transmitter->xit=(int)value;
+         transmitter->xit_enabled=(value!=0);
           if(protocol==NEW_PROTOCOL) {
             schedule_high_priority();
           }
@@ -1246,6 +1282,7 @@ int process_action(void *data) {
             value=10000.0;
           }
           transmitter->xit=(int)value;
+         transmitter->xit_enabled=(value!=0);
           if(protocol==NEW_PROTOCOL) {
             schedule_high_priority();
           }
@@ -1275,7 +1312,9 @@ int process_action(void *data) {
       }
       break;
   }
-  g_free(data);
+  if(free_action) {
+    g_free(data);
+  }
   return 0;
 }
 

diff --git a/css.c b/css.c
index 810492ca70e5d6ef9254584e0ed4093b627b60f5..16bfd7b309186c0b212a8477372ec5798b81485a 100644 (file)
--- a/css.c
+++ b/css.c
@@ -2,11 +2,28 @@
 #include "css.h"
 
 char *css=
+"  @define-color TOGGLE_ON rgb(100%,0%,0%);\n"
+"  @define-color TOGGLE_OFF rgb(70%,70%,70%);\n"
 "  #small_button {\n"
 "    padding: 0;\n"
 "    font-family: Sans;\n"
 "    font-size: 15px;\n"
 "    }\n"
+"  #small_toggle_button {\n"
+"    padding: 0;\n"
+"    font-family: Sans;\n"
+"    font-size: 15px;\n"
+"    background-image: none;\n"
+"    background-color: @TOGGLE_OFF;\n"
+"    }\n"
+"  #small_toggle_button:checked {\n"
+"    padding: 0;\n"
+"    font-family: Sans;\n"
+"    font-size: 15px;\n"
+"    background-image: none;\n"
+"    background-color: @TOGGLE_ON;\n"
+"    }\n"
+
 ;
 
 void load_css() {

diff --git a/encoder_menu.c b/encoder_menu.c
index 2c1220f8059659759fdb2dc76a55ba65fedad0e9..66b6b2fa2bc64925d19dc6e5744af6928d4e4196 100644 (file)
--- a/encoder_menu.c
+++ b/encoder_menu.c
@@ -37,14 +37,6 @@
 #include "gpio.h"
 #include "i2c.h"
 
-typedef struct _choice {
-  int id;
-  int action;
-  GtkWidget *initial_button;
-  GtkWidget *button;
-  gulong signal_id;
-} CHOICE;
-
 static GtkWidget *parent_window=NULL;
 
 static GtkWidget *dialog=NULL;

diff --git a/main.c b/main.c
index d964e7f3e0eaf2befdf0de5e5de7639e3d3c90a3..15b031b218d2b0c3644adcc9bc89a76d86feb451 100644 (file)
--- a/main.c
+++ b/main.c
@@ -176,6 +176,7 @@ gboolean main_delete (GtkWidget *widget) {
 
 static int init(void *data) {
   char wisdom_directory[1024];
+  int counter;
 
   g_print("%s\n",__FUNCTION__);
 
@@ -198,11 +199,18 @@ static int init(void *data) {
   //
   char *c=getcwd(wisdom_directory, sizeof(wisdom_directory));
   strcpy(&wisdom_directory[strlen(wisdom_directory)],"/");
-  fprintf(stderr,"Securing wisdom file in directory: %s\n", wisdom_directory);
-  status_text("Creating FFTW Wisdom file ...");
+  g_print("Securing wisdom file in directory: %s\n", wisdom_directory);
   wisdom_running=1;
+  counter=0;
   pthread_create(&wisdom_thread_id, NULL, wisdom_thread, wisdom_directory);
   while (wisdom_running) {
+      if (counter++ < 10) {
+        status_text("Checking FFTW Wisdom file ...");
+      } else {
+       // if it takes longer than 1 sec, assume that WDSP
+       // is (re-) creating the wisdom file
+        status_text("Creating FFTW Wisdom file ...");
+      }
       // wait for the wisdom thread to complete, meanwhile
       // handling any GTK events.
       usleep(100000); // 100ms

diff --git a/midi3.c b/midi3.c
index 55b3c4d8eaea056b4ceea4dfcef302776555749f..ab72d757d33dc870bd53574a9c4f1c395278d5f7 100644 (file)
--- a/midi3.c
+++ b/midi3.c
@@ -35,13 +35,22 @@ void DoTheMidi(int action, enum ACTIONtype type, int val) {
     int    *ip;
     PROCESS_ACTION *a;
 
-    g_print("%s: action=%d type=%d val=%d\n",__FUNCTION__,action,type,val);
+    //g_print("%s: action=%d type=%d val=%d\n",__FUNCTION__,action,type,val);
 
-    //
-    // CW actions are time-critical, so they are handled HERE
-    // instead of invoking the GTK idle queue
-    //
-    if (action == CW_KEYER) {
+    switch(type) {
+      case MIDI_KEY:
+       //
+       // CW_LEFT, CW_RIGHT, and CW_KEYER have to be handled with
+       // minimum latency, so these are not put to the GTK idle queue
+       // but rather handled immediately
+       //
+       if(action==CW_LEFT || action==CW_RIGHT) {
+#ifdef LOCALCW
+         keyer_event(action==CW_LEFT,val);
+#else
+         g_print("MIDI CW key but compiled without LOCALCW\n");
+#endif
+        } else if (action == CW_KEYER) {
           //
           // This is a CW key-up/down which uses functions from the keyer
           // that by-pass the interrupt-driven standard action.
@@ -63,24 +72,12 @@ void DoTheMidi(int action, enum ACTIONtype type, int val) {
             cw_key_down=0;
             cw_key_up=0;
           }
-          return;
-    }
-#ifdef LOCALCW  
-    if (action == CW_LEFT) {
-       keyer_event(1, val);
-       return;
-    }
-    if (action == CW_RIGHT) {
-       keyer_event(0, val);
-       return;
-    }
-#endif
-    switch(type) {
-      case MIDI_KEY:
-        a=g_new(PROCESS_ACTION,1);
-        a->action=action;
-        a->mode=val?PRESSED:RELEASED;
-        g_idle_add(process_action,a);
+       } else {
+         a=g_new(PROCESS_ACTION,1);
+         a->action=action;
+         a->mode=val?PRESSED:RELEASED;
+         g_idle_add(process_action,a);
+       }
        break;
       case MIDI_KNOB:
         a=g_new(PROCESS_ACTION,1);

diff --git a/new_protocol.c b/new_protocol.c
index b4f4e370c65a732d6c660d20f268c7003b1d2e43..8b9d479a0b21531b1121c50a379940a1fc7a79aa 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -782,6 +782,8 @@ static void new_protocol_high_priority() {
           }
         }
 
+       rxFrequency+=calibration;
+
         phase=(long)((4294967296.0*(double)rxFrequency)/122880000.0);
         high_priority_buffer_to_radio[ 9]=phase>>24;
         high_priority_buffer_to_radio[10]=phase>>16;
@@ -813,6 +815,8 @@ static void new_protocol_high_priority() {
             }
           }
 
+         rxFrequency+=calibration;
+
          phase=(long)((4294967296.0*(double)rxFrequency)/122880000.0);
          high_priority_buffer_to_radio[9+(ddc*4)]=phase>>24;
          high_priority_buffer_to_radio[10+(ddc*4)]=phase>>16;
@@ -839,6 +843,8 @@ static void new_protocol_high_priority() {
       }
     }
 
+    txFrequency+=calibration;
+
     phase=(long)((4294967296.0*(double)txFrequency)/122880000.0);
 
     if(isTransmitting() && transmitter->puresignal) {

diff --git a/old_protocol.c b/old_protocol.c
index 91c9332f9d87c5c9bc317c6d18ee91364c913f51..c3f04b34de6aabf89c28c82a4dd9dc52a12582ae 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -761,6 +761,7 @@ static long long channel_freq(int chan) {
       }
     }
   }
+  freq+=calibration;
   return freq;
 }
 

diff --git a/pulseaudio.c b/pulseaudio.c
index d62c2bd44546af3cfcc5ad1070a635b51cb192cb..7670ed9fbd78def75dfba295f7b48d1b463f0dd7 100644 (file)
--- a/pulseaudio.c
+++ b/pulseaudio.c
@@ -333,6 +333,7 @@ float audio_get_next_mic_sample() {
   g_mutex_lock(&audio_mutex);
   if ((mic_ring_buffer == NULL) || (mic_ring_read_pt == mic_ring_write_pt)) {
     // no buffer, or nothing in buffer: insert silence
+    //g_print("%s: no samples\n",__FUNCTION__);
     sample=0.0;
   } else {
     newpt = mic_ring_read_pt+1;

diff --git a/radio.c b/radio.c
index 3be79cf80230447019a901acf8c0ac57217a5f08..0a4b918b8bb935b65e33909bafab50c9a33eb5cf 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -108,6 +108,9 @@ static GtkWidget *panadapter;
 static GtkWidget *waterfall;
 static GtkWidget *audio_waterfall;
 
+// RX and TX calibration
+long long calibration=0LL;
+
 /*
 #ifdef GPIO
 static GtkWidget *encoders;
@@ -2132,8 +2135,11 @@ g_print("radioRestoreState: %s\n",property_path);
     value=getProperty("binaural");
     if(value) binaural=atoi(value);
 
+    value=getProperty("calibration");
+    if(value) calibration=atoll(value);
+
     value=getProperty("frequencyB");
-    if(value) frequencyB=atol(value);
+    if(value) frequencyB=atoll(value);
 
     value=getProperty("modeB");
     if(value) modeB=atoi(value);
@@ -2483,6 +2489,9 @@ g_print("radioSaveState: %s\n",property_path);
     sprintf(value,"%d",binaural);
     setProperty("binaural",value);
 
+    sprintf(value,"%lld",calibration);
+    setProperty("calibration",value);
+
     sprintf(value,"%lld",frequencyB);
     setProperty("frequencyB",value);
     sprintf(value,"%d",modeB);

diff --git a/radio.h b/radio.h
index 93236e342e9d108614efa7f7d8c5c0ffbbafdda5..997af97721a540d6a89efdc2a3b2a49b71cddb11 100644 (file)
--- a/radio.h
+++ b/radio.h
@@ -74,6 +74,8 @@ extern gboolean radio_is_remote;
 
 extern GtkWidget *fixed;
 
+extern long long calibration;
+
 extern char property_path[];
 
 #define NONE 0

diff --git a/radio_menu.c b/radio_menu.c
index 752e5d22565465e23132a3a3c8d3424058c5dfed..b55ecf3b4cc2663dc00973030be0a7511c7593a7 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -167,6 +167,10 @@ static void dac0_gain_value_changed_cb(GtkWidget *widget, gpointer data) {
 */
 #endif
 
+static void calibration_value_changed_cb(GtkWidget *widget, gpointer data) {
+  calibration=(long long)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+}
+
 static void rx_gain_calibration_value_changed_cb(GtkWidget *widget, gpointer data) {
   rx_gain_calibration=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 }
@@ -429,8 +433,10 @@ void radio_menu(GtkWidget *parent) {
   GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
   GtkWidget *grid=gtk_grid_new();
-  gtk_grid_set_column_spacing (GTK_GRID(grid),10);
+  gtk_grid_set_column_spacing (GTK_GRID(grid),5);
   gtk_grid_set_row_spacing (GTK_GRID(grid),5);
+  gtk_grid_set_column_homogeneous (GTK_GRID(grid), FALSE);
+  gtk_grid_set_row_homogeneous (GTK_GRID(grid), FALSE);
 
   int col=0;
   int row=0;
@@ -822,9 +828,20 @@ void radio_menu(GtkWidget *parent) {
   g_signal_connect(mute_rx_b,"toggled",G_CALLBACK(mute_rx_cb),NULL);
 
   row++;
+  col=0;
+
+  GtkWidget *calibration_label=gtk_label_new(NULL);
+  gtk_label_set_markup(GTK_LABEL(calibration_label), "<b>Frequency\nCalibration(Hz):</b>");
+  gtk_grid_attach(GTK_GRID(grid),calibration_label,col,row,1,1);
+  col++;
+
+  GtkWidget *calibration_b=gtk_spin_button_new_with_range(-10000.0,10000.0,1.0);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(calibration_b),(double)calibration);
+  gtk_grid_attach(GTK_GRID(grid),calibration_b,col,row,1,1);
+  g_signal_connect(calibration_b,"value_changed",G_CALLBACK(calibration_value_changed_cb),NULL);
 
   if(have_rx_gain) {
-    col=0;
+    col++;
     GtkWidget *rx_gain_label=gtk_label_new(NULL);
     gtk_label_set_markup(GTK_LABEL(rx_gain_label), "<b>RX Gain Calibration:</b>");
     gtk_grid_attach(GTK_GRID(grid),rx_gain_label,col,row,1,1);
@@ -844,8 +861,8 @@ void radio_menu(GtkWidget *parent) {
         g_signal_connect(PA_enable_b,"toggled",G_CALLBACK(PA_enable_cb),NULL);
     }
 
-    row++;
   }
+  row++;
 
   if(row>temp_row) temp_row=row;
 

diff --git a/switch_menu.c b/switch_menu.c
index 16d479e39808cc834e9465f61db7381d7e6fd6b1..94bee0dd9b33ac30b06b195aaa9fa052a8609351 100644 (file)
--- a/switch_menu.c
+++ b/switch_menu.c
@@ -38,14 +38,6 @@
 #include "gpio.h"
 #include "i2c.h"
 
-typedef struct _choice {
-  int sw;
-  int action;
-  GtkWidget *initial_button;
-  GtkWidget *button;
-  gulong signal_id;
-} CHOICE;
-
 static GtkWidget *parent_window=NULL;
 
 static GtkWidget *dialog=NULL;

diff --git a/toolbar_menu.c b/toolbar_menu.c
index 0297e363c21d6ae04e9968b9c71af73b0fb47e6f..4dd2cc5eed46c9b5e4a0f4cd9d43e526ca17cc3b 100644 (file)
--- a/toolbar_menu.c
+++ b/toolbar_menu.c
@@ -39,14 +39,6 @@
 #include "gpio.h"
 #include "i2c.h"
 
-typedef struct _choice {
-  int sw;
-  int action;
-  GtkWidget *initial_button;
-  GtkWidget *button;
-  gulong signal_id;
-} CHOICE;
-
 static GtkWidget *parent_window=NULL;
 
 static GtkWidget *dialog=NULL;
@@ -135,7 +127,6 @@ next_function_set:
     } else {
       widget=gtk_button_new_with_label(ActionTable[temp_switches[i].switch_function].str);
       g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(i));
-g_print("%s: %d\n",__FUNCTION__,i);
     }
     gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
     col++;

diff --git a/vfo.c b/vfo.c
index 7935ff7b3e1b32f8722ad942aaff65637ba46edf..8a5e6b6d556952fc5327f2feea791b3aa9961013 100644 (file)
--- a/vfo.c
+++ b/vfo.c
@@ -1457,6 +1457,7 @@ void vfo_rit_update(int rx) {
 
 void vfo_rit_clear(int rx) {
   vfo[receiver[rx]->id].rit=0;
+  vfo[receiver[rx]->id].rit_enabled=0;
   receiver_frequency_changed(receiver[rx]);
   g_idle_add(ext_vfo_update, NULL);
 }
@@ -1469,7 +1470,8 @@ void vfo_rit(int rx,int i) {
   } else if(value>10000.0) {
     value=10000.0;
   }
-  vfo[receiver[rx]->id].rit=(int)value;
+  vfo[receiver[rx]->id].rit=value;
+  vfo[receiver[rx]->id].rit_enabled=(value!=0);
   receiver_frequency_changed(receiver[rx]);
   g_idle_add(ext_vfo_update,NULL);
 }