read_board_revision() is a duplicate of readVersion()

it seems read_board_revision() is a duplicate, but it can also return None instead of throwing IOError. This can crash the application. Replaced read_board_revision() with readVersion().
pull/535/head
mss 2022-09-07 10:42:30 +02:00
rodzic 9f95d73da6
commit f469d27856
1 zmienionych plików z 2 dodań i 17 usunięć

Wyświetl plik

@ -104,7 +104,7 @@ class NanoVNA_V2(VNA):
self.features.add("Customizable data points")
# TODO: more than one dp per freq
self.features.add("Multi data points")
self.board_revision = self.read_board_revision()
self.board_revision = self.readVersion()
if self.board_revision >= Version("2.0.4"):
self.sweep_max_freq_Hz = 4400e6
else:
@ -121,7 +121,7 @@ class NanoVNA_V2(VNA):
]
def readFirmware(self) -> str:
result = f"HW: {self.read_board_revision()}\nFW: {self.version}"
result = f"HW: {self.readVersion()}\nFW: {self.version}"
logger.debug("readFirmware: %s", result)
return result
@ -223,21 +223,6 @@ class NanoVNA_V2(VNA):
logger.debug("readVersion: %s", result)
return result
def read_board_revision(self) -> 'Version':
cmd = pack("<BBBB",
_CMD_READ, _ADDR_DEVICE_VARIANT,
_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)
return result
def setSweep(self, start, stop):
step = (stop - start) / (self.datapoints - 1)
if start == self.sweepStartHz and step == self.sweepStepHz: