Merge branch 'v2.3.x'

Conflicts: gqrx.pro news.txt
gqrx-sdr · Nov 27, 2014 · f6419f8 · f6419f8
2 parents 9648a14 + 8ca4f21
commit f6419f8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/applications/gqrx/mainwindow.cpp b/applications/gqrx/mainwindow.cpp
@@ -1931,7 +1931,7 @@ void MainWindow::on_actionAbout_triggered()
 {
     QMessageBox::about(this, tr("About Gqrx"),
                        tr("<p>This is Gqrx %1</p>"
-                          "<p>Copyright (C) 2011-2013 Alexandru Csete & contributors.</p>"
+                          "<p>Copyright (C) 2011-2014 Alexandru Csete & contributors.</p>"
                           "<p>Gqrx is a software defined radio receiver powered by "
                           "<a href='http://www.gnuradio.org/'>GNU Radio</a> and the Qt toolkit. "
                           "<p>Gqrx uses the <a href='http://sdr.osmocom.org/trac/wiki/GrOsmoSDR'>GrOsmoSDR</a> "
@@ -1940,9 +1940,11 @@ void MainWindow::on_actionAbout_triggered()
                           "<li><a href='http://funcubedongle.com/'>Funcube Dongle Pro and Pro+</a></li>"
                           "<li><a href='http://sdr.osmocom.org/trac/wiki/rtl-sdr'>RTL2832U-based DVB-T tuners (rtlsdr and rtlsdr-tcp)</a></li>"
                           "<li><a href='http://www.ettus.com/'>Ettus Research USRP devices</a></li>"
-                          "<li><a href='http://sdr.osmocom.org/trac/'>OsmoSDR devices</a></li>"
-                          "<li><a href='https://greatscottgadgets.com/hackrf/'>HackRF Jawbreaker</a></li>"
+                          "<li><a href='http://sdr.osmocom.org/trac/'>OsmoSDR</a></li>"
+                          "<li><a href='https://greatscottgadgets.com/hackrf/'>HackRF One & Jawbreaker</a></li>"
                           "<li><a href='http://nuand.com/bladeRF'>Nuand bladeRF</a></li>"
+                          "<li><a href='http://airspy.com'>Airspy</a></li>"
+                          "<li><a href='http://rfspace.com'>RFspace receivers</a></li>"
                           "</ul></p>"
                           "<p>You can download the latest version from the "
                           "<a href='http://gqrx.dk/'>Gqrx website</a>."

diff --git a/news.txt b/news.txt
@@ -1,8 +1,13 @@
+
      2.x.x  TBD
 
        NEW: Bookmarks.
   IMPROVED: Fractional PPM correction.
 
+     2.3.2  Released November 28, 2014
+
+     FIXED: Pandapter and waterfall widths are limited to 4096 pixels.
+  IMPROVED: Add 2.5 Msps preset for Airspy.
 
      2.3.1  Released August 8, 2014
 

diff --git a/qtgui/ioconfig.cpp b/qtgui/ioconfig.cpp
@@ -419,6 +419,7 @@ void CIoConfig::updateInputSampleRates(int rate)
         if (rate > 0)
             ui->inSrCombo->addItem(QString("%1").arg(rate));
 
+        ui->inSrCombo->addItem("2500000");
         ui->inSrCombo->addItem("10000000");
     }
 }

diff --git a/qtgui/plotter.h b/qtgui/plotter.h
@@ -9,7 +9,7 @@
 #include <QMap>
 
 #define HORZ_DIVS_MAX 50 //12
-#define MAX_SCREENSIZE 4096
+#define MAX_SCREENSIZE 16384
 
 #define PEAK_CLICK_MAX_H_DISTANCE 10 //Maximum horizontal distance of clicked point from peak
 #define PEAK_CLICK_MAX_V_DISTANCE 20 //Maximum vertical distance of clicked point from peak