kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Fixed all the imports and moved Version.py to the Hardawre folder
rodzic
e7067d9d76
commit
dd04d0ef31
6
main.py
6
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()
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
import logging
|
||||
|
||||
from Hardware.Serial import Interface
|
||||
from Hardware.VNA import VNA
|
||||
from .Serial import Interface
|
||||
from .VNA import VNA
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
import logging
|
||||
|
||||
from Hardware.NanoVNA import NanoVNA
|
||||
from Hardware.Serial import Interface
|
||||
from .NanoVNA import NanoVNA
|
||||
from .Serial import Interface
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
import logging
|
||||
|
||||
from Hardware.NanoVNA import NanoVNA
|
||||
from Hardware.Serial import Interface
|
||||
from .NanoVNA import NanoVNA
|
||||
from .Serial import Interface
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
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__)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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
|
Ładowanie…
Reference in New Issue