Merge pull request #927 from shrlnm/master

Fix for ELM writing timeout

Author: Furtif

elm.py

@@ -801,7 +801,7 @@ def set_can_timeout(self, value):
         val = value // 4
         if val > 255:
             val = 255
-        val = hex(val)[2:].upper()
+        val = hex(val)[2:].upper().zfill(2)
         self.cmd("AT ST %s" % val)
 
     def send_cmd(self, command):
@@ -961,8 +961,11 @@ def send_can_cfc0(self, command):
         Fn = len(raw_command)  # Number of frames
 
         if Fn > 1 or len(raw_command[0]) > 15:
-            # set elm timeout to 300ms for first response
-            self.send_raw('AT ST 4B')
+            if options.cantimeout > 0:
+                self.set_can_timeout( options.cantimeout )
+            else:
+                # set elm timeout to 300ms for first response
+                self.send_raw('AT ST 4B')
 
         while Fc < Fn:
             # enable responses