updated to new 1.0.6 version

Author: GvozdevLeonid

.gitignore

@@ -8,5 +8,5 @@ dist/
 
 *.egg-info
 
-python_hackrf/libhackrf/hackrf_old.h
-python_hackrf/libhackrf/hackrf_old.c
+python_hackrf/pylibhackrf/hackrf_old.h
+python_hackrf/pylibhackrf/hackrf_old.c

MANIFEST.in

@@ -1,4 +1,4 @@
-include python_hackrf/libhackrf/hackrf.h
-include python_hackrf/libhackrf/chackrf.pxd
+include python_hackrf/pylibhackrf/hackrf.h
+include python_hackrf/pylibhackrf/chackrf.pxd
 include README.md
 include pyproject.toml

README.md

@@ -64,7 +64,7 @@ options:
   -s, --serial_numbers  show only founded serial_numbers
 ```
 ```
-usage: python -m python_hackrf sweep [-h] [-d] [-a] [-f] [-p] [-l] [-g] [-w] [-1] [-N] [-B] [-s] [-SR] [-r]
+usage: python -m python_hackrf sweep [-h] [-d] [-a] [-f] [-p] [-l] [-g] [-w] [-1] [-N] [-B] [-s] [-SR] [-BF] [-r]
 
 options:
   -h, --help  show this help message and exit
@@ -80,6 +80,7 @@ options:
   -B          binary output. If specified = Enable
   -s          sweep style ("L" - LINEAR, "I" - INTERLEAVED). Default is INTERLEAVED
   -SR         sample rate (2, 4, 6, 8, 10, 12, 14, 16, 18, 20). Default is 20
+  -BF         baseband filter (1.75, 2.5, 3.5, 5.0, 5.5, 6.0, 7.0, 8.0, 9.0, 10.0, 12.0, 14.0, 15.0 20.0, 24.0, 28.0). Default is 15.0
   -r          filename. output file
 ```
 ## Note

android/python_hackrf/__init__.py

@@ -5,7 +5,7 @@
 
 
 class PythonHackrffRecipe(CythonRecipe):
-    version = '1.0.5'
+    version = '1.0.6'
     url = 'https://github.com/GvozdevLeonid/python_hackrf/releases/download/v.{version}/python_hackrf-{version}.tar.gz'
     depends = ['python3', 'setuptools', 'libusb']
     site_packages_name = 'python_hackrf'
@@ -28,7 +28,7 @@ def postbuild_arch(self, arch):
         python_hackrf_dir = os.path.join(self.ctx.get_python_install_dir(arch.arch), 'python_hackrf')
         os.makedirs(python_hackrf_dir, exist_ok=True)
         try:
-            shutil.move(os.path.join(self.ctx.get_python_install_dir(arch.arch), 'libhackrf'), os.path.join(python_hackrf_dir, 'libhackrf'))
+            shutil.move(os.path.join(self.ctx.get_python_install_dir(arch.arch), 'pylibhackrf'), os.path.join(python_hackrf_dir, 'pylibhackrf'))
             shutil.move(os.path.join(self.ctx.get_python_install_dir(arch.arch), 'pyhackrf_tools'), os.path.join(python_hackrf_dir, 'pyhackrf_tools'))
 
             shutil.copy(os.path.join(self.get_build_dir(arch.arch), '__init__.py'), python_hackrf_dir)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python_hackrf"
-version = "1.0.5"
+version = "1.0.6"
 authors = [
   {name="Leonid Gvozdev", email="leo.gvozdev.dev@gmail.com"},
 ]

python_hackrf/__init__.py

@@ -1,2 +1,4 @@
-from python_hackrf.libhackrf import pyhackrf
+__version__ = '1.0.6'
+
+from python_hackrf.pylibhackrf import pyhackrf
 from python_hackrf.pyhackrf_tools import pyhackrf_info, pyhackrf_sweep

python_hackrf/__main__.py

@@ -1,5 +1,5 @@
 from .pyhackrf_tools import pyhackrf_info, pyhackrf_sweep
-from .libhackrf import pyhackrf
+from .pylibhackrf import pyhackrf
 import argparse
 
 if __name__ == '__main__':
@@ -16,7 +16,7 @@
     pyhackrf_info_parser.add_argument('-s', '--serial_numbers', action='store_true', help='show only founded serial_numbers')
 
     pyhackrf_sweep_parser = subparsers.add_parser(
-        'sweep', help='a command-line spectrum analyzer.', usage='python -m python_hackrf sweep [-h] [-d] [-a] [-f] [-p] [-l] [-g] [-w] [-1] [-N] [-B] [-s] [-SR] [-r]'
+        'sweep', help='a command-line spectrum analyzer.', usage='python -m python_hackrf sweep [-h] [-d] [-a] [-f] [-p] [-l] [-g] [-w] [-1] [-N] [-B] [-s] [-SR] [-BF] [-r]'
     )
     pyhackrf_sweep_parser.add_argument('-d', action='store', help='serial_number. serial number of desired HackRF', metavar='')
     pyhackrf_sweep_parser.add_argument('-a', action='store_true', help='amp_enable. RX RF amplifier. If specified = Enable')
@@ -30,6 +30,7 @@
     pyhackrf_sweep_parser.add_argument('-B', action='store_true', help='binary output. If specified = Enable')
     pyhackrf_sweep_parser.add_argument('-s', action='store', help='sweep style ("L" - LINEAR, "I" - INTERLEAVED). Default is INTERLEAVED', metavar='', default='I')
     pyhackrf_sweep_parser.add_argument('-SR', action='store', help='sample rate (2, 4, 6, 8, 10, 12, 14, 16, 18, 20). Default is 20', metavar='', default=20)
+    pyhackrf_sweep_parser.add_argument('-BF', action='store', help='baseband filter (1.75, 2.5, 3.5, 5.0, 5.5, 6.0, 7.0, 8.0, 9.0, 10.0, 12.0, 14.0, 15.0 20.0, 24.0, 28.0). Default is 15.0', metavar='', default=15.0)
     pyhackrf_sweep_parser.add_argument('-r', action='store', help='filename. output file', metavar='')
     args, unparsed_args = parser.parse_known_args()
 
@@ -69,5 +70,6 @@
                                       filename=args.r,
                                       sweep_style=pyhackrf.py_sweep_style.LINEAR if args.s == 'L' else pyhackrf.py_sweep_style.INTERLEAVED,
                                       sample_rate=int(args.SR) * 1e6,
+                                      baseband_filter=float(args.BF) * 1e6,
                                       print_to_console=True,
                                       )

python_hackrf/pyhackrf_tools/pyhackrf_info.py

@@ -26,21 +26,23 @@
 def pyhackrf_info(print_to_console: bool = True, initialize: bool = True) -> None | str:
     if initialize:
         pyhackrf.pyhackrf_init()
+
     print_info = ''
     device_list = pyhackrf.pyhackrf_device_list()
-    print_info += f'pyhackrf_info version: {pyhackrf.pyhackrf_library_release()}\n'
-    print_info += f'pylibhackrf version: {pyhackrf.pyhackrf_library_release()} ({pyhackrf.pyhackrf_library_version()})\n'
-    print_info += 'Found HackRF\n'
+    print_info += f'python_hackrf version: {pyhackrf.python_hackrf_library_version()}\n'
+    print_info += f'libhackrf version: {pyhackrf.pyhackrf_library_release()} ({pyhackrf.pyhackrf_library_version()})\n'
 
-    for i in range(device_list.devicecount):
-        device = pyhackrf.pyhackrf_open_by_serial(device_list.serial_numbers[i])
-        board_id, board_name = device.pyhackrf_board_id_read()
-        read_partid_serialno = device.pyhackrf_board_partid_serialno_read()
-        print_info += f'Index: {i}\n'
-        print_info += f'Serial number: {device_list.serial_numbers[i]}\n'
-        print_info += f'Board ID Number: {board_id} ({board_name})\n'
-        print_info += f'Firmware Version: {device.pyhackrf_version_string_read()} ({device.pyhackrf_usb_api_version_read()})\n'
-        print_info += f'Part ID Number: 0x{read_partid_serialno["part_id"][0]:08x} 0x{read_partid_serialno["part_id"][1]:08x}\n'
+    if device_list.devicecount > 0:
+        print_info += 'Found HackRF:\n'
+        for i in range(device_list.devicecount):
+            device = pyhackrf.pyhackrf_open_by_serial(device_list.serial_numbers[i])
+            board_id, board_name = device.pyhackrf_board_id_read()
+            read_partid_serialno = device.pyhackrf_board_partid_serialno_read()
+            print_info += f'Index: {i}\n'
+            print_info += f'Serial number: {device_list.serial_numbers[i]}\n'
+            print_info += f'Board ID Number: {board_id} ({board_name})\n'
+            print_info += f'Firmware Version: {device.pyhackrf_version_string_read()} ({device.pyhackrf_usb_api_version_read()})\n'
+            print_info += f'Part ID Number: 0x{read_partid_serialno["part_id"][0]:08x} 0x{read_partid_serialno["part_id"][1]:08x}\n'
 
     if print_to_console:
         print(print_info)

python_hackrf/pyhackrf_tools/pyhackrf_sweep.pyx

@@ -45,7 +45,6 @@ PY_BLOCKS_PER_TRANSFER = 16
 # hackrf sweep settings
 AVAILABLE_SAMPLING_RATES = (2_000_000, 4_000_000, 6_000_000, 8_000_000, 10_000_000, 12_000_000, 14_000_000, 16_000_000, 18_000_000, 20_000_000)
 AVAILABLE_BASEBAND_FILTER_BANDWIDTHS = (1_750_000, 2_500_000, 3_500_000, 5_000_000, 5_500_000, 6_000_000, 7_000_000, 8_000_000, 9_000_000, 10_000_000, 12_000_000, 14_000_000, 15_000_000, 20_000_000, 24_000_000, 28_000_000)
-BASEBAND_FILTER_BANDWIDTH_RATIO = 0.75
 INTERLEAVED_OFFSET_RATIO = 0.375
 LINEAR_OFFSET_RATIO = 0.5
 
@@ -229,7 +228,7 @@ cdef sweep_callback(buffer: np.ndarray[:], buffer_length: int, valid_length: int
 
 
 def pyhackrf_sweep(frequencies: list = [0, 6000], lna_gain: int = 16, vga_gain: int = 20, bin_width: int = 100_000,
-                   serial_number: str = None, amp_enable: bool = False, antenna_enable: bool = False, sample_rate: int = 20_000_000, bandwidth: int = 15_000_000,
+                   serial_number: str = None, amp_enable: bool = False, antenna_enable: bool = False, sample_rate: int = 20_000_000, baseband_filter: int = 15_000_000,
                    num_sweeps: int = None, binary_output: bool = False, one_shot: bool = False, use_queue: bool = False, filename: str = None, sweep_style: pyhackrf.py_sweep_style = pyhackrf.py_sweep_style.INTERLEAVED,
                    print_to_console: bool = True, device: pyhackrf.PyHackrfDevice = None):
 
@@ -250,11 +249,13 @@ def pyhackrf_sweep(frequencies: list = [0, 6000], lna_gain: int = 16, vga_gain:
         SAMPLE_RATE = int(sample_rate)
     else:
         SAMPLE_RATE = 20_000_000
-    
-    if bandwidth in AVAILABLE_BASEBAND_FILTER_BANDWIDTHS:
-        BASEBAND_FILTER_BANDWIDTH = int(bandwidth)
+
+    SAMPLE_RATE = int(sample_rate)
+
+    if baseband_filter in AVAILABLE_BASEBAND_FILTER_BANDWIDTHS:
+        BASEBAND_FILTER_BANDWIDTH = int(baseband_filter)
     else:
-        BASEBAND_FILTER_BANDWIDTH = int(SAMPLE_RATE * BASEBAND_FILTER_BANDWIDTH_RATIO)
+        BASEBAND_FILTER_BANDWIDTH = pyhackrf.pyhackrf_compute_baseband_filter_bw(int(baseband_filter))
 
     frequency_step_1 = sample_rate // 4
     frequency_step_2 = sample_rate // 2