PR for GNU Radio plug-in updates

.github/workflows/cmake.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Configure CMake (windows)
         if: matrix.os == 'windows-latest'
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_RELATIVE_PATH=deps/FX3SDK
 
       - name: Configure CMake (linux)
         if: matrix.os != 'windows-latest'

.github/workflows/gtest.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Configure CMake (windows)
         if: matrix.os == 'windows-latest'
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK -DBUILD_SHARED_LIBS=OFF
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DFX3_SDK_RELATIVE_PATH=deps/FX3SDK -DBUILD_SHARED_LIBS=OFF
 
       - name: Configure CMake (linux)
         if: matrix.os != 'windows-latest'

CMakeLists.txt

@@ -226,9 +226,9 @@ endif()
 add_subdirectory(src)
 
 ########################################################################
-## SoapySDR bindings for LMS7 RFIC driver
+## plugins for external programs
 ########################################################################
-add_subdirectory(SoapyLMS7)
+add_subdirectory(plugins)
 
 ########################################################################
 ## udev rules for linux usb
@@ -266,26 +266,19 @@ endif()
 ########################################################################
 if (ENABLE_HEADERS AND ENABLE_LIBRARY)
     configure_file(
-        ${PROJECT_SOURCE_DIR}/cmake/Modules/LimeSuiteConfigVersion.in.cmake
-        ${PROJECT_BINARY_DIR}/LimeSuiteConfigVersion.cmake
+        ${PROJECT_SOURCE_DIR}/cmake/Modules/LimeSuite2ConfigVersion.in.cmake
+        ${PROJECT_BINARY_DIR}/LimeSuite2ConfigVersion.cmake
     @ONLY)
 
+    install(EXPORT LimeSuite2 FILE
+        LimeSuite2Config.cmake
+        DESTINATION lib${LIB_SUFFIX}/cmake/${PROJECT_NAME})
+
     install(FILES
-        ${PROJECT_SOURCE_DIR}/cmake/Modules/LimeSuiteConfig.cmake
-        ${PROJECT_BINARY_DIR}/LimeSuiteConfigVersion.cmake
+        ${PROJECT_BINARY_DIR}/LimeSuite2ConfigVersion.cmake
         DESTINATION lib${LIB_SUFFIX}/cmake/${PROJECT_NAME})
 endif (ENABLE_HEADERS AND ENABLE_LIBRARY)
 
-########################################################################
-## freedesktop environment integration
-########################################################################
-add_subdirectory(Desktop)
-
-########################################################################
-## Octave plugin integration
-########################################################################
-add_subdirectory(amarisoft-plugin)
-
 #########################################################################
 # summary
 #########################################################################

DebPackage22.Dockerfile

@@ -8,20 +8,19 @@ COPY install_dependencies.sh install_dependencies.sh
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
     apt-get install -y --no-install-recommends \
-        dpkg-dev \
         debhelper \
+        dh-python \
+        dpkg-dev \
     && \
     ./install_dependencies.sh -y && \
     rm -rf /var/lib/apt/lists/*
 
-COPY amarisoft-plugin/ amarisoft-plugin/
 COPY cmake/ cmake/
 COPY debian/ debian/
 COPY debian/control_soapy0.7 debian/control
-COPY Desktop/ Desktop/
 COPY external/ external/
 COPY udev-rules/ udev-rules/
-COPY SoapyLMS7/ SoapyLMS7/
+COPY plugins/ plugins/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt
 COPY README.md README.md

DebPackage24.Dockerfile

@@ -7,24 +7,26 @@ COPY install_dependencies.sh install_dependencies.sh
 
 RUN apt update && \
     apt-get install -y --no-install-recommends \
-        dpkg-dev \
         debhelper \
+        dh-python \
+        dpkg-dev \
+        gnuradio-dev \
     && \
     ./install_dependencies.sh -y && \
     rm -rf /var/lib/apt/lists/*
 
-COPY amarisoft-plugin/ amarisoft-plugin/
 COPY cmake/ cmake/
 COPY debian/ debian/
-COPY Desktop/ Desktop/
 COPY external/ external/
 COPY udev-rules/ udev-rules/
-COPY SoapyLMS7/ SoapyLMS7/
+COPY plugins/ plugins/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt
 COPY README.md README.md
 COPY src/ src/
 
+RUN patch debian/control < debian/control.patch
+RUN patch debian/rules < debian/rules.patch
 RUN dpkg-buildpackage --build=binary --no-sign
 
 FROM scratch AS export-stage

GenerateDocumentation.Dockerfile

@@ -31,12 +31,10 @@ COPY docs/requirements.txt docs/requirements.txt
 
 RUN pip install -r docs/requirements.txt
 
-COPY Desktop/ Desktop/
 COPY external/ external/
 COPY cmake/ cmake/
-COPY amarisoft-plugin/ amarisoft-plugin/
 COPY udev-rules/ udev-rules/
-COPY SoapyLMS7/ SoapyLMS7/
+COPY plugins/ plugins/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt
 COPY src/ src/

TestCoverage.Dockerfile

@@ -6,12 +6,10 @@ RUN apt update && \
     apt-get install -y lcov && \
     ./install_dependencies.sh -y
 
-COPY Desktop/ Desktop/
 COPY external/ external/
 COPY cmake/ cmake/
-COPY amarisoft-plugin/ amarisoft-plugin/
 COPY udev-rules/ udev-rules/
-COPY SoapyLMS7/ SoapyLMS7/
+COPY plugins/ plugins/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt
 COPY src/ src/

cmake/Modules/FindCyAPI.cmake

@@ -12,11 +12,13 @@ if(NOT WIN32)
 endif()
 
 if(MSVC)
-	set(FX3_SDK_PATH "$ENV{FX3_INSTALL_PATH}" CACHE PATH "Path to the Cypress FX3 SDK")
 	if(NOT EXISTS "${FX3_SDK_PATH}")
-		message(STATUS
-		"Cypress backend not available. The following location does not exist: FX3_SDK_PATH=${FX3_SDK_PATH}")
-		return()
+		set(FX3_SDK_PATH "$ENV{FX3_INSTALL_PATH}" CACHE PATH "Path to the Cypress FX3 SDK")
+		if(NOT EXISTS "${FX3_SDK_PATH}")
+			message(STATUS
+				"Cypress backend not available. The following location does not exist: FX3_SDK_PATH=${FX3_SDK_PATH}")
+			return()
+		endif()
 	endif()
 	find_file(CYAPI_HEADER_FILE
 		NAMES

cmake/Modules/LimeSuiteConfig.cmake → cmake/Modules/LimeSuite2Config.cmake

@@ -27,13 +27,13 @@ endif ()
 ## locate the library
 ########################################################################
 find_library(
-  LIMESUITE_LIBRARY LimeSuite
+  LIMESUITE_LIBRARY LimeSuite2
   PATHS ${LIMESUITE_ROOT}/lib${LIB_SUFFIX}
   PATH_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE}
   NO_DEFAULT_PATH
   )
 if(NOT LIMESUITE_LIBRARY)
-  message(FATAL_ERROR "cannot find LimeSuite library in ${LIMESUITE_ROOT}/lib${LIB_SUFFIX}")
+  message(FATAL_ERROR "cannot find LimeSuite2 library in ${LIMESUITE_ROOT}/lib${LIB_SUFFIX}")
 endif()
 set(LimeSuite_LIBRARIES ${LIMESUITE_LIBRARY})
 
@@ -46,13 +46,13 @@ find_path(
   NO_DEFAULT_PATH
 )
 if(NOT LIMESUITE_INCLUDE_DIR)
-  message(FATAL_ERROR "cannot find LimeSuite includes in ${LIMESUITE_ROOT}/include")
+  message(FATAL_ERROR "cannot find LimeSuite2 includes in ${LIMESUITE_ROOT}/include")
 endif()
 set(LimeSuite_INCLUDE_DIRS ${LIMESUITE_INCLUDE_DIR})
 
 ########################################################################
 ## create import library target
 ########################################################################
-add_library(LimeSuite SHARED IMPORTED)
-set_property(TARGET LimeSuite PROPERTY IMPORTED_LOCATION ${LIMESUITE_LIBRARY})
-set_property(TARGET LimeSuite PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LIMESUITE_INCLUDE_DIR})
+add_library(LimeSuite2 SHARED IMPORTED)
+set_property(TARGET LimeSuite2 PROPERTY IMPORTED_LOCATION ${LIMESUITE_LIBRARY})
+set_property(TARGET LimeSuite2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LIMESUITE_INCLUDE_DIR})

debian/control.patch

@@ -0,0 +1,26 @@
+diff --git a/debian/control b/debian/control
+index 6d0f6351..16c04bad 100644
+--- a/debian/control
++++ b/debian/control
+@@ -7,6 +7,7 @@ Build-Depends:
+     cmake (>= 3.14),
+     libusb-1.0-0-dev,
+     libwxgtk3.0-dev | libwxgtk3.0-gtk3-dev | libwxgtk3.2-dev,
++    gnuradio-dev,
+ Standards-Version: 4.1.1
+ Homepage: https://myriadrf.org/projects/lime-suite/
+ Vcs-Git: https://github.com/myriadrf/LimeSuite.git
+@@ -89,3 +90,13 @@ Depends:
+     ${misc:Depends}
+ Description: Lime Suite - SoapySDR bindings
+  Lime Suite application software.
++
++Package: gr-limesdr
++Architecture: any
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
++         gnuradio,
++         liblimesuite-dev (= ${binary:Version})
++Description:GNU-Radio blocks used to interface with various LimeSDR boards.
++ Implementation of GNU-Radio out of tree modules which allow to interface with
++ LimeSDR-USB, LimeSDR-Mini,LimeNET-Micro and LimeSDR-QPCIe boards.

debian/gr-limesdr.install

@@ -0,0 +1,2 @@
+usr/lib/python3*/site-packages/limesdr/*
+usr/share/gnuradio/grc/blocks/limesdr_*

debian/rules

@@ -25,7 +25,7 @@ debian/limesuite-images$(RELEASE_NUM)%: debian/limesuite-images%.in
 export DH_OPTIONS
 
 %:
-	dh $@ --buildsystem=cmake --parallel --builddirectory=build
+	dh $@ --with python3 --buildsystem=cmake --parallel --builddirectory=build
 
 override_dh_auto_configure: $(GENERATED_INSTALL_FILES)
 	dh_auto_configure -- \

debian/rules.patch

@@ -0,0 +1,14 @@
+diff --git a/debian/rules b/debian/rules
+index 13ea715f..8b114b71 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -33,7 +33,8 @@ override_dh_auto_configure: $(GENERATED_INSTALL_FILES)
+ 		-DCMAKE_AUTOSET_INSTALL_RPATH=FALSE \
+ 		-DUDEV_RULES_INSTALL_PATH=/lib/udev/rules.d \
+ 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+-		-DLIME_SUITE_EXTVER="$(DEB_VERSION_EXTRA)"
++		-DLIME_SUITE_EXTVER="$(DEB_VERSION_EXTRA)" \
++		-DENABLE_GNURADIO=ON
+
+ override_dh_installchangelogs:
+ 	dh_installchangelogs Changelog.txt

docs/doxygen/DoxyfileAPI.in

@@ -764,7 +764,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @CMAKE_SOURCE_DIR@/src/lime/LimeSuite.h @CMAKE_SOURCE_DIR@/docs/doxygen/mainpage.dox
+INPUT                  = @CMAKE_SOURCE_DIR@/src/include/limesuite/LimeSuite.h @CMAKE_SOURCE_DIR@/docs/doxygen/mainpage.dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

plugins/CMakeLists.txt

@@ -0,0 +1,29 @@
+########################################################################
+## Octave plugin integration
+########################################################################
+add_subdirectory(amarisoft-plugin)
+# add_subdirectory(octave)
+
+########################################################################
+## freedesktop environment integration
+########################################################################
+add_subdirectory(Desktop)
+
+########################################################################
+## QuickTest software
+########################################################################
+# add_subdirectory(QuickTest)
+
+########################################################################
+## SoapySDR bindings
+########################################################################
+add_subdirectory(SoapyLMS7)
+
+########################################################################
+## GNU Radio plugin
+########################################################################
+option(ENABLE_GNURADIO "Enable build library" OFF)
+add_feature_info(GNURADIO ENABLE_GNURADIO "GNU Radio 3.9+ Plug-in")
+if (ENABLE_GNURADIO)
+    add_subdirectory(gr-limesdr)
+endif()

SoapyLMS7/Registration.cpp → plugins/SoapyLMS7/Registration.cpp

@@ -8,7 +8,7 @@
 #include <SoapySDR/Registry.hpp>
 #include <SoapySDR/Logger.hpp>
 
-#include "Logger.h"
+#include "limesuite/Logger.h"
 
 using namespace lime;
 

SoapyLMS7/Settings.cpp → plugins/SoapyLMS7/Settings.cpp

@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "Logger.h"
+#include "limesuite/Logger.h"
 
 using namespace lime;
 
@@ -424,7 +424,8 @@ double SoapyLMS7::getFrequency(const int direction, const size_t channel, const
     if (name == "BB")
     {
         const TRXDir dir = (direction == SOAPY_SDR_TX) ? TRXDir::Tx : TRXDir::Rx;
-        return sdrDevice->GetNCOFrequency(0, dir, channel, 0);
+        double phaseOffset = 0.0;
+        return sdrDevice->GetNCOFrequency(0, dir, channel, 0, phaseOffset);
     }
 
     throw std::runtime_error("SoapyLMS7::getFrequency(" + name + ") unknown name");

SoapyLMS7/Streaming.cpp → plugins/SoapyLMS7/Streaming.cpp

@@ -14,7 +14,7 @@
 #include <ratio>
 #include <thread>
 
-#include "Logger.h"
+#include "limesuite/Logger.h"
 
 using namespace lime;
 

plugins/gr-limesdr/CMakeLists.txt

@@ -0,0 +1 @@
+# Placeholder file to put the repository in here

plugins/octave/.clang-format

@@ -0,0 +1,2 @@
+SortIncludes: false
+DisableFormat: true