added 136kHz and 472kHz bands

diff --git a/ant_menu.c b/ant_menu.c
index 00e37d4cb4882463edceebcd6130d0099350d664..9e2af14b6768ea267fb31d0ba1d02e3695419c52 100644 (file)
--- a/ant_menu.c
+++ b/ant_menu.c
@@ -149,7 +149,7 @@ void ant_menu(GtkWidget *parent) {
     gtk_widget_show(tx3_label);
     gtk_grid_attach(GTK_GRID(grid),tx3_label,10,1,1,1);
 
-    for(i=0;i<HAM_BANDS+XVTRS;i++) {
+    for(i=0;i<BANDS+XVTRS;i++) {
       BAND *band=band_get_band(i);
       if(strlen(band->title)>0) {
 

diff --git a/band.c b/band.c
index e1ec870125f5b8b87673083297b189c712064e08..91a10e87a5578b41791449d9d9d8475cd46e4a9e 100644 (file)
--- a/band.c
+++ b/band.c
@@ -38,6 +38,14 @@ int xvtr_band=BANDS;
 * @brief bandstack
 */
 /* ----------------------------------------------------------------------------*/
+BANDSTACK_ENTRY bandstack_entries136[] =
+    {{135800,135800,modeCWL,filterF4,-2800,-200,-2800,-200},
+     {137100,137100,modeCWL,filterF4,-2800,-200,-2800,-200}};
+
+BANDSTACK_ENTRY bandstack_entries472[] =
+    {{472100LL,472100LL,modeCWL,filterF4,-2800,-200,-2800,-200},
+     {475100LL,475100LL,modeCWL,filterF4,-2800,-200,-2800,-200}};
+
 BANDSTACK_ENTRY bandstack_entries160[] =
     {{1810000LL,1810000LL,modeCWL,filterF4,-2800,-200,-2800,-200},
      {1835000LL,1835000LL,modeCWU,filterF0,-2800,-200,-2800,-200},
@@ -185,6 +193,8 @@ BANDSTACK bandstackAIR={6,1,bandstack_entriesAIR};
 #endif
 BANDSTACK bandstackGEN={3,1,bandstack_entriesGEN};
 BANDSTACK bandstackWWV={5,1,bandstack_entriesWWV};
+BANDSTACK bandstack136={2,0,bandstack_entries136};
+BANDSTACK bandstack472={2,0,bandstack_entries472};
 
 /* --------------------------------------------------------------------------*/
 /**
@@ -245,6 +255,8 @@ BAND bands[BANDS+XVTRS] =
 #endif
      {"GEN",&bandstackGEN,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},
      {"WWV",&bandstackWWV,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},
+     {"136kHz",&bandstack136,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},
+     {"472kHz",&bandstack472,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},
 // XVTRS
      {"",&bandstack_xvtr_0,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},
      {"",&bandstack_xvtr_1,0,0,0,0,0,ALEX_ATTENUATION_0dB,38.8,0LL,0LL,0LL,0},

diff --git a/band.h b/band.h
index 40fe1b16dda8f8ee98c39d5954a616a3274b70f5..23d48b8caff7f5ada4cc5c23afa428bd5a5dd384 100644 (file)
--- a/band.h
+++ b/band.h
@@ -45,13 +45,15 @@
 #define bandAIR 19
 #define bandGen 20
 #define bandWWV 21
-#define BANDS 22
-#define HAM_BANDS 19
+#define band136 22
+#define band472 23
+#define BANDS 24
 #else
 #define bandGen 11
 #define bandWWV 12
-#define BANDS 13
-#define HAM_BANDS 11
+#define band136 13
+#define band472 14
+#define BANDS 15
 #endif
 
 #define XVTRS 8

diff --git a/oc_menu.c b/oc_menu.c
index 0db345a2179d6f407d56570319da6c5f0c092338..b85aa389b17421f62398851e89a4f0b5d50252b2 100644 (file)
--- a/oc_menu.c
+++ b/oc_menu.c
@@ -147,7 +147,7 @@ void oc_menu(GtkWidget *parent) {
     gtk_grid_attach(GTK_GRID(grid),oc_tx_title,i+7,2,1,1);
   }
 
-  for(i=0;i<HAM_BANDS;i++) {
+  for(i=0;i<BANDS;i++) {
     BAND *band=band_get_band(i);
 
     GtkWidget *band_label=gtk_label_new(band->title);

diff --git a/pa_menu.c b/pa_menu.c
index d223655b1cd1551c9547b578195c8942b848f213..00882fcc168f2e1bcd29abfe5cd104dc4ad18dc7 100644 (file)
--- a/pa_menu.c
+++ b/pa_menu.c
@@ -81,7 +81,7 @@ void pa_menu(GtkWidget *parent) {
   g_signal_connect (close_b, "pressed", G_CALLBACK(close_cb), NULL);
   gtk_grid_attach(GTK_GRID(grid),close_b,0,0,1,1);
 
-  for(i=0;i<HAM_BANDS;i++) {
+  for(i=0;i<BANDS;i++) {
     BAND *band=band_get_band(i);
 
     GtkWidget *band_label=gtk_label_new(band->title);

diff --git a/pihpsdr b/pihpsdr
index deda0d1242a04d8b9baf51cf12a4d009426361c3..1cc47cbfc725627cb9691f9573720416496ecaac 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index c1e7c9be1bc86203371ffc2ade669b72fdf2d4f1..6a681876c1d81071ef08941b40235bb1c255842b 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 deda0d1242a04d8b9baf51cf12a4d009426361c3..1cc47cbfc725627cb9691f9573720416496ecaac 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ