From: John Melton g0orx/n6lyt <john.d.melton@googlemail.com>
Date: Fri, 15 Apr 2016 12:57:15 +0000 (+0000)
Subject: temp remove nb and nb2.  fixed nr and nr2.
X-Git-Url: https://git.rkrishnan.org/simplejson/index.php?a=commitdiff_plain;h=d266637e3a668ecf8e874622aa44023bfedf9382;p=pihpsdr.git

temp remove nb and nb2.  fixed nr and nr2.
---

diff --git a/Makefile b/Makefile
index 7b468b0..253fb97 100644
--- a/Makefile
+++ b/Makefile
@@ -113,3 +113,5 @@ clean:
 
 install:
 	cp pihpsdr ../pihpsdr
+	cp pihpsdr ./release/pihpsdr
+
diff --git a/gpio.c b/gpio.c
index 07aae4c..c57f3ad 100644
--- a/gpio.c
+++ b/gpio.c
@@ -978,15 +978,9 @@ fprintf(stderr,"noise_pressed\n");
     } else if(nr2) {
       nr2=0;
       nr=1;
-    } else if(nb) {
-      nb=0;
-      nr2=1;
-    } else if(nb2) {
-      nb2=0;
-      nb=1;
     } else if(anf) {
       anf=0;
-      nb2=1;
+      nr2=1;
     } else if(snb) {
       snb=0;
       anf=1;
@@ -999,12 +993,6 @@ fprintf(stderr,"noise_pressed\n");
       nr2=1;
     } else if(nr2) {
       nr2=0;
-      nb=1;
-    } else if(nb) {
-      nb=0;
-      nb2=1;
-    } else if(nb2) {
-      nb2=0;
       anf=1;
     } else if(anf) {
       anf=0;
@@ -1016,8 +1004,7 @@ fprintf(stderr,"noise_pressed\n");
     }
   }
   SetRXAANRRun(CHANNEL_RX0, nr);
-  SetRXAEMNRaeRun(CHANNEL_RX0, nb2);
-  SetRXAEMNRRun(CHANNEL_RX0, nb);
+  SetRXAEMNRRun(CHANNEL_RX0, nr2);
   SetRXAANFRun(CHANNEL_RX0, anf);
   SetRXASNBARun(CHANNEL_RX0, snb);
   vfo_update(NULL);
diff --git a/pihpsdr b/pihpsdr
index 6fd6160..8e73b85 100755
Binary files a/pihpsdr and b/pihpsdr differ
diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 34226fa..3cb469c 100644
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ
diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index 6fd6160..8e73b85 100755
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ
diff --git a/start_pihpsdr.sh b/start_pihpsdr.sh
deleted file mode 100755
index 98af331..0000000
--- a/start_pihpsdr.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ~/pihpsdr
-sudo ~/pihpsdr/pihpsdr
diff --git a/toolbar.c b/toolbar.c
index 7423b3f..88ddf49 100644
--- a/toolbar.c
+++ b/toolbar.c
@@ -423,7 +423,7 @@ static void nr_cb(GtkWidget *widget, gpointer data) {
 
 static void nr2_cb(GtkWidget *widget, gpointer data) {
   nr2=nr2==0?1:0;
-  //SetRXAANRaeRun(CHANNEL_RX0, nr2);
+  SetRXAEMNRRun(CHANNEL_RX0, nr);
 }
 
 static void nb_cb(GtkWidget *widget, gpointer data) {
@@ -505,6 +505,7 @@ static void audio_cb(GtkWidget *widget, gpointer data) {
   gtk_grid_attach(GTK_GRID(grid),b_nr2,2,1,2,1);
   g_signal_connect(b_nr2,"toggled",G_CALLBACK(nr2_cb),NULL);
 
+/*
   GtkWidget *b_nb=gtk_check_button_new_with_label("NB");
   //gtk_widget_override_font(b_nb, pango_font_description_from_string("Arial 16"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_nb), nb==1);
@@ -518,19 +519,20 @@ static void audio_cb(GtkWidget *widget, gpointer data) {
   gtk_widget_show(b_nb2);
   gtk_grid_attach(GTK_GRID(grid),b_nb2,2,3,2,1);
   g_signal_connect(b_nb2,"toggled",G_CALLBACK(nb2_cb),NULL);
+*/
 
   GtkWidget *b_anf=gtk_check_button_new_with_label("ANF");
   //gtk_widget_override_font(b_anf, pango_font_description_from_string("Arial 16"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_anf), anf==1);
   gtk_widget_show(b_anf);
-  gtk_grid_attach(GTK_GRID(grid),b_anf,2,4,2,1);
+  gtk_grid_attach(GTK_GRID(grid),b_anf,2,2,2,1);
   g_signal_connect(b_anf,"toggled",G_CALLBACK(anf_cb),NULL);
 
   GtkWidget *b_snb=gtk_check_button_new_with_label("SNB");
   //gtk_widget_override_font(b_snb, pango_font_description_from_string("Arial 16"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_snb), snb==1);
   gtk_widget_show(b_snb);
-  gtk_grid_attach(GTK_GRID(grid),b_snb,2,5,2,1);
+  gtk_grid_attach(GTK_GRID(grid),b_snb,2,3,2,1);
   g_signal_connect(b_snb,"toggled",G_CALLBACK(snb_cb),NULL);
 
   gtk_container_add(GTK_CONTAINER(content),grid);
diff --git a/wdsp_init.c b/wdsp_init.c
index e5005be..5cb1ae4 100644
--- a/wdsp_init.c
+++ b/wdsp_init.c
@@ -210,12 +210,15 @@ void wdsp_init(int rx,int pixels,int protocol) {
 
     SetRXAAMDSBMode(CHANNEL_RX0, 0);
     SetRXAShiftRun(CHANNEL_RX0, 0);
-    SetRXAEMNRgainMethod(CHANNEL_RX0, 1);
+
+    SetRXAEMNRgainMethod(CHANNEL_RX0, 2); // defaults
     SetRXAEMNRnpeMethod(CHANNEL_RX0, 0);
     SetRXAEMNRaeRun(CHANNEL_RX0, 1);
-    SetRXAEMNRPosition(CHANNEL_RX0, 0);
+    SetRXAEMNRPosition(CHANNEL_RX0, 1);
     SetRXAEMNRRun(CHANNEL_RX0, 0);
+
     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);