PyQa40x-i2c 0.2.2__tar.gz → 0.3.1__tar.gz

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyQa40x-i2c
-Version: 0.2.2
+Version: 0.3.1
 Summary: A Python library for the QA40x audio analyser (int2code fork)
 Maintainer-email: Hubert Stepniewski <hubert.stepniewski@int2code.com>
 License: MIT License

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/RELEASE_NOTES.md

@@ -1,3 +1,11 @@
+### 0.3.1
+
+[PATCH] Fix Stream.write() - ensure transfer queues not empty.
+
+### 0.3.0
+
+[MINOR] `Analyzer.init()` accepts `usb_serial` to open a specific QA402/QA403 by its USB serial number, so a PC with several analyzers can drive a chosen one. The argument is last and optional; without it the first analyzer found is opened, exactly as before.
+
 ### 0.2.2
 
 [PATCH] Allow reliable streaming for higher sample rates (`96kHz`, `192kHz`).

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/src/PyQa40x/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.3.1'
+__version_tuple__ = version_tuple = (0, 3, 1)
 
-__commit_id__ = commit_id = 'gf75dc49b9'
+__commit_id__ = commit_id = 'gaf795ecc5'

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/src/PyQa40x/analyzer.py

@@ -27,6 +27,9 @@ TRANSFER_BYTES_MAP = {
 
 class Analyzer:
 
+    VENDOR_ID = 0x16C0
+    PRODUCT_IDS = (0x4E37, 0x4E39)  # QA402, QA403
+
     def __init__(self):
         """
         Initializes the Analyzer class.
@@ -45,6 +48,55 @@ class Analyzer:
         self._dac_writer: threading.Thread | None = None  # set in start_capture()
         self._dac_writer_error: Exception | None = None  # error from DAC writer thread
 
+    def _open_analyzer(self, usb_serial: str | None = None):
+        """
+        Opens a QA402/QA403 analyzer on the USB bus.
+
+        Args:
+            usb_serial (str | None): USB serial number of the analyzer to open.
+                None opens the first analyzer found, which is the behaviour of
+                every release before serial selection was added.
+
+        Returns:
+            usb1.USBDeviceHandle: Handle of the opened analyzer.
+
+        Raises:
+            SystemExit: If no analyzer is connected, or if none of the connected
+                analyzers has the requested serial number.
+        """
+        if usb_serial is None:
+            for product_id in self.PRODUCT_IDS:
+                device = self.context.openByVendorIDAndProductID(
+                    self.VENDOR_ID, product_id
+                )
+                if device is not None:
+                    return device
+            raise SystemExit("No QA402/QA403 analyzer found")
+
+        connected: list[str] = []
+        for device in self.context.getDeviceList(skip_on_error=True):
+            if (
+                device.getVendorID() != self.VENDOR_ID
+                or device.getProductID() not in self.PRODUCT_IDS
+            ):
+                continue
+            try:
+                serial = device.getSerialNumber()
+            except usb1.USBError as error:
+                # Unreadable serial (usually missing udev permissions): the
+                # device cannot be matched, so report it as unknown.
+                logging.warning("Cannot read serial of a QA40x analyzer: %s", error)
+                serial = None
+            if serial == usb_serial:
+                logging.info("Opening QA40x analyzer with serial %s", serial)
+                return device.open()
+            connected.append(repr(serial))
+
+        raise SystemExit(
+            f"No QA402/QA403 analyzer with serial {usb_serial!r} found "
+            f"(connected: {', '.join(connected) or 'none'})"
+        )
+
     def init(
         self,
         sample_rate: int = 48000,
@@ -57,6 +109,7 @@ class Analyzer:
         amplitude_unit: str = "dbv",
         distortion_unit: str = "db",
         bt_device_name: str = "",
+        usb_serial: str | None = None,
     ) -> AnalyzerParams:
         """
         Initializes the analyzer hardware with the specified parameters.
@@ -72,6 +125,9 @@ class Analyzer:
             amplitude_unit (str): Unit for amplitude measurements, default is "dbv".
             distortion_unit (str): Unit for distortion measurements, default is "db".
             bt_device_name (str): Name of the Bluetooth device to use. Default is empty.
+            usb_serial (str | None): USB serial number of the analyzer to open,
+                e.g. "4334_E3B6". Needed only when several analyzers are
+                connected. Default None opens the first QA402/QA403 found.
 
         Returns:
             AnalyzerParams: A class instance containing the hardware and parameter settings.
@@ -87,16 +143,12 @@ class Analyzer:
         )
         self.context = usb1.USBContext()
         self.context.open()
-        self.chunk_size = TRANSFER_BYTES_MAP.get(sample_rate, Stream.DEFAULT_TRANSFER_BYTES)
-
-        # Attempt to open QA402 or QA403 device
-        self.device = self.context.openByVendorIDAndProductID(0x16C0, 0x4E37)  # QA402
-        if self.device is None:
-            self.device = self.context.openByVendorIDAndProductID(
-                0x16C0, 0x4E39
-            )  # QA403
-            if self.device is None:
-                raise SystemExit("No QA402/QA403 analyzer found")
+        self.chunk_size = TRANSFER_BYTES_MAP.get(
+            sample_rate, Stream.DEFAULT_TRANSFER_BYTES
+        )
+
+        # Attempt to open the requested QA402/QA403 device, or the first one
+        self.device = self._open_analyzer(usb_serial)
         self.device.resetDevice()
         self.device.claimInterface(0)
 
@@ -330,7 +382,7 @@ class Analyzer:
         interleaved_dac_data[1::2] = right_dac_data_float
 
         # Convert to bytes, multiplying by max int value
-        max_int_value = 2 ** 31 - 1
+        max_int_value = 2**31 - 1
         interleaved_dac_data = (interleaved_dac_data * max_int_value).astype(np.int32)
 
         num_ints_per_chunk = self.chunk_size // 4  # 32-bit ints, so 4 bytes per int
@@ -347,8 +399,8 @@ class Analyzer:
         try:
             for i in range(total_chunks):
                 chunk = interleaved_dac_data[
-                        i * num_ints_per_chunk: (i + 1) * num_ints_per_chunk
-                        ]
+                    i * num_ints_per_chunk : (i + 1) * num_ints_per_chunk
+                ]
                 buffer = struct.pack("<%di" % len(chunk), *chunk)
                 self.stream.write(buffer)
         finally:

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/src/PyQa40x/stream.py

@@ -193,22 +193,34 @@ class Stream:
 
     def write(self, buffer: bytes) -> None:
         """Submit one DAC playback buffer and one matching ADC read transfer."""
-        with self._transfer_lock:
-            if not self.running:
-                raise RuntimeError(
-                    "Stream is not running; call start() first.")
-            dac = self.device.getTransfer()
-            dac.setBulk(self.endpoint_write, buffer, self.transfer_helper,
-                        self._epoch, self.TRANSFER_TIMEOUT_MS)
-            dac.submit()
-            self._pending_transfers.add(dac)
-            read = self.device.getTransfer()
-            read.setBulk(self.endpoint_read, len(buffer), self.transfer_helper,
-                         self._epoch, self.TRANSFER_TIMEOUT_MS)
-            read.submit()
-            self._pending_transfers.add(read)
+        dac = self.device.getTransfer()
+        read = self.device.getTransfer()
+        # Enqueue before submit: a transfer can complete, and its callback
+        # drain the queue, before submit() returns.
         self.dacQueue.put(dac)
         self.adcQueue.put(read)
+        dac_submitted = read_submitted = False
+        with self._transfer_lock:
+            try:
+                if not self.running:
+                    raise RuntimeError(
+                        "Stream is not running; call start() first.")
+                dac.setBulk(self.endpoint_write, buffer, self.transfer_helper,
+                            self._epoch, self.TRANSFER_TIMEOUT_MS)
+                dac.submit()
+                dac_submitted = True
+                self._pending_transfers.add(dac)
+                read.setBulk(self.endpoint_read, len(buffer), self.transfer_helper,
+                             self._epoch, self.TRANSFER_TIMEOUT_MS)
+                read.submit()
+                read_submitted = True
+                self._pending_transfers.add(read)
+            except Exception:
+                if not dac_submitted:
+                    self.dacQueue.get_nowait()
+                if not read_submitted:
+                    self.adcQueue.get_nowait()
+                raise
 
     def write_zeros(self, chunk_bytes: int = DEFAULT_TRANSFER_BYTES) -> None:
         """Feed the ADC pipeline with a zero DAC buffer (continuous capture)."""

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/src/PyQa40x_i2c.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyQa40x-i2c
-Version: 0.2.2
+Version: 0.3.1
 Summary: A Python library for the QA40x audio analyser (int2code fork)
 Maintainer-email: Hubert Stepniewski <hubert.stepniewski@int2code.com>
 License: MIT License

{pyqa40x_i2c-0.2.2 → pyqa40x_i2c-0.3.1}/src/PyQa40x_i2c.egg-info/scm_file_list.json

@@ -1,58 +1,58 @@
 {
   "files": [
-    "tox.ini",
-    "requirements.txt",
-    "requirements-test.txt",
-    "requirements-dev.txt",
-    "MANIFEST.in",
-    "pyproject.toml",
+    ".github/workflows/code_checker.yml",
+    ".github/workflows/publish_package.yml",
+    ".github/workflows/unit_tests.yml",
+    ".gitignore",
     ".pylint_ignore",
     "LICENSE",
-    "RELEASE_NOTES.md",
+    "LibTest/FirstPrinciples.py",
+    "LibTest/PyQa40x_acoustic_chirp_spl_bt.py",
+    "LibTest/PyQa40x_acoustic_dbspl.py",
+    "LibTest/PyQa40x_acoustic_energy_decay_bt.py",
+    "LibTest/PyQa40x_coherent_averaging.py",
+    "LibTest/PyQa40x_cross_correlation.py",
+    "LibTest/PyQa40x_freq_response_with_mask.py",
+    "LibTest/PyQa40x_pinknoise.py",
+    "LibTest/PyQa40x_thdn.py",
+    "LibTest/mask_freq.txt",
+    "LibTest/mask_phase.txt",
+    "MANIFEST.in",
     "README.md",
-    ".gitignore",
-    ".github/workflows/code_checker.yml",
-    ".github/workflows/unit_tests.yml",
-    ".github/workflows/publish_package.yml",
-    "tests/__init__.py",
-    "tests/test_template.py",
-    "src/PyQa40x/sig_proc.py",
-    "src/PyQa40x/wave.py",
-    "src/PyQa40x/helpers.py",
-    "src/PyQa40x/freq_series_plotter.py",
-    "src/PyQa40x/math_sines.py",
-    "src/PyQa40x/wave_sine.py",
-    "src/PyQa40x/registers.py",
-    "src/PyQa40x/math_windows.py",
-    "src/PyQa40x/math_energy.py",
-    "src/PyQa40x/math_chirp.py",
+    "RELEASE_NOTES.md",
+    "_ci/is_dev_version.sh",
+    "pyproject.toml",
+    "requirements-dev.txt",
+    "requirements-test.txt",
+    "requirements.txt",
+    "src/PyQa40x.egg-info/PKG-INFO",
+    "src/PyQa40x.egg-info/SOURCES.txt",
+    "src/PyQa40x.egg-info/dependency_links.txt",
+    "src/PyQa40x.egg-info/requires.txt",
+    "src/PyQa40x.egg-info/top_level.txt",
+    "src/PyQa40x/__init__.py",
     "src/PyQa40x/analyzer.py",
     "src/PyQa40x/analyzer_params.py",
-    "src/PyQa40x/__init__.py",
-    "src/PyQa40x/math_general.py",
+    "src/PyQa40x/bluetooth.py",
     "src/PyQa40x/control.py",
-    "src/PyQa40x/wave_chirp.py",
-    "src/PyQa40x/series_plotter.py",
+    "src/PyQa40x/cross_correlation.py",
     "src/PyQa40x/fft_processor.py",
+    "src/PyQa40x/freq_series_plotter.py",
+    "src/PyQa40x/helpers.py",
+    "src/PyQa40x/math_chirp.py",
+    "src/PyQa40x/math_energy.py",
+    "src/PyQa40x/math_general.py",
+    "src/PyQa40x/math_sines.py",
+    "src/PyQa40x/math_windows.py",
+    "src/PyQa40x/registers.py",
+    "src/PyQa40x/series_plotter.py",
+    "src/PyQa40x/sig_proc.py",
     "src/PyQa40x/stream.py",
-    "src/PyQa40x/cross_correlation.py",
-    "src/PyQa40x/bluetooth.py",
-    "src/PyQa40x.egg-info/SOURCES.txt",
-    "src/PyQa40x.egg-info/dependency_links.txt",
-    "src/PyQa40x.egg-info/requires.txt",
-    "src/PyQa40x.egg-info/PKG-INFO",
-    "src/PyQa40x.egg-info/top_level.txt",
-    "_ci/is_dev_version.sh",
-    "LibTest/PyQa40x_thdn.py",
-    "LibTest/PyQa40x_freq_response_with_mask.py",
-    "LibTest/mask_phase.txt",
-    "LibTest/PyQa40x_coherent_averaging.py",
-    "LibTest/FirstPrinciples.py",
-    "LibTest/PyQa40x_cross_correlation.py",
-    "LibTest/PyQa40x_pinknoise.py",
-    "LibTest/mask_freq.txt",
-    "LibTest/PyQa40x_acoustic_energy_decay_bt.py",
-    "LibTest/PyQa40x_acoustic_dbspl.py",
-    "LibTest/PyQa40x_acoustic_chirp_spl_bt.py"
+    "src/PyQa40x/wave.py",
+    "src/PyQa40x/wave_chirp.py",
+    "src/PyQa40x/wave_sine.py",
+    "tests/__init__.py",
+    "tests/test_template.py",
+    "tox.ini"
   ]
 }

pyqa40x_i2c-0.3.1/src/PyQa40x_i2c.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.3.1",
+  "distance": 0,
+  "node": "gaf795ecc5b264bfa8e3c48f328a9af876cc3e7d2",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-28"
+}

pyqa40x_i2c-0.2.2/src/PyQa40x_i2c.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.2.2",
-  "distance": 0,
-  "node": "gf75dc49b93b52857fb5f1d4ae3825e1a36fc7a30",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-06"
-}