Perseus: Debian and Windows build

2024-12-22 17:45:48 -05:00 · 2018-02-10 21:50:57 +01:00 · 2018-02-10 21:50:57 +01:00 · b1fbff05f3
commit b1fbff05f3
parent a1d8908e53
9 changed files with 94 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -283,8 +283,9 @@ if (BUILD_DEBIAN)
    add_subdirectory(libhackrf)
    add_subdirectory(librtlsdr)
    add_subdirectory(libbladerf)
-    add_subdirectory(libmirisdr)
    add_subdirectory(liblimesuite)
+    add_subdirectory(libmirisdr)
+    add_subdirectory(libperseus)
    add_subdirectory(libiio)
 endif (BUILD_DEBIAN)

--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,13 @@
+sdrangel (3.12.0-1) unstable; urgency=medium
+
+  * Perseus support.
+  * 24 bit Rx DSP Debian builds
+  * DC and IQ correction fixes
+  * AirspyHF: fall back to official library support
+  * Test source: implemented phase imbalance 
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 11 Feb 2018 12:14:18 +0100
+
 sdrangel (3.11.1-1) unstable; urgency=medium

  * Replaced hardcoded bit scaling literals by defines. 24 bit sample option.
--- a/debian/rules
+++ b/debian/rules
@ -21,5 +21,5 @@
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBAIRSPYHFSRC=/z1/softs/airspyhf -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4 -DLIBLIMESUITESRC=/z1/softs/LimeSuite -DLIBIIOSRC=/z1/softs/libiio
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DRX_SAMPLE_24BIT=ON -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBAIRSPYHFSRC=/z1/softs/airspyhf -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4 -DLIBLIMESUITESRC=/z1/softs/LimeSuite -DLIBIIOSRC=/z1/softs/libiio

--- a/libperseus/CMakeLists.txt
+++ b/libperseus/CMakeLists.txt
@ -0,0 +1,40 @@
+project(perseus)
+
+find_package(LibUSB)
+
+set(perseus_SOURCES
+    ${LIBPERSEUSSRC}/fifo.c
+    ${LIBPERSEUSSRC}/perseus24v11_512.c
+    ${LIBPERSEUSSRC}/perseus24v41_512.c
+    ${LIBPERSEUSSRC}/perseuserr.c
+    ${LIBPERSEUSSRC}/perseusfx2.c
+    ${LIBPERSEUSSRC}/perseus-in.c
+    ${LIBPERSEUSSRC}/perseus-sdr.c
+)
+
+set(perseus_HEADERS
+    ${LIBPERSEUSSRC}/fifo.h
+    ${LIBPERSEUSSRC}/perseuserr.h
+    ${LIBPERSEUSSRC}/perseusfx2.h
+    ${LIBPERSEUSSRC}/perseus-in.h
+    ${LIBPERSEUSSRC}/perseus-sdr.h
+)
+
+include_directories(
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBUSB_INCLUDE_DIR}    
+    ${LIBPERSEUSSRC}
+)
+
+add_definitions(-DQT_SHARED)
+
+add_library(perseus SHARED
+    ${perseus_SOURCES}
+)
+
+target_link_libraries(perseus
+    ${LIBUSB_LIBRARIES}
+)
+
+install(TARGETS perseus DESTINATION lib)
--- a/libperseus/libperseus.pro
+++ b/libperseus/libperseus.pro
@ -0,0 +1,37 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core
+
+TEMPLATE = lib
+TARGET = libperseus
+
+CONFIG(MINGW32):LIBPERSEUSSRC = "D:\softs\libperseus-sdr"
+CONFIG(MINGW64):LIBPERSEUSSRC = "D:\softs\libperseus-sdr"
+INCLUDEPATH += $$LIBPERSEUSSRC
+
+CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
+CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
+
+SOURCES = $$LIBPERSEUSSRC/fifo.c\
+  $$LIBPERSEUSSRC/perseus24v11_512.c\
+  $$LIBPERSEUSSRC/perseus24v41_512.c\
+  $$LIBPERSEUSSRC/perseuserr.c\
+  $$LIBPERSEUSSRC/perseusfx2.c\
+  $$LIBPERSEUSSRC/perseus-in.c\
+  $$LIBPERSEUSSRC/perseus-sdr.c
+
+HEADERS = $$LIBPERSEUSSRC/fifo.h\
+  $$LIBPERSEUSSRC/perseuserr.h\
+  $$LIBPERSEUSSRC/perseusfx2.h\
+  $$LIBPERSEUSSRC/perseus-in.h\
+  $$LIBPERSEUSSRC/perseus-sdr.h
+
+CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
+CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+
+CONFIG(ANDROID):CONFIG += mobility
+CONFIG(ANDROID):MOBILITY =
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@ -88,6 +88,7 @@ if (BUILD_DEBIAN)
    add_subdirectory(bladerfinput)
    add_subdirectory(sdrplay)
    add_subdirectory(limesdrinput)
+    add_subdirectory(perseus)
    add_subdirectory(plutosdrinput)
 endif (BUILD_DEBIAN)

--- a/plugins/samplesource/perseus/perseusgui.ui
+++ b/plugins/samplesource/perseus/perseusgui.ui
@ -274,7 +274,7 @@
        </size>
       </property>
       <property name="toolTip">
-        <string>Device sample rate in MS/s</string>
+        <string>Device sample rate in kS/s</string>
       </property>
       <property name="layoutDirection">
        <enum>Qt::RightToLeft</enum>
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@ -23,6 +23,7 @@ SUBDIRS += libbladerf
 SUBDIRS += libhackrf
 SUBDIRS += libiio
 SUBDIRS += liblimesuite
+SUBDIRS += libperseus
 SUBDIRS += librtlsdr
 SUBDIRS += libsqlite3
 SUBDIRS += devices
--- a/swagger/sdrangel/examples/devicesets_config.py
+++ b/swagger/sdrangel/examples/devicesets_config.py
@ -19,7 +19,7 @@ commands = [
    ["/preset", "PATCH", None, {"deviceSetIndex": 1, "preset": {"groupName": "OM430", "centerFrequency": 439550000, "type": "R", "name": "F5ZKP Daemon RPi3 SUSE"}}, "load preset on Rx 1"],
    ["/deviceset", "POST", None, None, "add Rx 2 device set"],
 #    ["/deviceset/2/device", "PUT", None, {"hwType": "SDRplay1"}, "setup SDRplay on Rx 2"],
-    ["/deviceset/2/device", "PUT", None, {"hwType": "AirspyHF"}, "setup Airspy HF+ on Rx 2"],
+    ["/deviceset/2/device", "PUT", None, {"hwType": "Perseus"}, "setup Perseus on Rx 2"],
    ["/preset", "PATCH", None, {"deviceSetIndex": 2, "preset": {"groupName": "40m", "centerFrequency": 7130000, "type": "R", "name": "SSB low"}}, "load preset on Rx 2"],
    ["/dvserial", "PATCH", {"dvserial": 1}, None, "set DV serial processing for AMBE frames decoding"],
 #    ["/preset", "PATCH", None, {"deviceSetIndex": 0, "preset": {"groupName": "OM144", "centerFrequency": 145640000, "type": "R", "name": "Repeaters extended"}}, "load preset on Rx 0 twice"],