implemented latest commits from master branch

This commit is contained in:
shrlnm 2022-09-10 20:12:32 +03:00
parent 062496642f
commit d2187adfda
3 changed files with 4 additions and 4 deletions

View File

@ -1970,7 +1970,7 @@ class ELM:
self.check_answer(self.cmd("at l0")) self.check_answer(self.cmd("at l0"))
self.check_answer(self.cmd("at al")) 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("AT CAF1"))
self.check_answer(self.cmd("STCSEGR 1")) self.check_answer(self.cmd("STCSEGR 1"))
self.check_answer(self.cmd("STCSEGT 1")) self.check_answer(self.cmd("STCSEGT 1"))
@ -2210,7 +2210,7 @@ class ELM:
if not any(s in resp for s in ['?', 'NR']): if not any(s in resp for s in ['?', 'NR']):
# add it to the list # add it to the list
param_to_send += did 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 module does not support any did, we cannot check performance level
if not param_to_send: if not param_to_send:

View File

@ -225,7 +225,7 @@ def optParser():
parser.add_argument("--caf", parser.add_argument("--caf",
help="turn on CAN Auto Formatting. Available only for OBDLink", help="turn on CAN Auto Formatting. Available only for OBDLink",
dest="caf", dest="caf",
default=False, default=True,
action="store_true") action="store_true")
parser.add_argument("--n1c", parser.add_argument("--n1c",

View File

@ -130,7 +130,7 @@ def optParser():
parser.add_argument("--caf", parser.add_argument("--caf",
help="turn on CAN Auto Formatting. Available only for OBDLink", help="turn on CAN Auto Formatting. Available only for OBDLink",
dest="caf", dest="caf",
default=False, default=True,
action="store_true") action="store_true")
parser.add_argument("--n1c", parser.add_argument("--n1c",