Updated hackrf library to v2023.01.1

hackrf library is now a submodule with patch applied to hackrf_sweep.c
for easier future updates.

Requires firmware on the hackrf to be updated as well to run now.

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/hackrf-sweep/lib/hackrf"]
+ path = src/hackrf-sweep/lib/hackrf
+ url = https://github.com/greatscottgadgets/hackrf.git
+ ignore = dirty

Readme.md

@@ -17,7 +17,8 @@ Linux: read Installation section below
 - hackrf_sweep integrated as a shared library
 
 ### Requirements:
-* HackRF One with [Firmware 2017.02.1](https://github.com/mossmann/hackrf/releases/tag/v2017.02.1) or newer (use linux inside virtual machine to [update the firmware](https://github.com/mossmann/hackrf/wiki/Updating-Firmware)) 
+* HackRF One with [Firmware 2023.01.1](https://github.com/mossmann/hackrf/releases/tag/v2023.01.1) or newer 
+(use linux inside VM and [update the firmware](https://hackrf.readthedocs.io/en/latest/updating_firmware.html)) 
 
 ### Installation:
 Make sure HackRF is using at least the minimum firmware version (see above) 
@@ -27,7 +28,7 @@ Windows:
 1. Install Java JRE 64bit v1.8+
 1. [Download the latest version of Spectrum Analyzer](https://github.com/pavsa/hackrf-spectrum-analyzer/releases) and unzip
 1. Install HackRF as a libusb device
- 1. [Download Zadig](src/hackrf-sweep/lib/zadig_2.2.exe) and run
+ 1. [Download Zadig](https://zadig.akeo.ie/) and install
  2. Goto Options and check List All Devices
  3. Find "HackRF One" and select Driver "WinUSB" and click install
 1. Install (if you don't have one installed) [Java JRE for Windows x64](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) 

src/hackrf-sweep/.classpath

@@ -9,7 +9,7 @@
  <classpathentry kind="lib" path="miglayout15-swing.jar" sourcepath="miglayout-src.zip"/>
  <classpathentry kind="lib" path="lib/jcommon-1.0.17.jar"/>
  <classpathentry kind="lib" path="lib/jfreechart-1.0.14.jar"/>
- <classpathentry kind="lib" path="lib/jna/jna-4.5.1.jar"/>
  <classpathentry kind="lib" path="lib/hackrf-sweep-jna.jar"/>
+ <classpathentry kind="lib" path="lib/jna/jna-5.13.0.jar"/>
  <classpathentry kind="output" path="bin"/>
 </classpath>

src/hackrf-sweep/Makefile

@@ -81,7 +81,7 @@ ZIP_FILE_PATH = $(OUTPUT_DLL_DIR)/../../$(ZIP_FILE)
 .NOTPARALLEL: all
 .PHONY: all
 
-all: prepare $(MAIN_JAR) $(DLL_LIB) $(ZIP_FILE_PATH)
+all: patch_hackrf prepare $(MAIN_JAR) $(DLL_LIB) $(ZIP_FILE_PATH)
 
 .PHONY: dirs
 dirs:
@@ -99,6 +99,11 @@ $(ZIP_FILE_PATH): $(DLL_LIB) $(DLL_LIB_WIN)
  cd $(OUTPUT_DLL_DIR)/../../ && rm -rf $(ZIP_FILE) && zip -r $(ZIP_FILE) *
  yes | cp -rf $(ZIP_FILE_PATH) $(RELEASE_DIR)
 
+.PHONY: patch_hackrf
+patch_hackrf:
+ # format the src # clang-format --style=file:../../../.clang-format -i hackrf_sweep.c
+ (cd lib/hackrf/ && git reset --hard v2023.01.1 && git apply < ../../src-c/0001-hackrf_sweep-to-library-conversion.patch)
+
 .PHONY: prepare
 prepare: dirs $(OBJECTS) $(OBJECTS_WIN) $(DLL_LIB_FFTW)
  mkdir -p $(OUTPUT_DLL_DIR) $(OUTPUT_DLL_DIR_WIN) 
@@ -107,7 +112,6 @@ prepare: dirs $(OBJECTS) $(OBJECTS_WIN) $(DLL_LIB_FFTW)
  cp lib/launchers/hackrf_sweep_spectrum_analyzer_windows.cmd $(OUTPUT_PATH)
  chmod +x $(OUTPUT_PATH)/hackrf_sweep_spectrum_analyzer_linux.sh #linux launcher
  cp -f $(DLL_LIB_FFTW) $(DLL_LIB_PTHREAD) $(DLL_LIB_USB) $(OUTPUT_DLL_DIR_WIN)
- cp -f lib/zadig-2.5.exe $(OUTPUT_DLL_DIR_WIN)/../
 
 # if native header in hackrf lib changes, rebuild with "make jnabridge" - but openjdk-8 is required - jnaerator does not work with jdk9+
 .PHONY: jnabridge