From nobody Tue Jan 11 19:11:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6ED1C195B980; Tue, 11 Jan 2022 19:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYKzc1N9cz4sQ2; Tue, 11 Jan 2022 19:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD26A1ED10; Tue, 11 Jan 2022 19:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20BJB7LN005002; Tue, 11 Jan 2022 19:11:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BJB7Ac005001; Tue, 11 Jan 2022 19:11:07 GMT (envelope-from git) Date: Tue, 11 Jan 2022 19:11:07 GMT Message-Id: <202201111911.20BJB7Ac005001@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: e045eef41af9 - main - comms/nanovna-saver: Update to 3.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e045eef41af9f313508398ebebf119be3d9c5574 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641928268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bwkqW7pTW0cYPHcC4aYPVaip05iP3uDP6HpZgMilTzE=; b=xprqpRncVyQJAXjGeeiRXIJ5V94CnWqeBa9IddlMkUpBqn4YZiRzAlvfKoyEMAo2p2z6Q1 rNOFC9thcRhvzE3m0JtdnDsfDdJB6mO21MyPhmZXig0g5NAkdCYgNDc1AGu2pyX6E6US1x apoY6s8qYcSl43oNgGBQh24zZL1dder0gf6dFjLqKV4fkB0YQ0+zh4k+RExDoYJhCAPMM8 5L/bG/5QfWcLXzPqbq58IJt+/7BbjZS2A/JYJAP5SHRb9cJ/AM3NlDmWZQuFHnpc8rhn5g P1qDPQVmoJIfaHooflxngVfuUVszQ4hQXzi9pqHzrXyWPK1bp2pSK0SZ8EvZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641928268; a=rsa-sha256; cv=none; b=JO4FSX3g+6PeOY8SusOPYtNt+Rd+Qv87EZVC52l6B8UJBKFFV3idbUeldUSaUWEqLNbOdh inN2uCdtKKCjHchxtN4+e35ZkpqJeaB6f5DxqLaMRbWC0FXFRKz/ok+K6V34z2rbbv0R8H BvEVb2/PZz3kqp1ImDk7McFLO7vPnbd3VMUS+YjVr07ej5yQRMGQUeMcCaDLgT80+FLGzx bu6dfYFZyxVU5N1cr8+MVQptOyFiTldkY2K6SiY09YnqdxJ+Fqi9TygwhBMcHytgvw5ik3 Ka0WeDVnJ9n/ZxNaWzPAQxtMjcHWCN+ZvZ53qc727YMRcWOQ0XcV/a1Rn1CPzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=e045eef41af9f313508398ebebf119be3d9c5574 commit e045eef41af9f313508398ebebf119be3d9c5574 Author: Diane Bruce AuthorDate: 2022-01-11 19:02:43 +0000 Commit: Diane Bruce CommitDate: 2022-01-11 19:10:45 +0000 comms/nanovna-saver: Update to 3.10 - Fixed FreeBSD specifc Sysctl.py code so it will no longer core if no USB device plugged in - changed delay in NanoVNA__V2.py since too fast for some devices see https://github.com/NanoVNA-Saver/nanovna-saver/issues/441 Changelog ========= v0.3.10 ------ - Default Band ranges for 5 and 9cm - Layout should fit on smaller screens - Fixed fixed axis settings - Show VNA type in port selector - Recognise tinySA (screenshot only) - Some more cables in TDR - Reference plane applied after calibration - Calibration fixes by DiSlord v0.3.9 ------ - TX Power on V2 - New analysis - Magnitude Z Chart - VSWR Chart improvements Reported by: portscout --- comms/nanovna-saver/Makefile | 3 +-- comms/nanovna-saver/distinfo | 6 +++--- .../files/patch-NanoVNASaver_Hardware_Hardware.py | 21 +++++++++------------ .../patch-NanoVNASaver_Hardware_NanoVNA__V2.py | 12 ++++++++++++ comms/nanovna-saver/files/patch-setup.py | 14 -------------- 5 files changed, 25 insertions(+), 31 deletions(-) diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile index c631a10a7f82..52e6ed42cdfe 100644 --- a/comms/nanovna-saver/Makefile +++ b/comms/nanovna-saver/Makefile @@ -1,7 +1,6 @@ PORTNAME= nanovna-saver DISTVERSIONPREFIX= v -DISTVERSION= 0.3.8 -PORTREVISION= 2 +DISTVERSION= 0.3.10 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/nanovna-saver/distinfo b/comms/nanovna-saver/distinfo index 6e9c3dc18751..4d12dbe4d6ec 100644 --- a/comms/nanovna-saver/distinfo +++ b/comms/nanovna-saver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609597287 -SHA256 (mihtjel-nanovna-saver-v0.3.8_GH0.tar.gz) = 761e5ec2d5efc6b0843038b9d241bcbdc433a76d68a5f0631be367a629e78163 -SIZE (mihtjel-nanovna-saver-v0.3.8_GH0.tar.gz) = 357896 +TIMESTAMP = 1641829596 +SHA256 (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 202c907125015e2fb26926ef1ce365321d749207a74e3029e729e89e50acda88 +SIZE (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 477821 diff --git a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py index 403e4cdc3040..970c3e21cebe 100644 --- a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py +++ b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py @@ -1,31 +1,28 @@ ---- NanoVNASaver/Hardware/Hardware.py.orig 2020-11-01 13:28:10 UTC +--- NanoVNASaver/Hardware/Hardware.py.orig 2022-01-04 07:44:03 UTC +++ NanoVNASaver/Hardware/Hardware.py -@@ -33,6 +33,7 @@ from NanoVNASaver.Hardware.NanoVNA_H import NanoVNA_H - from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H4 +@@ -34,6 +34,7 @@ from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2 + from NanoVNASaver.Hardware.TinySA import TinySA from NanoVNASaver.Hardware.Serial import drain_serial, Interface +from NanoVNASaver.Hardware.Sysctl import usb_vid_pid logger = logging.getLogger(__name__) -@@ -63,8 +64,12 @@ def get_interfaces() -> List[Interface]: - interfaces = [] - # serial like usb interfaces +@@ -80,6 +81,11 @@ def get_interfaces() -> List[Interface]: for d in list_ports.comports(): -- if platform.system() == 'Windows' and d.vid is None: -- d = _fix_v2_hwinfo(d) + if platform.system() == 'Windows' and d.vid is None: + d = _fix_v2_hwinfo(d) + if platform.system() == 'FreeBSD': + logger.debug("Found FreeBSD USB port %s", d.device) + vid_pid = usb_vid_pid(d.device) + d.vid = vid_pid[0] + d.pid = vid_pid[1] -+ for t in USBDEVICETYPES: if d.vid != t.vid or d.pid != t.pid: continue -@@ -74,7 +79,6 @@ def get_interfaces() -> List[Interface]: - iface.port = d.device - interfaces.append(iface) +@@ -94,7 +100,6 @@ def get_interfaces() -> List[Interface]: + + logger.debug("Interfaces: %s", interfaces) return interfaces - diff --git a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_NanoVNA__V2.py b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_NanoVNA__V2.py new file mode 100644 index 000000000000..31201d820a8a --- /dev/null +++ b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_NanoVNA__V2.py @@ -0,0 +1,12 @@ +--- NanoVNASaver/Hardware/NanoVNA_V2.py.orig 2022-01-11 18:46:18 UTC ++++ NanoVNASaver/Hardware/NanoVNA_V2.py +@@ -55,7 +55,8 @@ _ADDR_HARDWARE_REVISION = 0xf2 + _ADDR_FW_MAJOR = 0xf3 + _ADDR_FW_MINOR = 0xf4 + +-WRITE_SLEEP = 0.05 ++#WRITE_SLEEP = 0.05 ++WRITE_SLEEP = 0.1 + + _ADF4350_TXPOWER_DESC_MAP = { + 0: '9dB attenuation', diff --git a/comms/nanovna-saver/files/patch-setup.py b/comms/nanovna-saver/files/patch-setup.py deleted file mode 100644 index 760681de939c..000000000000 --- a/comms/nanovna-saver/files/patch-setup.py +++ /dev/null @@ -1,14 +0,0 @@ ---- setup.py.orig 2021-01-02 14:25:03 UTC -+++ setup.py -@@ -38,11 +38,4 @@ setup( - 'NanoVNASaver = NanoVNASaver.__main__:main' - ], - }, -- install_requires=[ -- 'pyserial', -- 'PyQt5', -- 'numpy', -- 'scipy', -- 'cython', -- ], - )