tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove STPX command

Browse Source
This commit is contained in:
Marianpol 2021-06-07 14:01:33 +02:00
parent e55bc086f8
commit 038ba98ddf
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyren/macro/init.txt
View File

@ -49,6 +49,7 @@ can500 {
at at 0 at at 0
STP 53 STP 53
STPBR 500000 STPBR 500000
STI
at at 1 at at 1
$prompt = CAN500 $prompt = CAN500
} }

8
pyren/macro/megane3_fluence/radiosat_classic_bluetooth_accoustic.cmd
View File

@ -20,6 +20,14 @@ delay 2
#Accoustic Whole car #Accoustic Whole car
2E2B2C3E9B522F0001FFFAFDDA0164FE002C973E9B511E0001FFF4FDD302CCFC00164C00003E9B732D0001FFF4FE7803E0FE002C973E9B5B490001FFECFE1104FFFC00164C0000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C00040000000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C000400000002D43400000010000FFE9006FFF8021043FE8400000010000FFD200EFFF0014F63FDA40000001FFFFFFB5018EFE001C223FBE400000010044FF7D0044FF8041C23F0140000001FFE2FE1507A1F80024513DB440000001FF88FBBE0D0EF00024C900003D5B40000001FE33FB362B9EE000182B3DD740000001FEB6FC2E262BC0000EC836A140000001F0F8F1D166ABC0001F234F8C400000010BC6FC463076E000547B3FE440000001004BFFCB0122FF005FD73FE640000001FFFFFFCE03B8FE0017BE00002C4740000001000000004000C00040003FEC400000010000FFD90167FF00166C3FF5400000010000FFEC0052FF8017093DC940000001FF98FBD30BC3F0001CFF00003DB040000001FEE1FBA01F18F0001B043E1040000001FED3FC6B26CAE00013293FBE400000010044FF7D0044FF8041C23B1940000001F81BF7B36709B0000FB900000600060006000600200000000001000020000000000100002000000000010000200000000001000000000000003F00000000003F16A700000001000016A7000000010000 2E2B2C3E9B522F0001FFFAFDDA0164FE002C973E9B511E0001FFF4FDD302CCFC00164C00003E9B732D0001FFF4FE7803E0FE002C973E9B5B490001FFECFE1104FFFC00164C0000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C00040000000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C000400000002D43400000010000FFE9006FFF8021043FE8400000010000FFD200EFFF0014F63FDA40000001FFFFFFB5018EFE001C223FBE400000010044FF7D0044FF8041C23F0140000001FFE2FE1507A1F80024513DB440000001FF88FBBE0D0EF00024C900003D5B40000001FE33FB362B9EE000182B3DD740000001FEB6FC2E262BC0000EC836A140000001F0F8F1D166ABC0001F234F8C400000010BC6FC463076E000547B3FE440000001004BFFCB0122FF005FD73FE640000001FFFFFFCE03B8FE0017BE00002C4740000001000000004000C00040003FEC400000010000FFD90167FF00166C3FF5400000010000FFEC0052FF8017093DC940000001FF98FBD30BC3F0001CFF00003DB040000001FEE1FBA01F18F0001B043E1040000001FED3FC6B26CAE00013293FBE400000010044FF7D0044FF8041C23B1940000001F81BF7B36709B0000FB900000600060006000600200000000001000020000000000100002000000000010000200000000001000000000000003F00000000003F16A700000001000016A7000000010000
delay 8
# open session
10C0
delay 2
# open session
10C0
222B2D 222B2D
222B25 222B25
222B2B 222B2B

16
pyren/mod_elm.py
View File

@ -1386,12 +1386,12 @@ class ELM:
if raw_command[Fc].startswith('0'): if raw_command[Fc].startswith('0'):
if uncutCommand in self.l1_cache.keys(): if uncutCommand in self.l1_cache.keys():
frsp = self.send_raw ('STPX D:' + raw_command[Fc] + ',R:' + self.l1_cache[uncutCommand]) # we'll get only 1 frame: fc, ff or sf frsp = self.send_raw (raw_command[Fc] + self.l1_cache[uncutCommand]) # we'll get only 1 frame: fc, ff or sf
else: else:
frsp = self.send_raw ('STPX D:' + raw_command[Fc]) frsp = self.send_raw (raw_command[Fc])
if raw_command[Fc].startswith('1'): if raw_command[Fc].startswith('1'):
frsp = self.send_raw ('STPX D:' + raw_command[Fc] + ',R:' + '1') frsp = self.send_raw (raw_command[Fc] + '1')
while Fc < Fn: while Fc < Fn:
# if Fn > 1 and (Fn - Fc) == 1: # if Fn > 1 and (Fn - Fc) == 1:
@ -1422,7 +1422,7 @@ class ELM:
# analyse response # analyse response
for s in frsp.split('\n'): for s in frsp.split('\n'):
if s.strip()[:4] == "STPX": # echo cancelation if s.strip()[:len(raw_command[Fc - 1])] == raw_command[Fc - 1]: # echo cancelation
continue continue
s = s.strip().replace(' ', '') s = s.strip().replace(' ', '')
@ -1467,11 +1467,11 @@ class ELM:
if burstSizeCommand.endswith(raw_command[-1]): if burstSizeCommand.endswith(raw_command[-1]):
if uncutCommand in self.l1_cache.keys(): if uncutCommand in self.l1_cache.keys():
burstSizeCommandRequest = 'STPX D:' + burstSizeCommand + ",R:" + self.l1_cache[uncutCommand] burstSizeCommandRequest = burstSizeCommand + self.l1_cache[uncutCommand]
else: else:
burstSizeCommandRequest = 'STPX D:' + burstSizeCommand burstSizeCommandRequest = burstSizeCommand
else: else:
burstSizeCommandRequest = 'STPX D:' + burstSizeCommand + ",R:1" burstSizeCommandRequest = burstSizeCommand + "1"
# Ensure time gap between frames according to FlowControl # Ensure time gap between frames according to FlowControl
tc = time.time() # current time tc = time.time() # current time
@ -1486,7 +1486,7 @@ class ELM:
cf = 0 cf = 0
if burstSizeCommand.endswith(raw_command[-1]): if burstSizeCommand.endswith(raw_command[-1]):
for s in frsp.split('\n'): for s in frsp.split('\n'):
if s.strip()[:4] == "STPX": # echo cancelation if s.strip()[:len(raw_command[Fc - 1])] == raw_command[Fc - 1]: # echo cancelation
continue continue
else: else:
responses.append(s) responses.append(s)