From 038ba98ddfc3045375d54aa42d53911b972881ee Mon Sep 17 00:00:00 2001
From: Marianpol <marcin.musial20@gmail.com>
Date: Mon, 7 Jun 2021 14:01:33 +0200
Subject: [PATCH] Remove STPX command

---
 pyren/macro/init.txt                             |  1 +
 .../radiosat_classic_bluetooth_accoustic.cmd     |  8 ++++++++
 pyren/mod_elm.py                                 | 16 ++++++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pyren/macro/init.txt b/pyren/macro/init.txt
index 37218ea..091f922 100644
--- a/pyren/macro/init.txt
+++ b/pyren/macro/init.txt
@@ -49,6 +49,7 @@ can500 {
   at at 0
   STP 53
   STPBR 500000
+  STI
   at at 1
   $prompt = CAN500
 }
diff --git a/pyren/macro/megane3_fluence/radiosat_classic_bluetooth_accoustic.cmd b/pyren/macro/megane3_fluence/radiosat_classic_bluetooth_accoustic.cmd
index 9ebd217..021826d 100644
--- a/pyren/macro/megane3_fluence/radiosat_classic_bluetooth_accoustic.cmd
+++ b/pyren/macro/megane3_fluence/radiosat_classic_bluetooth_accoustic.cmd
@@ -20,6 +20,14 @@ delay 2
 #Accoustic Whole car
 2E2B2C3E9B522F0001FFFAFDDA0164FE002C973E9B511E0001FFF4FDD302CCFC00164C00003E9B732D0001FFF4FE7803E0FE002C973E9B5B490001FFECFE1104FFFC00164C0000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C0004000000040000001000000004000C00040000000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C0004000400040000001000000004000C000400000002D43400000010000FFE9006FFF8021043FE8400000010000FFD200EFFF0014F63FDA40000001FFFFFFB5018EFE001C223FBE400000010044FF7D0044FF8041C23F0140000001FFE2FE1507A1F80024513DB440000001FF88FBBE0D0EF00024C900003D5B40000001FE33FB362B9EE000182B3DD740000001FEB6FC2E262BC0000EC836A140000001F0F8F1D166ABC0001F234F8C400000010BC6FC463076E000547B3FE440000001004BFFCB0122FF005FD73FE640000001FFFFFFCE03B8FE0017BE00002C4740000001000000004000C00040003FEC400000010000FFD90167FF00166C3FF5400000010000FFEC0052FF8017093DC940000001FF98FBD30BC3F0001CFF00003DB040000001FEE1FBA01F18F0001B043E1040000001FED3FC6B26CAE00013293FBE400000010044FF7D0044FF8041C23B1940000001F81BF7B36709B0000FB900000600060006000600200000000001000020000000000100002000000000010000200000000001000000000000003F00000000003F16A700000001000016A7000000010000
 
+delay 8
+# open session
+10C0
+
+delay 2
+# open session
+10C0
+
 222B2D
 222B25
 222B2B
diff --git a/pyren/mod_elm.py b/pyren/mod_elm.py
index 05cf82d..430fd8b 100644
--- a/pyren/mod_elm.py
+++ b/pyren/mod_elm.py
@@ -1386,12 +1386,12 @@ class ELM:
 
         if raw_command[Fc].startswith('0'):
             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:
-                frsp = self.send_raw ('STPX D:' + raw_command[Fc])
+                frsp = self.send_raw (raw_command[Fc])
         
         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:
             # if Fn > 1 and (Fn - Fc) == 1:
@@ -1422,7 +1422,7 @@ class ELM:
             # analyse response
             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
 
                 s = s.strip().replace(' ', '')
@@ -1467,11 +1467,11 @@ class ELM:
                 
                 if burstSizeCommand.endswith(raw_command[-1]):
                     if uncutCommand in self.l1_cache.keys():
-                        burstSizeCommandRequest = 'STPX D:' + burstSizeCommand + ",R:"  + self.l1_cache[uncutCommand]
+                        burstSizeCommandRequest = burstSizeCommand + self.l1_cache[uncutCommand]
                     else:
-                        burstSizeCommandRequest = 'STPX D:' + burstSizeCommand
+                        burstSizeCommandRequest = burstSizeCommand
                 else:
-                    burstSizeCommandRequest = 'STPX D:' + burstSizeCommand + ",R:1"
+                    burstSizeCommandRequest = burstSizeCommand + "1"
                     
                 # Ensure time gap between frames according to FlowControl
                 tc = time.time()  # current time
@@ -1486,7 +1486,7 @@ class ELM:
                 cf = 0
                 if burstSizeCommand.endswith(raw_command[-1]):
                     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
                         else:
                             responses.append(s)