Update default sample rate

- Should fix startup for AirSpy
cjcliffe · Oct 18, 2015 · 73733ea · 73733ea
1 parent c200048
commit 73733ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
@@ -280,14 +280,14 @@ AppFrame::AppFrame() :
     sampleRateMenuItems[wxID_BANDWIDTH_2000M] = menu->AppendRadioItem(wxID_BANDWIDTH_2000M, "2.0M");
     sampleRateMenuItems[wxID_BANDWIDTH_2048M] = menu->AppendRadioItem(wxID_BANDWIDTH_2048M, "2.048M");
     sampleRateMenuItems[wxID_BANDWIDTH_2160M] = menu->AppendRadioItem(wxID_BANDWIDTH_2160M, "2.16M");
-    sampleRateMenuItems[wxID_BANDWIDTH_2400M] = menu->AppendRadioItem(wxID_BANDWIDTH_2400M, "2.4M");
-    sampleRateMenuItems[wxID_BANDWIDTH_2560M] = menu->AppendRadioItem(wxID_BANDWIDTH_2560M, "2.56M");
+//    sampleRateMenuItems[wxID_BANDWIDTH_2400M] = menu->AppendRadioItem(wxID_BANDWIDTH_2400M, "2.4M");
+    sampleRateMenuItems[wxID_BANDWIDTH_2500M] = menu->AppendRadioItem(wxID_BANDWIDTH_2500M, "2.5M");
     sampleRateMenuItems[wxID_BANDWIDTH_2880M] = menu->AppendRadioItem(wxID_BANDWIDTH_2880M, "2.88M");
 //    sampleRateMenuItems[wxID_BANDWIDTH_3000M] = menu->AppendRadioItem(wxID_BANDWIDTH_3000M, "3.0M");
     sampleRateMenuItems[wxID_BANDWIDTH_3200M] = menu->AppendRadioItem(wxID_BANDWIDTH_3200M, "3.2M");
     sampleRateMenuItems[wxID_BANDWIDTH_MANUAL] = menu->AppendRadioItem(wxID_BANDWIDTH_MANUAL, "Manual Entry");
 
-    sampleRateMenuItems[wxID_BANDWIDTH_2400M]->Check(true);
+    sampleRateMenuItems[wxID_BANDWIDTH_2500M]->Check(true);
 
     menuBar->Append(menu, wxT("&Input Bandwidth"));
 
@@ -574,11 +574,8 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
         case wxID_BANDWIDTH_2160M:
             wxGetApp().setSampleRate(2160000);
             break;
-        case wxID_BANDWIDTH_2400M:
-            wxGetApp().setSampleRate(2400000);
-            break;
-        case wxID_BANDWIDTH_2560M:
-            wxGetApp().setSampleRate(2560000);
+        case wxID_BANDWIDTH_2500M:
+            wxGetApp().setSampleRate(2500000);
             break;
         case wxID_BANDWIDTH_2880M:
             wxGetApp().setSampleRate(2880000);

diff --git a/src/AppFrame.h b/src/AppFrame.h
@@ -41,8 +41,8 @@
 #define wxID_BANDWIDTH_2000M 2156
 #define wxID_BANDWIDTH_2048M 2157
 #define wxID_BANDWIDTH_2160M 2158
-#define wxID_BANDWIDTH_2400M 2159
-#define wxID_BANDWIDTH_2560M 2160
+//#define wxID_BANDWIDTH_2400M 2159
+#define wxID_BANDWIDTH_2500M 2160
 #define wxID_BANDWIDTH_2880M 2161
 //#define wxID_BANDWIDTH_3000M 2162
 #define wxID_BANDWIDTH_3200M 2163

diff --git a/src/CubicSDRDefs.h b/src/CubicSDRDefs.h
@@ -27,7 +27,7 @@ const char filePathSeparator =
 
 #define BUF_SIZE (16384*6)
 
-#define DEFAULT_SAMPLE_RATE 2400000
+#define DEFAULT_SAMPLE_RATE 2500000
 #define DEFAULT_FFT_SIZE 2048
 
 #define DEFAULT_DEMOD_TYPE 1