Manual merge-in from John: FrequencyCalibration

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/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/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/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);
 }