From 81143a72c474270890a8a326a14558b7b5e6f203 Mon Sep 17 00:00:00 2001 From: Brendan Haines Date: Mon, 7 Jul 2025 22:10:02 -0600 Subject: [PATCH] bettah port handling --- charon_vna/vna.py | 7 +++++-- charon_vna/vna_dev.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charon_vna/vna.py b/charon_vna/vna.py index d9da261..84ed88f 100644 --- a/charon_vna/vna.py +++ b/charon_vna/vna.py @@ -90,8 +90,11 @@ class Charon: self, ip: str = DEFAULT_IP, frequency: npt.ArrayLike = np.linspace(1e9, 2e9, 3), - ports: Tuple[int] = (1,), + ports: Tuple[int] | int = 1, ): + if isinstance(ports, int): + ports = (np.arange(ports) + 1).tolist() + ports = tuple(ports) self.ports = ports self.frequency = frequency @@ -143,7 +146,7 @@ class Charon: self._set_dac_code(value=0, channel=2) # set default switch state - self.set_switches(a=0, b=0) + self.set_switches(a=self.ports[0] - 1, b=self.ports[0] - 1) def get_config(self) -> Dict[str, Any]: config = dict() diff --git a/charon_vna/vna_dev.py b/charon_vna/vna_dev.py index 1705564..b2b17cf 100644 --- a/charon_vna/vna_dev.py +++ b/charon_vna/vna_dev.py @@ -8,7 +8,7 @@ from charon_vna.vna import Charon frequency = np.linspace(80e6, 280e6, 31) # %% -vna = Charon(frequency=frequency, ports=[1, 2]) +vna = Charon(frequency=frequency, ports=2) # %% s = vna.sweep_b_over_a()