From 2d1808d781ba07ce5257fddbfad9d1f1732fb547 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Sun, 17 Jan 2021 16:47:35 +0100 Subject: [PATCH] Fix device version detection (fixes #43) --- src/rmview/rmview.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rmview/rmview.py b/src/rmview/rmview.py index 519696b..6713ea9 100644 --- a/src/rmview/rmview.py +++ b/src/rmview/rmview.py @@ -226,10 +226,10 @@ class rMViewApp(QApplication): _,out,_ = ssh.exec_command("cat /sys/devices/soc0/machine") rmv = out.read().decode("utf-8") - version = re.fullmatch(r"reMarkable (\d+)\..*\n", rmv) + version = re.fullmatch(r"reMarkable(?: Prototype)? (\d+)(\.\d+)*\n", rmv) if version is None or version[1] not in ["1", "2"]: - log.error("Device is unsupported: '%s' [%s]", rmv, version[1] if version else "unknown device") - QMessageBox.critical(None, "Unsupported device", 'The detected device is %s.\nrmView currently only supports reMarkable 1.' % rmv) + log.error("Device is unsupported: '%s' [%s]", rmv.strip(), version[1] if version else "unknown device") + QMessageBox.critical(None, "Unsupported device", "The detected device is '%s'.\nrmView currently only supports reMarkable 1 and 2." % rmv.strip()) self.quit() return