Attachment #235575 for bug #265534

View | Details | Raw Unified | Return to bug 265534
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/comms/nanovna-saver/Makefile (-3 / +2 lines)
1	PORTNAME= nanovna-saver	1	PORTNAME= nanovna-saver
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.10	3	DISTVERSION= 0.4.0
4	PORTREVISION= 2
5	CATEGORIES= comms hamradio	4	CATEGORIES= comms hamradio
6		5
7	MAINTAINER= hamradio@FreeBSD.org	6	MAINTAINER= hamradio@FreeBSD.org
Lines 21-27 USE_PYTHON= distutils autoplist noflavors Link Here
21	USE_PYQT= pyqt5_run	20	USE_PYQT= pyqt5_run
22		21
23	USE_GITHUB= yes	22	USE_GITHUB= yes
24	GH_ACCOUNT= mihtjel	23	GH_ACCOUNT= NanoVNA-Saver
25		24
26	NO_ARCH= yes	25	NO_ARCH= yes
27		26

Lines 1-3 Link Here

(-)b/comms/nanovna-saver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1641829596	1	TIMESTAMP = 1657834718
2	SHA256 (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 202c907125015e2fb26926ef1ce365321d749207a74e3029e729e89e50acda88	2	SHA256 (NanoVNA-Saver-nanovna-saver-v0.4.0_GH0.tar.gz) = df1a68f0a6cb2f686b34860761cb3a36061b2f184c8e5bc72b590c04a140e62f
3	SIZE (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 477821	3	SIZE (NanoVNA-Saver-nanovna-saver-v0.4.0_GH0.tar.gz) = 488898




--- NanoVNASaver/Hardware/Hardware.py.orig	2022-04-01 14:51:11 UTC
+++ NanoVNASaver/Hardware/Hardware.py
@@ -34,6 +34,7 @@ from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H
 from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2

         for t in USBDEVICETYPES:
             if d.vid != t.vid or d.pid != t.pid:
                 continue
@@ -87,14 +93,17 @@ def get_interfaces() -> List[Interface]:
                          t.name, d.vid, d.pid, d.device)
             iface = Interface('serial', t.name)
             iface.port = d.device
-            iface.open()
+            try:
+                iface.open()
+            except serial.SerialException:
+                logger.warning("Could not open serial port %s", d.device)
+                continue
             iface.comment = get_comment(iface)
             iface.close()
             interfaces.append(iface)
 
     logger.debug("Interfaces: %s", interfaces)
     return interfaces

Lines 4-7 A multiplatform tool to save Touchstone files from the NanoVNA, sweep Link Here

(-)b/comms/nanovna-saver/pkg-descr (-1 / +1 lines)
4	frequency spans in segments to gain more than 101 data points, and	4	frequency spans in segments to gain more than 101 data points, and
5	generally display and analyze the resulting data.	5	generally display and analyze the resulting data.
6		6
7	WWW: https://github.com/mihtjel/nanovna-saver	7	WWW: https://github.com/NanoVNA-Saver/nanovna-saver

Return to bug 265534

Lines 1-4 Link Here

(-)b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py (-2 / +14 lines)
1	--- NanoVNASaver/Hardware/Hardware.py.orig 2022-01-04 07:44:03 UTC	1	--- NanoVNASaver/Hardware/Hardware.py.orig 2022-04-01 14:51:11 UTC
2	+++ NanoVNASaver/Hardware/Hardware.py	2	+++ NanoVNASaver/Hardware/Hardware.py
3	@@ -34,6 +34,7 @@ from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H	3	@@ -34,6 +34,7 @@ from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H
4	from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2	4	from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2
Lines 20-26 Link Here
20	for t in USBDEVICETYPES:	20	for t in USBDEVICETYPES:
21	if d.vid != t.vid or d.pid != t.pid:	21	if d.vid != t.vid or d.pid != t.pid:
22	continue	22	continue
23	@@ -94,7 +100,6 @@ def get_interfaces() -> List[Interface]:	23	@@ -87,14 +93,17 @@ def get_interfaces() -> List[Interface]:
		24	t.name, d.vid, d.pid, d.device)
		25	iface = Interface('serial', t.name)
		26	iface.port = d.device
		27	- iface.open()
		28	+ try:
		29	+ iface.open()
		30	+ except serial.SerialException:
		31	+ logger.warning("Could not open serial port %s", d.device)
		32	+ continue
		33	iface.comment = get_comment(iface)
		34	iface.close()
		35	interfaces.append(iface)
24		36
25	logger.debug("Interfaces: %s", interfaces)	37	logger.debug("Interfaces: %s", interfaces)
26	return interfaces	38	return interfaces