From ca3dff73ad0acb0f0ba8f9fa0c9aeaa1ff025860 Mon Sep 17 00:00:00 2001 From: Marianpol Date: Fri, 15 Jan 2021 22:15:11 +0100 Subject: [PATCH] Omit unsupported dataids --- _pyren_launcher.py | 2 +- pyren/mod_elm.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/_pyren_launcher.py b/_pyren_launcher.py index d519328..7586508 100755 --- a/_pyren_launcher.py +++ b/_pyren_launcher.py @@ -382,7 +382,7 @@ if osname != 'android': self.var_log.set(self.save.log) self.var_logName.set(self.save.logName) - self.var_speedList = ['38400', '115200', '230400', '500000', ] + self.var_speedList = ['38400', '115200', '230400', '500000', '1000000', '2000000' ] self.var_langList = getLangList() self.var_pathList = getPathList() self.var_portList = getPortList() diff --git a/pyren/mod_elm.py b/pyren/mod_elm.py index 5b0cf3e..2d01bdb 100644 --- a/pyren/mod_elm.py +++ b/pyren/mod_elm.py @@ -359,7 +359,7 @@ class Port: self.hdr.timeout = 2 - for s in [38400, 115200, 500000, 230400, 57600, 9600]: + for s in [38400, 115200, 230400, 500000, 1000000, 2000000]: print "\r\t\t\t\t\rChecking port speed:", s, sys.stdout.flush () @@ -2066,11 +2066,13 @@ class ELM: self.send_raw ("0322" + dataids.keys()[0] + "1") for lvl in range(level): + resp = self.request("22" + dataids.keys()[lvl]) + if any(s in resp for s in ['?', 'NR']): + continue paramToSend += dataids.keys()[lvl] cmd = '22' + paramToSend resp = self.send_cmd(cmd) - - if not '?' in resp and resp[2:4] != '7F': + if not any(s in resp for s in ['?', 'NR']): self.performanceModeLevel = level return True