fixed default band structures

diff --git a/band.c b/band.c
index 7b00195779e127b120b92f530e014eecacfc1940..39660e6d57194d55d3e0965d19e3b6dc0cc54683 100644 (file)
--- a/band.c
+++ b/band.c
@@ -39,127 +39,127 @@ int xvtr_band=BANDS;
 */
 /* ----------------------------------------------------------------------------*/
 BANDSTACK_ENTRY bandstack_entries160[] =
-    {{1810000LL,modeCWL,filterF4,-2800,-200,-2800,-200},
-     {1835000LL,modeCWU,filterF0,-2800,-200,-2800,-200},
-     {1845000LL,modeUSB,filterF5,-2800,-200,-2800,-200}};
+    {{1810000LL,1810000LL,modeCWL,filterF4,-2800,-200,-2800,-200},
+     {1835000LL,1835000LL,modeCWU,filterF0,-2800,-200,-2800,-200},
+     {1845000LL,1845000LL,modeUSB,filterF5,-2800,-200,-2800,-200}};
 
 BANDSTACK_ENTRY bandstack_entries80[] =
-    {{3501000LL,modeCWL,filterF0,-2800,-200,-2800,-200},
-     {3751000LL,modeLSB,filterF5,-2800,-200,-2800,-200},
-     {3850000LL,modeLSB,filterF5,-2800,-200,-2800,-200}};
+    {{3501000LL,3501000LL,modeCWL,filterF0,-2800,-200,-2800,-200},
+     {3751000LL,3751000LL,modeLSB,filterF5,-2800,-200,-2800,-200},
+     {3850000LL,3850000LL,modeLSB,filterF5,-2800,-200,-2800,-200}};
 
 BANDSTACK_ENTRY bandstack_entries60[] =
-    {{5330500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
-     {5346500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
-     {5366500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
-     {5371500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
-     {5403500LL,modeUSB,filterF5,-2800,-200,-2800,-200}};
+    {{5330500LL,5330500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
+     {5346500LL,5346500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
+     {5366500LL,5366500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
+     {5371500LL,5371500LL,modeUSB,filterF5,-2800,-200,-2800,-200},
+     {5403500LL,5403500LL,modeUSB,filterF5,-2800,-200,-2800,-200}};
 
 BANDSTACK_ENTRY bandstack_entries40[] =
-    {{7001000LL,modeCWL,filterF0,-2800,-200,-2800,-200},
-     {7152000LL,modeLSB,filterF5,-2800,-200,-2800,-200},
-     {7255000LL,modeLSB,filterF5,-2800,-200,-2800,-200}};
+    {{7001000LL,7001000LL,modeCWL,filterF0,-2800,-200,-2800,-200},
+     {7152000LL,71521000LL,modeLSB,filterF5,-2800,-200,-2800,-200},
+     {7255000LL,7255000LL,modeLSB,filterF5,-2800,-200,-2800,-200}};
 
 BANDSTACK_ENTRY bandstack_entries30[] =
-    {{10120000LL,modeCWU,filterF0,200,2800,200,2800},
-     {10130000LL,modeCWU,filterF0,200,2800,200,2800},
-     {10140000LL,modeCWU,filterF4,200,2800,200,2800}};
+    {{10120000LL,10120000LL,modeCWU,filterF0,200,2800,200,2800},
+     {10130000LL,10130000LL,modeCWU,filterF0,200,2800,200,2800},
+     {10140000LL,10140000LL,modeCWU,filterF4,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries20[] =
-    {{14010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {14150000LL,modeUSB,filterF5,200,2800,200,2800},
-     {14230000LL,modeUSB,filterF5,200,2800,200,2800},
-     {14336000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{14010000LL,14010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {14150000LL,14010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {14230000LL,14010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {14336000LL,14010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries18[] =
-    {{18068600LL,modeCWU,filterF0,200,2800,200,2800},
-     {18125000LL,modeUSB,filterF5,200,2800,200,2800},
-     {18140000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{18068600LL,18068600LL,modeCWU,filterF0,200,2800,200,2800},
+     {18125000LL,18068600LL,modeUSB,filterF5,200,2800,200,2800},
+     {18140000LL,18068600LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries15[] =
-    {{21001000LL,modeCWU,filterF0,200,2800,200,2800},
-     {21255000LL,modeUSB,filterF5,200,2800,200,2800},
-     {21300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{21001000LL,21001000LL,modeCWU,filterF0,200,2800,200,2800},
+     {21255000LL,21001000LL,modeUSB,filterF5,200,2800,200,2800},
+     {21300000LL,21001000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries12[] =
-    {{24895000LL,modeCWU,filterF0,200,2800,200,2800},
-     {24900000LL,modeUSB,filterF5,200,2800,200,2800},
-     {24910000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{24895000LL,24895000LL,modeCWU,filterF0,200,2800,200,2800},
+     {24900000LL,24895000LL,modeUSB,filterF5,200,2800,200,2800},
+     {24910000LL,24895000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries10[] =
-    {{28010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {28300000LL,modeUSB,filterF5,200,2800,200,2800},
-     {28400000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{28010000LL,28010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {28300000LL,28010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {28400000LL,28010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries50[] =
-    {{50010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {50125000LL,modeUSB,filterF5,200,2800,200,2800},
-     {50200000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{50010000LL,50010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {50125000LL,50010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {50200000LL,50010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 #ifdef LIMESDR
 BANDSTACK_ENTRY bandstack_entries70[] =
-    {{70010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {70200000LL,modeUSB,filterF5,200,2800,200,2800},
-     {70250000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{70010000LL,70010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {70200000LL,70010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {70250000LL,70010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries144[] =
-    {{144010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {144200000LL,modeUSB,filterF5,200,2800,200,2800},
-     {144250000LL,modeUSB,filterF5,200,2800,200,2800},
-     {145600000LL,modeFMN,filterF1,200,2800,200,2800},
-     {145725000LL,modeFMN,filterF1,200,2800,200,2800},
-     {145900000LL,modeFMN,filterF1,200,2800,200,2800}};
+    {{144010000LL,144010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {144200000LL,144010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {144250000LL,144010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {145600000LL,144010000LL,modeFMN,filterF1,200,2800,200,2800},
+     {145725000LL,144010000LL,modeFMN,filterF1,200,2800,200,2800},
+     {145900000LL,144010000LL,modeFMN,filterF1,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries220[] =
-    {{220010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {220200000LL,modeUSB,filterF5,200,2800,200,2800},
-     {220250000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{220010000LL,220010000,modeCWU,filterF0,200,2800,200,2800},
+     {220200000LL,220010000,modeUSB,filterF5,200,2800,200,2800},
+     {220250000LL,220010000,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries430[] =
-    {{430010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {432100000LL,modeUSB,filterF5,200,2800,200,2800},
-     {432300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{430010000LL,430010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {432100000LL,430010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {432300000LL,430010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries902[] =
-    {{902010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {902100000LL,modeUSB,filterF5,200,2800,200,2800},
-     {902300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{902010000LL,902010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {902100000LL,902010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {902300000LL,902010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries1240[] =
-    {{1240010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {1240100000LL,modeUSB,filterF5,200,2800,200,2800},
-     {1240300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{1240010000LL,1240010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {1240100000LL,1240010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {1240300000LL,1240010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries2300[] =
-    {{2300010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {2300100000LL,modeUSB,filterF5,200,2800,200,2800},
-     {2300300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{2300010000LL,2300010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {2300100000LL,2300010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {2300300000LL,2300010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries3400[] =
-    {{3400010000LL,modeCWU,filterF0,200,2800,200,2800},
-     {3400100000LL,modeUSB,filterF5,200,2800,200,2800},
-     {3400300000LL,modeUSB,filterF5,200,2800,200,2800}};
+    {{3400010000LL,3400010000LL,modeCWU,filterF0,200,2800,200,2800},
+     {3400100000LL,3400010000LL,modeUSB,filterF5,200,2800,200,2800},
+     {3400300000LL,3400010000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entriesAIR[] =
-    {{118800000LL,modeAM,filterF1,200,2800,200,2800},
-     {120000000LL,modeAM,filterF1,200,2800,200,2800},
-     {121700000LL,modeAM,filterF1,200,2800,200,2800},
-     {124100000LL,modeAM,filterF1,200,2800,200,2800},
-     {126600000LL,modeAM,filterF1,200,2800,200,2800},
-     {136500000LL,modeAM,filterF1,200,2800,200,2800}};
+    {{118800000LL,118800000LL,modeAM,filterF1,200,2800,200,2800},
+     {120000000LL,118800000LL,modeAM,filterF1,200,2800,200,2800},
+     {121700000LL,118800000LL,modeAM,filterF1,200,2800,200,2800},
+     {124100000LL,118800000LL,modeAM,filterF1,200,2800,200,2800},
+     {126600000LL,118800000LL,modeAM,filterF1,200,2800,200,2800},
+     {136500000LL,118800000LL,modeAM,filterF1,200,2800,200,2800}};
 #endif
 
 BANDSTACK_ENTRY bandstack_entriesGEN[] =
-    {{909000LL,modeAM,filterF6,-6000,6000,-6000,60000},
-     {5975000LL,modeAM,filterF6,-6000,6000,-6000,60000},
-     {13845000LL,modeAM,filterF6,-6000,6000,-6000,60000}};
+    {{909000LL,909000LL,modeAM,filterF6,-6000,6000,-6000,60000},
+     {5975000LL,909000LL,modeAM,filterF6,-6000,6000,-6000,60000},
+     {13845000LL,909000LL,modeAM,filterF6,-6000,6000,-6000,60000}};
 
 BANDSTACK_ENTRY bandstack_entriesWWV[] =
-    {{2500000LL,modeSAM,filterF6,200,2800,200,2800},
-     {5000000LL,modeSAM,filterF6,200,2800,200,2800},
-     {10000000LL,modeSAM,filterF6,200,2800,200,2800},
-     {15000000LL,modeSAM,filterF6,200,2800,200,2800},
-     {20000000LL,modeSAM,filterF6,200,2800,200,2800}};
+    {{2500000LL,2500000LL,modeSAM,filterF6,200,2800,200,2800},
+     {5000000LL,2500000LL,modeSAM,filterF6,200,2800,200,2800},
+     {10000000LL,2500000LL,modeSAM,filterF6,200,2800,200,2800},
+     {15000000LL,2500000LL,modeSAM,filterF6,200,2800,200,2800},
+     {20000000LL,2500000LL,modeSAM,filterF6,200,2800,200,2800}};
 
 BANDSTACK bandstack160={3,1,bandstack_entries160};
 BANDSTACK bandstack80={3,1,bandstack_entries80};
@@ -272,8 +272,12 @@ BANDSTACK bandstack_xvtr_6={1,1,bandstack_entries_xvtr_6};
 BANDSTACK bandstack_xvtr_7={1,1,bandstack_entries_xvtr_7};
 
 static XVTR xvtrs[XVTRS]=
+/*
     {{"144",&bandstack_xvtr_0,0x00,0x00,0,0,0,0,0.0,144000000LL,146000000LL,116000000LL},
      {"430",&bandstack_xvtr_1,0x00,0x00,0,0,0,0,0.0,430000000LL,432000000LL,402000000LL},
+*/
+    {{"",&bandstack_xvtr_2,0x00,0x00,0,0,0,0,0.0,0LL,0LL,0LL},
+     {"",&bandstack_xvtr_2,0x00,0x00,0,0,0,0,0.0,0LL,0LL,0LL},
      {"",&bandstack_xvtr_2,0x00,0x00,0,0,0,0,0.0,0LL,0LL,0LL},
      {"",&bandstack_xvtr_3,0x00,0x00,0,0,0,0,0.0,0LL,0LL,0LL},
      {"",&bandstack_xvtr_4,0x00,0x00,0,0,0,0,0.0,0LL,0LL,0LL},

diff --git a/pihpsdr b/pihpsdr
index b9824c2a7309fd83d1147b62b40cd8ecd817753b..38cc7fb112492297cfd61a3c49c42c1788a2c640 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 1fe64294a7ac8176d2cbe9d8a4e046ca3b101cd1..5c0150218960bf1f9a5c9407512853a4f2bef858 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 b9824c2a7309fd83d1147b62b40cd8ecd817753b..38cc7fb112492297cfd61a3c49c42c1788a2c640 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ