Merge pull request #1 from xtrx-sdr/master

merge latest upstream changes
aports-ugly · Apr 5, 2019 · a00e73a · a00e73a
2 parents b96ace3 + 4f1eb7b
commit a00e73a
Show file tree

Hide file tree

Showing 15 changed files with 2,576 additions and 525 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 2.8)
 set(MAJOR_VERSION 0)
 set(API_COMPAT    0)
 set(MINOR_VERSION 1)
-set(MAINT_VERSION git)
+set(MAINT_VERSION 2)
 
 set(LIBVER  "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}")
 
@@ -92,7 +92,7 @@ else()
     include_directories(${LIBLMS7COMPACT_INCLUDE_DIRS})
 
     add_definitions(-DHAVE_LMS_NFE)
-    set(LMS_FE_FILENAME "xtrx_fe_nlms7.c")
+    set(LMS_FE_FILENAME "xtrx_fe_nlms7.c" "xtrx_fe_octorx0.c")
     set(LMS_FE_LIBRARY  ${LIBLMS7COMPACT_LIBRARIES})
 endif()
 
@@ -150,7 +150,7 @@ set(CPACK_PACKAGE_NAME                "libxtrx")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "XTRX API library")
 set(CPACK_PACKAGE_VENDOR              "Fairwaves, Inc.")
 set(CPACK_PACKAGE_CONTACT             "http://fairwaves.co/wp/contact-us/")
-set(CPACK_PACKAGE_VERSION             ${LIBVER}-1)
+set(CPACK_PACKAGE_VERSION             ${LIBVER}-${MAINT_VERSION})
 set(CPACK_DEBIAN_PACKAGE_DEPENDS      "libc6 (>= 2.17), libxtrxll (>= 0.0.1), libxtrxdsp (>= 0.0.1), liblms7002m (>= 0.0.1)")
 if(ENABLE_SOAPY)
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS      "${CPACK_DEBIAN_PACKAGE_DEPENDS}, soapysdr (>= 0.5.2)")

diff --git a/examples/xtrx_fft/main.cpp b/examples/xtrx_fft/main.cpp
@@ -23,8 +23,9 @@
 
 #include "mainwindow.h"
 
-void qInitResources_application()
+int qInitResources_application()
 {
+    return 0;
 }
 
 int main(int argc, char *argv[])

diff --git a/examples/xtrx_fft/mainwindow.cpp b/examples/xtrx_fft/mainwindow.cpp
@@ -108,7 +108,11 @@ void MainWindow::redraw(int idx)
 		customPlot->graph(1)->setData(x, *pz[idx]);
 	}
 
+#if defined(QCUSTOMPLOT_VERSION) && (QCUSTOMPLOT_VERSION >= 0x020000)
+	customPlot->replot(QCustomPlot::rpImmediateRefresh);
+#else
 	customPlot->replot(QCustomPlot::rpImmediate);
+#endif
 }
 
 
@@ -141,8 +145,8 @@ void MainWindow::on_btStartStop_clicked()
 	QString devstr = ui->cbDev->currentText();
 
 	if (dev == NULL) {
-		ui->widget->graph(0)->clearData();
-		ui->widget->graph(1)->clearData();
+		ui->widget->graph(0)->data()->clear();
+		ui->widget->graph(1)->data()->clear();
 
 		ui->statusbar->showMessage(QString("Samplerate %1 MSPS Gain: %2").arg(samplerate).arg(gain));
 		res = xtrx_open(devstr.toLatin1(), 4, &dev);