Merge pull request #403 from Matom-ai/litepcie-update-minor-fixups

Minor fixups

.github/workflows/gtest.yml

@@ -9,7 +9,6 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
   CMAKE_BUILD_PARALLEL_LEVEL: 2
-  SOAPY_SDR_BRANCH: master
   INSTALL_PREFIX: ${{github.workspace}}/deps
 
 jobs:
@@ -19,7 +18,7 @@ jobs:
       matrix:
         os:
           [ubuntu-latest, windows-latest]
-          # os: [ubuntu-latest, macos-latest, ]
+          # os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +31,7 @@ jobs:
 
       - name: Install osx dependencies
         if: matrix.os == 'macos-latest'
-        run: brew install libusb wxmac
+        run: brew install libusb
 
       - name: Download windows dependencies
         if: matrix.os == 'windows-latest'
@@ -43,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}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK -DBUILD_SHARED_LIBS=OFF
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK -DBUILD_SHARED_LIBS=OFF
 
       - name: Configure CMake (linux)
         if: matrix.os != 'windows-latest'
@@ -55,8 +54,7 @@ jobs:
       - name: Run tests (Linux)
         if: matrix.os != 'windows-latest'
         run: ${{github.workspace}}/build/bin/LimeSuite2Test
-      
+
       - name: Run tests (Windows)
         if: matrix.os == 'windows-latest'
         run: ${{github.workspace}}/build/bin/${{env.BUILD_TYPE}}/LimeSuite2Test.exe
-

GenerateDocumentation.Dockerfile

@@ -35,6 +35,7 @@ COPY Desktop/ Desktop/
 COPY external/ external/
 COPY cmake/ cmake/
 COPY amarisoft-plugin/ amarisoft-plugin/
+COPY udev-rules/ udev-rules/
 COPY SoapyLMS7/ SoapyLMS7/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt

TestCoverage.Dockerfile

@@ -10,6 +10,7 @@ COPY Desktop/ Desktop/
 COPY external/ external/
 COPY cmake/ cmake/
 COPY amarisoft-plugin/ amarisoft-plugin/
+COPY udev-rules/ udev-rules/
 COPY SoapyLMS7/ SoapyLMS7/
 COPY Changelog.txt Changelog.txt
 COPY CMakeLists.txt CMakeLists.txt

debian/rules

@@ -31,7 +31,7 @@ override_dh_auto_configure: $(GENERATED_INSTALL_FILES)
 	dh_auto_configure -- \
 		-DBUILD_SHARED_LIBS=ON \
 		-DCMAKE_AUTOSET_INSTALL_RPATH=FALSE \
-		-DUDEV_RULES_PATH=/lib/udev/rules.d \
+		-DUDEV_RULES_INSTALL_PATH=/lib/udev/rules.d \
 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
 		-DLIME_SUITE_EXTVER="$(DEB_VERSION_EXTRA)"
 

src/lms7002m/LMS7002M.cpp

@@ -1745,7 +1745,7 @@ OpStatus LMS7002M::Modify_SPI_Reg_bits(const uint16_t address, const uint8_t msb
 */
 OpStatus LMS7002M::Modify_SPI_Reg_mask(const uint16_t* addr, const uint16_t* masks, const uint16_t* values, uint8_t start, uint8_t stop)
 {
-    OpStatus status;
+    OpStatus status = OpStatus::SUCCESS;
     uint16_t reg_data;
     std::vector<uint16_t> addresses;
     std::vector<uint16_t> data;