changed AGC Gain rang -20..120. Startup sets restored Noise Reduction/Blanker mode.

diff --git a/gpio.c b/gpio.c
index c57f3ad4af5de02708c28a7bc622020d6c3107c1..1a9746c935c150b4b1677f30ba78655f755b8180 100644 (file)
--- a/gpio.c
+++ b/gpio.c
@@ -827,8 +827,8 @@ static int agc_encoder_changed(void *data) {
     } else {
       double gain=agc_gain;
       gain+=(double)pos;
-      if(gain<0.0) {
-        gain=0.0;
+      if(gain<-20.0) {
+        gain=-20.0;
       } else if(gain>120.0) {
         gain=120.0;
       }

diff --git a/pihpsdr b/pihpsdr
index 2c7f5cec883ff781dd8bf97fd3901e8f211d6a24..8efbd7df8224f841846fbc7a08dca26dd97606e7 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 758c956f9c89115ec3a0427aacdd0be2b5ff15f1..5e91540b34e383111d27c64e6108c46385aa1f85 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index 2c7f5cec883ff781dd8bf97fd3901e8f211d6a24..8efbd7df8224f841846fbc7a08dca26dd97606e7 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ

diff --git a/sliders.c b/sliders.c
index 5b0476d61b13838b33f15de123bdec5f2ae389e3..7f70828fe619b6b30badc566e4a76d3908d0c42d 100644 (file)
--- a/sliders.c
+++ b/sliders.c
@@ -144,7 +144,7 @@ void set_agc_gain(double value) {
       scale_status=AGC_GAIN;
       scale_dialog=gtk_dialog_new_with_buttons("AGC Gain",GTK_WINDOW(parent_window),GTK_DIALOG_DESTROY_WITH_PARENT,NULL,NULL);
       GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(scale_dialog));
-      agc_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 120.0, 1.00);
+      agc_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,-20.0, 120.0, 1.00);
       gtk_widget_set_size_request (agc_scale, 400, 30);
       gtk_range_set_value (GTK_RANGE(agc_scale),agc_gain);
       gtk_widget_show(agc_scale);
@@ -335,7 +335,7 @@ GtkWidget *sliders_init(int my_width, int my_height, GtkWidget* parent) {
   gtk_widget_show(agc_gain_label);
   gtk_grid_attach(GTK_GRID(sliders),agc_gain_label,3,0,1,1);
 
-  agc_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 120.0, 1.0);
+  agc_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,-20.0, 120.0, 1.0);
   gtk_range_set_value (GTK_RANGE(agc_scale),agc_gain);
   gtk_widget_show(agc_scale);
   gtk_grid_attach(GTK_GRID(sliders),agc_scale,4,0,2,1);

diff --git a/wdsp_init.c b/wdsp_init.c
index 5cb1ae4947e0e177e6dd27b20b148d6667f3bd8a..371a028b28d950337dcd1ac492d8604b7acc6278 100644 (file)
--- a/wdsp_init.c
+++ b/wdsp_init.c
@@ -211,17 +211,17 @@ void wdsp_init(int rx,int pixels,int protocol) {
     SetRXAAMDSBMode(CHANNEL_RX0, 0);
     SetRXAShiftRun(CHANNEL_RX0, 0);
 
-    SetRXAEMNRgainMethod(CHANNEL_RX0, 2); // defaults
-    SetRXAEMNRnpeMethod(CHANNEL_RX0, 0);
-    SetRXAEMNRaeRun(CHANNEL_RX0, 1);
-    SetRXAEMNRPosition(CHANNEL_RX0, 1);
-    SetRXAEMNRRun(CHANNEL_RX0, 0);
+    SetRXAEMNRgainMethod(CHANNEL_RX0, 2); // 0=Linear 1=Log 2=Gamma
+    SetRXAEMNRnpeMethod(CHANNEL_RX0, 0); // 0=OSMS 1=MMSE
+    SetRXAEMNRPosition(CHANNEL_RX0, 0); // 0=Pre AGC, 1=Post AGC
+    SetRXAEMNRaeRun(CHANNEL_RX0, 1); // 1=run
+    SetRXAEMNRRun(CHANNEL_RX0, nr2);
 
     SetRXAEMNRaeRun(CHANNEL_RX0, 0);
     SetRXAANRVals(CHANNEL_RX0, 64, 16, 16e-4, 10e-7); // defaults
-    SetRXAANRRun(CHANNEL_RX0, 0);
-    SetRXAANFRun(CHANNEL_RX0, 0);
-    SetRXASNBARun(CHANNEL_RX0, 0);
+    SetRXAANRRun(CHANNEL_RX0, nr);
+    SetRXAANFRun(CHANNEL_RX0, anf);
+    SetRXASNBARun(CHANNEL_RX0, snb);
 
     SetTXAMode(CHANNEL_TX, mode);
     SetTXABandpassFreqs(CHANNEL_TX, (double)filterLow, (double)filterHigh);