9p fix#22

pyren/macro/megane2_scenic2/drl_off.cmd

@@ -5,3 +5,6 @@ can500  # init can macro
 
 10C0
 3BA01800
+
+exit
+

pyren/macro/megane2_scenic2/wipers_manual.cmd

@@ -4,4 +4,6 @@ $addr = 26
 can500  # init can macro
 
 10C0
-3BA01200
+3BA01200
+
+exit

pyren/mod_ddt.py

@@ -4,6 +4,7 @@
 import sys, os
 import operator
 import ast
+import gc
 
 import mod_ddt_utils
 import mod_utils
@@ -535,8 +536,13 @@ class DDTLauncher():
 
         # print self.elm
         if self.elm != None:
-            del(self.elm)
-            self.elm = None
+            try:
+                self.elm.port.hdr.close()
+                del(self.elm)
+                self.elm = None
+                gc.collect()
+            except:
+                pass
 
         self.applySettings()
 

pyren/mod_ecu.py

@@ -1067,7 +1067,7 @@ def main():
     c_max = Parameters[i].max
     c_unit = Parameters[i].unit
     
-    line = '"[PR]%s","%s","%s","%s","%s","%s","%s","%s"\n'%(c_name,c_short,c_pid,c_equ,c_min,c_max,c_unit,ddd)
+    line = '"PR_%s","%s","%s","%s","%s","%s","%s","%s"\n'%(c_name,c_short,c_pid,c_equ,c_min,c_max,c_unit,ddd)
     cf.write( line.encode('utf-8') )
 
   memIt = []
@@ -1102,7 +1102,7 @@ def main():
     c_max = '0'
     c_unit = ''
     
-    line = '"[ST]%s","%s","%s","%s","%s","%s","%s","%s"\n'%(c_name,c_short,c_pid,c_equ,c_min,c_max,c_unit,ddd)
+    line = '"ST_%s","%s","%s","%s","%s","%s","%s","%s"\n'%(c_name,c_short,c_pid,c_equ,c_min,c_max,c_unit,ddd)
     cf.write( line.encode('utf-8') )
 
   cf.close()