From d2187adfdaed84020c4aa191dcbc40331a402eee Mon Sep 17 00:00:00 2001 From: shrlnm Date: Sat, 10 Sep 2022 20:12:32 +0300 Subject: [PATCH] implemented latest commits from master branch --- pyren3/mod_elm.py | 4 ++-- pyren3/mod_term.py | 2 +- pyren3/pyren3.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyren3/mod_elm.py b/pyren3/mod_elm.py index 1300ad7..d58fe62 100644 --- a/pyren3/mod_elm.py +++ b/pyren3/mod_elm.py @@ -1970,7 +1970,7 @@ class ELM: self.check_answer(self.cmd("at l0")) self.check_answer(self.cmd("at al")) - if mod_globals.opt_obdlink and mod_globals.opt_caf: + if mod_globals.opt_obdlink and mod_globals.opt_caf and not self.ATCFC0: self.check_answer(self.cmd("AT CAF1")) self.check_answer(self.cmd("STCSEGR 1")) self.check_answer(self.cmd("STCSEGT 1")) @@ -2210,7 +2210,7 @@ class ELM: if not any(s in resp for s in ['?', 'NR']): # add it to the list param_to_send += did - predicted_response_length += len(did) + int(dataids[did].dataBitLength)/4 + predicted_response_length += len(self.getFromCache('22' + did).replace(' ', '')) - 2 # if module does not support any did, we cannot check performance level if not param_to_send: diff --git a/pyren3/mod_term.py b/pyren3/mod_term.py index 45bdf0a..81e1f20 100755 --- a/pyren3/mod_term.py +++ b/pyren3/mod_term.py @@ -225,7 +225,7 @@ def optParser(): parser.add_argument("--caf", help="turn on CAN Auto Formatting. Available only for OBDLink", dest="caf", - default=False, + default=True, action="store_true") parser.add_argument("--n1c", diff --git a/pyren3/pyren3.py b/pyren3/pyren3.py index 9bf46e9..be313db 100755 --- a/pyren3/pyren3.py +++ b/pyren3/pyren3.py @@ -130,7 +130,7 @@ def optParser(): parser.add_argument("--caf", help="turn on CAN Auto Formatting. Available only for OBDLink", dest="caf", - default=False, + default=True, action="store_true") parser.add_argument("--n1c",