updated

Author: GvozdevLeonid

python_hackrf/pyhackrf_tools/pyhackrf_sweep.pyx

@@ -406,9 +406,8 @@ def pyhackrf_sweep(frequencies: list[int] | None = None, sample_rate: int = 20_0
     if print_to_console:
         sys.stderr.write(f'Total sweeps: {device_data["sweep_count"]} in {time_now - time_start:.5f} seconds ({sweep_rate :.2f} sweeps/second)\n')
 
-    sdr_ids.pop(device.serialno, None)
     working_sdrs[device_id].store(0)
-    device.device_data = {}
+    device_serial = device.serialno
 
     if antenna_enable:
         try:
@@ -423,6 +422,8 @@ def pyhackrf_sweep(frequencies: list[int] | None = None, sample_rate: int = 20_0
     except Exception as e:
         sys.stderr.write(f'{e}\n')
 
+    sdr_ids.pop(device_serial, None)
+
     try:
         pyhackrf.pyhackrf_exit()
         if print_to_console:

python_hackrf/pyhackrf_tools/pyhackrf_transfer.pyx

@@ -468,9 +468,8 @@ def pyhackrf_transfer(frequency: int | None = None, sample_rate: int = 10_000_00
         except Exception as e:
             sys.stderr.write(f'{e}\n')
 
-    sdr_ids.pop(device.serialno, None)
     working_sdrs[device_id].store(0)
-    device.device_data = {}
+    device_serial = device.serialno
 
     if antenna_enable:
         try:
@@ -485,6 +484,8 @@ def pyhackrf_transfer(frequency: int | None = None, sample_rate: int = 10_000_00
     except Exception as e:
         sys.stderr.write(f'{e}\n')
 
+    sdr_ids.pop(device_serial, None)
+
     try:
         pyhackrf.pyhackrf_exit()
         if print_to_console:

python_hackrf/pylibhackrf/pyhackrf.pyx

@@ -368,6 +368,7 @@ cdef class PyHackrfDevice:
 
             result = chackrf.hackrf_close(self.__hackrf_device)
             self.__hackrf_device = NULL
+            self.device_data.clear()
 
             raise_error('pyhackrf_close()', result)