Added subrx.

Rewrite of vfo.c amd radio_info.c using gtk widgets and css.

Author: g0orx

Makefile

@@ -26,7 +26,7 @@ AUDIO_LIBS=-lasound -lpulse-simple -lpulse -lpulse-mainloop-glib -lsoundio
 #	sudo apt-get install soapysdr-module-rtlsdr
 #	sudo apt-get install soapysdr-module-lms7
 #
-#SOAPYSDR_INCLUDE=SOAPYSDR
+SOAPYSDR_INCLUDE=SOAPYSDR
 
 ifeq ($(SOAPYSDR_INCLUDE),SOAPYSDR)
 SOAPYSDR_OPTIONS=-D SOAPYSDR
@@ -89,6 +89,7 @@ PROGRAM=linhpsdr
 
 SOURCES=\
 main.c\
+css.c\
 audio.c\
 version.c\
 discovered.c\
@@ -131,13 +132,14 @@ puresignal_dialog.c\
 oc_dialog.c\
 xvtr_dialog.c\
 frequency.c\
-rigctl.c\
 error_handler.c\
 radio_info.c\
-bpsk.c
+bpsk.c \
+subrx.c
 
 HEADERS=\
 main.h\
+css.h\
 audio.h\
 version.h\
 discovered.h\
@@ -181,13 +183,14 @@ puresignal_dialog.h\
 oc_dialog.h\
 xvtr_dialog.h\
 frequency.h\
-rigctl.h\
 error_handler.h\
 radio_info.h\
-bpsk.h
+bpsk.h \
+subrx.h
 
 OBJS=\
 main.o\
+css.o\
 audio.o\
 version.o\
 discovered.o\
@@ -230,10 +233,10 @@ puresignal_dialog.o\
 oc_dialog.o\
 xvtr_dialog.o\
 frequency.o\
-rigctl.o\
 error_handler.o\
 radio_info.o\
-bpsk.o
+bpsk.o \
+subrx.o
 
 
 $(PROGRAM):  $(OBJS) $(SOAPYSDR_OBJS) $(CWDAEMON_OBJS) $(MIDI_OBJS)

about_dialog.c

@@ -32,6 +32,7 @@
 #endif
 
 #include "discovered.h"
+#include "bpsk.h"
 #include "receiver.h"
 #include "transmitter.h"
 #include "receiver.h"

audio.c

@@ -46,6 +46,7 @@
 #include "dac.h"
 #include "discovered.h"
 #include "wideband.h"
+#include "bpsk.h"
 #include "receiver.h"
 #include "transmitter.h"
 #include "radio.h"

bookmark_dialog.c

@@ -28,6 +28,7 @@
 #include <SoapySDR/Device.h>
 #endif
 
+#include "bpsk.h"
 #include "receiver.h"
 #include "transmitter.h"
 #include "wideband.h"

bpsk.c

@@ -22,6 +22,7 @@
 
 #include <wdsp.h>
 
+#include "bpsk.h"
 #include "discovered.h"
 #include "receiver.h"
 #include "bpsk.h"
@@ -39,72 +40,186 @@
 static int my_pixels=-1;
 static float *my_pixel_samples=NULL;
 
-void create_bpsk(RECEIVER *rx) {
-  rx->bpsk_counter=0;
-  rx->bpsk=TRUE;
-}
+void bpsk_init_analyzer(BPSK *bpsk) {
+    int flp[] = {0};
+    double keep_time = 0.1;
+    int n_pixout=1;
+    int spur_elimination_ffts = 1;
+    int data_type = 1;
+    int fft_size = 8192;
+    int window_type = 4;
+    double kaiser_pi = 14.0;
+    int overlap = 2048;
+    int clip = 0;
+    int span_clip_l = 0;
+    int span_clip_h = 0;
+    int pixels=bpsk->pixels;
+    int stitches = 1;
+    int calibration_data_set = 0;
+    double span_min_freq = 0.0;
+    double span_max_freq = 0.0;
 
-void destroy_bpsk(RECEIVER *rx) {
-  rx->bpsk=FALSE;
-}
+g_print("bpsk_init_analyzer: channel=%d pixels=%d pixel_samples=%p\n",bpsk->channel,bpsk->pixels,bpsk->pixel_samples);
+
+    int max_w = fft_size + (int) fmin(keep_time * (double) bpsk->fps, keep_time * (double) fft_size * (double) bpsk->fps);
+
+
+g_print("SetAnalyzer id=%d buffer_size=%d fft_size=%d overlap=%d\n",bpsk->channel,bpsk->buffer_size,fft_size,overlap);
 
-void reset_bpsk(RECEIVER *rx) {
-fprintf(stderr,"reset_bpsk\n");
-  rx->bpsk_counter=0;
+
+    SetAnalyzer(bpsk->channel,
+            n_pixout,
+            spur_elimination_ffts, //number of LO frequencies = number of ffts used in elimination
+            data_type, //0 for real input data (I only); 1 for complex input data (I & Q)
+            flp, //vector with one elt for each LO frequency, 1 if high-side LO, 0 otherwise
+            fft_size, //size of the fft, i.e., number of input samples
+            bpsk->buffer_size, //number of samples transferred for each OpenBuffer()/CloseBuffer()
+            window_type, //integer specifying which window function to use
+            kaiser_pi, //PiAlpha parameter for Kaiser window
+            overlap, //number of samples each fft (other than the first) is to re-use from the previous
+            clip, //number of fft output bins to be clipped from EACH side of each sub-span
+            span_clip_l, //number of bins to clip from low end of entire span
+            span_clip_h, //number of bins to clip from high end of entire span
+            pixels, //number of pixel values to return.  may be either <= or > number of bins
+            stitches, //number of sub-spans to concatenate to form a complete span
+            calibration_data_set, //identifier of which set of calibration data to use
+            span_min_freq, //frequency at first pixel value8192
+            span_max_freq, //frequency at last pixel value
+            max_w //max samples to hold in input ring buffers
+    );
 }
 
-void process_bpsk(RECEIVER *rx) {
-  if(rx->pixel_samples!=NULL) {
-    if(my_pixels!=rx->pixels) {
-      if(my_pixel_samples!=NULL) {
-        g_free(my_pixel_samples);
-      }
-      my_pixels=rx->pixels;
-      my_pixel_samples=g_new(float,my_pixels);
-    } else {
-      if(rx->bpsk_counter==0) {
-        for(int i=0;i<my_pixels;i++) {
-          my_pixel_samples[i]=rx->pixel_samples[i];
+int maximum(float data[], int len) {
+    float m = -200.0;
+    int mi=-1;
+    int i;
+    for(i=0; i<len; ++i) {
+        if(data[i]>m) {
+          m=data[i];
+          mi=i;
         }
-      } else {
-        for(int i=0;i<my_pixels;i++) {
-          my_pixel_samples[i]+=rx->pixel_samples[i];
-        }
-      }
     }
-    rx->bpsk_counter++;
-    if(rx->bpsk_counter==rx->fps) {
-      for(int i=0;i<my_pixels;i++) {
-        my_pixel_samples[i]=my_pixel_samples[i]/(float)rx->fps;
+    return mi;
+}
+
+static gboolean bpsk_local_timer_cb(void *data) {
+  // look +/-1KHz
+  // assume sample rate is 768000
+  // assume 15360 samples
+  // assume 50Hz per sample
+
+#define SIGNALS 200 
+
+  BPSK *bpsk=(BPSK *)data;
+  int mid=bpsk->pixels/2;
+  int signal[SIGNALS];
+  int lag=10;
+  float threshold = -70.0;
+  float influence = 1;
+  int rc;
+
+  g_mutex_lock(&bpsk->mutex);
+  GetPixels(bpsk->channel,0,bpsk->pixel_samples,&rc);
+  g_mutex_unlock(&bpsk->mutex);
+
+  if(rc) {
+    int max1=maximum(&bpsk->pixel_samples[mid-(SIGNALS/2)],SIGNALS);
+
+    int max2=-1;;
+    float max2_value=-200.0;
+
+    for(int i=max1-16;i<max1-4;i++) {
+      if(bpsk->pixel_samples[mid-(SIGNALS/2)+i]>max2_value) {
+        max2_value=bpsk->pixel_samples[mid-(SIGNALS/2)+i];
+        max2=i;
       }
-      float threshold=5.0;
-      int gap=(int)(800.0/rx->hz_per_pixel);
-      //float last=-140;
-      int last_index=-1;
-      for(int i=my_pixels-3;i>gap;i--) {
-        if((my_pixel_samples[i]>=(my_pixel_samples[i-1]+threshold)) &&
-           (my_pixel_samples[i-gap]>=(my_pixel_samples[i-1]+threshold))) {
-          last_index=i;
-          //last=my_pixel_samples[last_index];
-          break;
-        }
+    }
+
+    for(int i=max1+5;i<max1+17;i++) {
+      if(bpsk->pixel_samples[mid-(SIGNALS/2)+i]>max2_value) {
+        max2_value=bpsk->pixel_samples[mid-(SIGNALS/2)+i];
+        max2=i;
       }
-      if(last_index!=-1) {
-        //last_index=last_index-(gap/2);
-        double frequency=(double)rx->frequency_a;
-        double half=(double)rx->sample_rate/2.0;
-        double min_frequency=frequency-half;
-        double max_frequency=frequency+half;
-        if(10489800000>min_frequency&&10489800000<max_frequency) {
-          double f=min_frequency+((double)last_index*rx->hz_per_pixel);
-          long long offset=(long long)(f-10489800000.0);
-          if(llabs(offset)>=100 && llabs(offset)<100000) {
-g_print("lo_error_update: offset=%lld f=%f half=%f min_frequency=%f max_frequency=%f last_index=%d val=%f hz_per_pixel=%f zoom=%d pixels=%d threshold=%f gap=%d\n",offset,f,half,min_frequency,max_frequency,last_index,rx->pixel_samples[last_index],rx->hz_per_pixel,rx->zoom,rx->pixels,threshold,gap);
-            lo_error_update(rx,offset);
-          }
-        }
+    }
+
+    int offset;
+    if(max1>max2) {
+      offset=max2+((max1-max2)/2);
+    } else {
+      offset=max1+((max2-max1)/2);
+    }
+    offset=offset-(SIGNALS/2);
+    offset=offset*50;
+
+    bpsk->offset+=(double)offset;
+    bpsk->count++;
+    if(bpsk->count==300) {
+      offset=(int)(bpsk->offset/300.0);
+      //g_print("offset=%d\n",offset);
+      if(abs(offset)>10) {
+        lo_error_update(bpsk->band,(long long)offset);
       }
-      rx->bpsk_counter=0;
+      bpsk->offset=0.0;
+      bpsk->count=0;
     }
   }
+  return TRUE;
+}
+
+void bpsk_add_iq_samples(BPSK *bpsk,double i_sample,double q_sample) {
+  bpsk->input_buffer[bpsk->samples*2]=i_sample;
+  bpsk->input_buffer[(bpsk->samples*2)+1]=q_sample;
+  bpsk->samples++;
+
+  if(bpsk->samples>=bpsk->buffer_size) {
+    g_mutex_lock(&bpsk->mutex);
+    Spectrum0(1, bpsk->channel, 0, 0, bpsk->input_buffer);
+    g_mutex_unlock(&bpsk->mutex);
+    bpsk->samples=0;
+  }
+}
+
+BPSK *create_bpsk(int channel,int band) {
+  BPSK *bpsk=g_new0(BPSK,1);
+
+g_print("create_bpsk: channel=%d\n",channel);
+  bpsk->channel=channel;
+  bpsk->band=band;
+  bpsk->pixels=15360; // 50Hz per pixel at 768000 sample rate
+  bpsk->buffer_size=2048;
+  bpsk->input_buffer=g_new0(gdouble,bpsk->buffer_size*2);
+  bpsk->fft_size=bpsk->buffer_size;
+  bpsk->pixel_samples=g_new0(float,bpsk->pixels);
+  bpsk->fps=10;
+  bpsk->samples=0;
+  bpsk->count=0;
+  bpsk->offset=0.0;
+  g_mutex_init(&bpsk->mutex);
+
+  int result;
+  XCreateAnalyzer(bpsk->channel, &result, 262144, 1, 1, "");
+  if(result != 0) {
+    g_print("XCreateAnalyzer channel=%d failed: %d\n", bpsk->channel, result);
+  } else {
+    bpsk_init_analyzer(bpsk);
+  }
+
+  SetDisplayDetectorMode(bpsk->channel, 0, DETECTOR_MODE_AVERAGE);
+  SetDisplayAverageMode(bpsk->channel, 0,  AVERAGE_MODE_LOG_RECURSIVE);
+
+  bpsk->update_timer_id=g_timeout_add(100,bpsk_local_timer_cb,(gpointer)bpsk);
+  return bpsk;
 }
+
+void destroy_bpsk(BPSK *bpsk) {
+g_print("destroy_bpsk\n");
+  g_source_remove(bpsk->update_timer_id);
+  g_free(bpsk->input_buffer);
+  g_free(bpsk->pixel_samples);
+  g_free(bpsk);
+}
+
+void reset_bpsk(BPSK *bpsk) {
+g_print("reset_bpsk\n");
+}
+

bpsk.h

@@ -17,7 +17,27 @@
 *
 */
 
-void create_bpsk(RECEIVER *rx);
-void destroy_bpsk(RECEIVER *rx);
-void reset_bpsk(RECEIVER *rx);
-void process_bpsk(RECEIVER *rx);
+#ifndef BPSK_H
+#define BPSK_H
+
+typedef struct _bpsk {
+  gint channel;
+  gint band;
+  gint buffer_size;
+  gint fft_size;
+  gint samples;
+  gint pixels;
+  gint fps;
+  gdouble *input_buffer;
+  gfloat *pixel_samples;
+  GMutex mutex;
+  gint update_timer_id;
+  int count;
+  double offset;
+} BPSK;
+
+extern BPSK *create_bpsk(int channel,int band);
+extern void destroy_bpsk(BPSK *bpsk);
+extern void bpsk_add_iq_samples(BPSK *bpsk,double i_sample,double q_sample);
+
+#endif

configure_dialog.c

@@ -30,6 +30,7 @@
 #include <SoapySDR/Device.h>
 #endif
 
+#include "bpsk.h"
 #include "receiver.h"
 #include "transmitter.h"
 #include "wideband.h"