mirror
/
nanovna-saver
kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

raise IOError if read_board_revision fails

pull/536/head
Holger Müller 2022-09-07 20:13:09 +02:00
rodzic f1e2041fbe
commit 611d00c551
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 2FDB49E81EAE6622
1 zmienionych plików z 9 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
NanoVNASaver/Hardware/NanoVNA_V2.py
Wyświetl plik

@ -213,10 +213,8 @@ class NanoVNA_V2(VNA):
def resetSweep(self, start: int, stop: int): def resetSweep(self, start: int, stop: int):
self.setSweep(start, stop) self.setSweep(start, stop)
def readVersion(self) -> 'Version': def _read_version(self, cmd_0: int, cmd_1: int):
cmd = pack("<BBBB", cmd = pack("<BBBB", _CMD_READ, cmd_0, _CMD_READ, cmd_1)
_CMD_READ, _ADDR_FW_MAJOR,
_CMD_READ, _ADDR_FW_MINOR)
with self.serial.lock: with self.serial.lock:
self.serial.write(cmd) self.serial.write(cmd)
sleep(WRITE_SLEEP) sleep(WRITE_SLEEP)
@ -224,22 +222,17 @@ class NanoVNA_V2(VNA):
if len(resp) != 2: if len(resp) != 2:
logger.error("Timeout reading version registers. Got: %s", resp) logger.error("Timeout reading version registers. Got: %s", resp)
raise IOError("Timeout reading version registers") raise IOError("Timeout reading version registers")
result = Version(f"{resp[0]}.0.{resp[1]}") return Version(f"{resp[0]}.0.{resp[1]}")
def readVersion(self) -> 'Version':
result = self._read_version(_ADDR_FW_MAJOR,
_ADDR_FW_MINOR)
logger.debug("readVersion: %s", result) logger.debug("readVersion: %s", result)
return result return result
def read_board_revision(self) -> 'Version': def read_board_revision(self) -> 'Version':
cmd = pack("<BBBB", result = self._read_version(_ADDR_DEVICE_VARIANT,
_CMD_READ, _ADDR_DEVICE_VARIANT, _ADDR_HARDWARE_REVISION)
_CMD_READ, _ADDR_HARDWARE_REVISION)
with self.serial.lock:
self.serial.write(cmd)
sleep(WRITE_SLEEP)
resp = self.serial.read(2)
if len(resp) != 2:
logger.error("Timeout reading version registers")
return None
result = Version(f"{resp[0]}.0.{resp[1]}")
logger.debug("read_board_revision: %s", result) logger.debug("read_board_revision: %s", result)
return result return result