From dd04d0ef312ddea16d2b87303d4f4e3c9cda1896 Mon Sep 17 00:00:00 2001 From: Maans Jacobsson Date: Fri, 5 Apr 2024 17:19:11 +0200 Subject: [PATCH] Fixed all the imports and moved Version.py to the Hardawre folder --- main.py | 6 +++--- src/Hardware/AVNA.py | 4 ++-- src/Hardware/Hardware.py | 26 +++++++++++++------------- src/Hardware/JNCRadio_VNA_3G.py | 4 ++-- src/Hardware/NanoVNA.py | 6 +++--- src/Hardware/NanoVNA_F.py | 4 ++-- src/Hardware/NanoVNA_F_V2.py | 4 ++-- src/Hardware/NanoVNA_H.py | 4 ++-- src/Hardware/NanoVNA_H4.py | 4 ++-- src/Hardware/NanoVNA_V2.py | 6 +++--- src/Hardware/SV4401A.py | 4 ++-- src/Hardware/SV6301A.py | 4 ++-- src/Hardware/TinySA.py | 4 ++-- src/Hardware/VNA.py | 4 ++-- src/{ => Hardware}/Version.py | 0 src/NanoVNASaverHeadless.py | 22 ++++------------------ 16 files changed, 46 insertions(+), 60 deletions(-) rename src/{ => Hardware}/Version.py (100%) diff --git a/main.py b/main.py index 9291914..d2e13e7 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ -from src.Hardware import Hardware as hw -from src.Hardware.VNA import VNA +from src.NanoVNASaverHeadless import NanoVNASaverHeadless ############### TODO: Implement high level script for newbies. ####################### -pass +t = NanoVNASaverHeadless(vna_index=0, verbose=True) +t.kill() diff --git a/src/Hardware/AVNA.py b/src/Hardware/AVNA.py index bcb7f78..65f9acd 100644 --- a/src/Hardware/AVNA.py +++ b/src/Hardware/AVNA.py @@ -18,8 +18,8 @@ # along with this program. If not, see . import logging -from Hardware.Serial import Interface -from Hardware.VNA import VNA +from .Serial import Interface +from .VNA import VNA logger = logging.getLogger(__name__) diff --git a/src/Hardware/Hardware.py b/src/Hardware/Hardware.py index 29c9814..8d0e1b7 100644 --- a/src/Hardware/Hardware.py +++ b/src/Hardware/Hardware.py @@ -25,19 +25,19 @@ import serial from serial.tools import list_ports from serial.tools.list_ports_common import ListPortInfo -from Hardware.VNA import VNA -from Hardware.AVNA import AVNA -from Hardware.NanoVNA import NanoVNA -from Hardware.NanoVNA_F import NanoVNA_F -from Hardware.NanoVNA_F_V2 import NanoVNA_F_V2 -from Hardware.NanoVNA_H import NanoVNA_H -from Hardware.NanoVNA_H4 import NanoVNA_H4 -from Hardware.NanoVNA_V2 import NanoVNA_V2 -from Hardware.TinySA import TinySA, TinySA_Ultra -from Hardware.JNCRadio_VNA_3G import JNCRadio_VNA_3G -from Hardware.SV4401A import SV4401A -from Hardware.SV6301A import SV6301A -from Hardware.Serial import drain_serial, Interface +from .VNA import VNA +from .AVNA import AVNA +from .NanoVNA import NanoVNA +from .NanoVNA_F import NanoVNA_F +from .NanoVNA_F_V2 import NanoVNA_F_V2 +from .NanoVNA_H import NanoVNA_H +from .NanoVNA_H4 import NanoVNA_H4 +from .NanoVNA_V2 import NanoVNA_V2 +from .TinySA import TinySA, TinySA_Ultra +from .JNCRadio_VNA_3G import JNCRadio_VNA_3G +from .SV4401A import SV4401A +from .SV6301A import SV6301A +from .Serial import drain_serial, Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/JNCRadio_VNA_3G.py b/src/Hardware/JNCRadio_VNA_3G.py index 867d2fe..36f078c 100644 --- a/src/Hardware/JNCRadio_VNA_3G.py +++ b/src/Hardware/JNCRadio_VNA_3G.py @@ -21,8 +21,8 @@ import logging import serial from PyQt6.QtGui import QImage, QPixmap -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA.py b/src/Hardware/NanoVNA.py index adb189e..5217550 100644 --- a/src/Hardware/NanoVNA.py +++ b/src/Hardware/NanoVNA.py @@ -23,9 +23,9 @@ import serial import numpy as np from PyQt6.QtGui import QImage, QPixmap -from Hardware.Serial import drain_serial, Interface -from Hardware.VNA import VNA -from Version import Version +from .Serial import drain_serial, Interface +from .VNA import VNA +from .Version import Version logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA_F.py b/src/Hardware/NanoVNA_F.py index 7406112..3e938cf 100644 --- a/src/Hardware/NanoVNA_F.py +++ b/src/Hardware/NanoVNA_F.py @@ -18,8 +18,8 @@ # along with this program. If not, see . import logging -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA_F_V2.py b/src/Hardware/NanoVNA_F_V2.py index a9b1615..1679d6f 100644 --- a/src/Hardware/NanoVNA_F_V2.py +++ b/src/Hardware/NanoVNA_F_V2.py @@ -21,8 +21,8 @@ import logging import serial from PyQt6.QtGui import QImage, QPixmap -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA_H.py b/src/Hardware/NanoVNA_H.py index c394c46..26f9687 100644 --- a/src/Hardware/NanoVNA_H.py +++ b/src/Hardware/NanoVNA_H.py @@ -18,8 +18,8 @@ # along with this program. If not, see . import logging -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA_H4.py b/src/Hardware/NanoVNA_H4.py index 2416e5a..fe2bd8f 100644 --- a/src/Hardware/NanoVNA_H4.py +++ b/src/Hardware/NanoVNA_H4.py @@ -17,8 +17,8 @@ # along with this program. If not, see . import logging -from Hardware.Serial import Interface -from Hardware.NanoVNA_H import NanoVNA_H +from .Serial import Interface +from .NanoVNA_H import NanoVNA_H logger = logging.getLogger(__name__) diff --git a/src/Hardware/NanoVNA_V2.py b/src/Hardware/NanoVNA_V2.py index 8f17c5a..686a8b9 100644 --- a/src/Hardware/NanoVNA_V2.py +++ b/src/Hardware/NanoVNA_V2.py @@ -21,9 +21,9 @@ import platform from struct import pack, unpack_from from time import sleep -from Hardware.Serial import Interface -from Hardware.VNA import VNA -from Version import Version +from .Serial import Interface +from .VNA import VNA +from .Version import Version if platform.system() != "Windows": import tty diff --git a/src/Hardware/SV4401A.py b/src/Hardware/SV4401A.py index 824a040..0f0df59 100644 --- a/src/Hardware/SV4401A.py +++ b/src/Hardware/SV4401A.py @@ -21,8 +21,8 @@ import logging import serial from PyQt6.QtGui import QImage, QPixmap -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/SV6301A.py b/src/Hardware/SV6301A.py index 46457b4..35f0bbe 100644 --- a/src/Hardware/SV6301A.py +++ b/src/Hardware/SV6301A.py @@ -21,8 +21,8 @@ import logging import serial from PyQt6.QtGui import QImage, QPixmap -from Hardware.NanoVNA import NanoVNA -from Hardware.Serial import Interface +from .NanoVNA import NanoVNA +from .Serial import Interface logger = logging.getLogger(__name__) diff --git a/src/Hardware/TinySA.py b/src/Hardware/TinySA.py index 6d488d0..755f19a 100644 --- a/src/Hardware/TinySA.py +++ b/src/Hardware/TinySA.py @@ -23,8 +23,8 @@ import serial import numpy as np from PyQt6.QtGui import QImage, QPixmap -from Hardware.Serial import drain_serial, Interface -from Hardware.VNA import VNA +from .Serial import drain_serial, Interface +from .VNA import VNA logger = logging.getLogger(__name__) diff --git a/src/Hardware/VNA.py b/src/Hardware/VNA.py index 862a292..c02da32 100644 --- a/src/Hardware/VNA.py +++ b/src/Hardware/VNA.py @@ -20,8 +20,8 @@ import logging from time import sleep from typing import Iterator -from Version import Version -from Hardware.Serial import Interface, drain_serial +from .Version import Version +from .Serial import Interface, drain_serial logger = logging.getLogger(__name__) diff --git a/src/Version.py b/src/Hardware/Version.py similarity index 100% rename from src/Version.py rename to src/Hardware/Version.py diff --git a/src/NanoVNASaverHeadless.py b/src/NanoVNASaverHeadless.py index a2292b2..2ba201c 100644 --- a/src/NanoVNASaverHeadless.py +++ b/src/NanoVNASaverHeadless.py @@ -1,25 +1,11 @@ -from Hardware import Hardware as hw -from Hardware.VNA import VNA - -iface = hw.get_interfaces()[0] - -vna = hw.get_VNA(iface) -#vna.connect() -#vna.reconnect() - -#print(hw.get_portinfos()) -#print(hw.detect_version(iface)) - -print(vna.setSweep(1000, 2000)) -data = vna.readValues("data 0") - -vna.disconnect() +from .Hardware import Hardware as hw +from .Hardware.VNA import VNA class NanoVNASaverHeadless: def __init__(self, vna_index=0, verbose=False): self.verbose = verbose self.iface = hw.get_interfaces()[vna_index] - self.vna = hw.get_VNA(iface) + self.vna = hw.get_VNA(self.iface) if self.verbose: print("VNA is connected: ", self.vna.connected()) print("Firmware: ", self.vna.readFirmware()) @@ -41,4 +27,4 @@ class NanoVNASaverHeadless: else: if self.verbose: print("Disconnected VNA.") - return + return \ No newline at end of file