diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 78e0201725..1337b5a444 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -28,7 +28,7 @@ jobs: uses: microsoft/setup-msbuild@v1.1 with: msbuild-architecture: ${{matrix.platform}} - + - name: Restore vcpkg packages working-directory: ${{env.GITHUB_WORKSPACE}} run: | @@ -46,6 +46,16 @@ jobs: cp C:\vcpkg\installed\${{matrix.platform}}-windows\lib\*.lib lib cp C:\vcpkg\installed\${{matrix.platform}}-windows\bin\*.dll release + + - name: Download SDRPlay API from SDRPP build + run: Invoke-WebRequest -Uri "https://drive.google.com/uc?id=12UHPMwkfa67A11QZDmpCT4iwHnyJHWuu" -OutFile ${{runner.workspace}}/SDRPlay.zip + + - name: Install SDRPlay API + run: | + 7z x ${{runner.workspace}}/SDRPlay.zip -o"C:/Program Files/" + cp "C:\Program Files\SDRplay\API\docs\SDRplay_RSP_API_Release_Notes_V3.07.pdf" output\Licenses\SDRPLAY.pdf + + - name: Building run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 84cfe4b9cb..6ba2013362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,7 +259,7 @@ if(SDRPLAY) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(SDRPLAY_API_LIB_DIR ${SDRPLAY_API_DIR}\\x64\\) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(SDRPLAY_API_LIB_DIR ${SDRPLAY_API_DIR}\\x32\\) + set(SDRPLAY_API_LIB_DIR ${SDRPLAY_API_DIR}\\x86\\) endif() find_path(SDRPLAY_INCLUDE_DIR sdrplay_api.h HINTS ${SDRPLAY_API_DIR}\\inc) diff --git a/README.md b/README.md index 0fb40d5968..44b21a37a3 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ Recent releases: If you are looking for a Windows binary supporting SDRplay API 3.09 for RSP1/RSP1A/RSPDX, please get in contact with [me](mailto:jvde.github@gmail.com). If you are looking for a Windows x64 version for the latest development version, it is automatically produced by the ``msbuild`` workflow (see Actions). -## Latest news: Android version available for testing [here](https://github.com/jvde-github/AIS-catcher-for-Android). +## Latest news: Android version available [here](https://github.com/jvde-github/AIS-catcher-for-Android). +For now I have decided not to share AIS-catcher-for-Android via the Play Store as there is too much overhead for such a simple program. You can download the APK from the mentioned project page. ## Recent Developments @@ -50,6 +51,7 @@ AIS-catcher -v -b -q -m 2 -m 2 -go SOXR on -m 2 -go DROOP_COMPENSATION on the [Shipplotter forum](https://groups.io/g/shipplotter/topic/ais_type_27_long_range/92150532?p=,,,20,0,0,0::recentpostdate/sticky,,,20,2,0,92150532,previd%3D1657138240979957244,nextid%3D1644163712453715490&previd=1657138240979957244&nextid=1644163712453715490) and at request of a user. The conventional decoder is available with the switch ```-o AB``` which is also the default if nothing is specified. Plan is to add a ```-o ABCD``` mode for Airspy/HackRF and other devices that cater for sufficiently high sample rates. I noticed that gpsdecode cannot handle channel designations in NMEA lines of C and D. You can provide an optional argument to use channel A and B again in the NMEA line with the command ```-o CD AB```. +- SDRplay support included in Windows pre-build binaries ### Version 0.36 - added SpyServer, SoapySDR, SOXR downsampling support.