9q fix#28

pyren/mod_ddt_data.py

@@ -148,7 +148,7 @@ class decu_data:
           self.Step = float(sc.attrib["Step"])
         
         self.Offset = 0.0
-        if "Offset" in sc.attrib.keys():
+        if "Offset" in sc.attrib.keys() and sc.attrib["Offset"]!='':
           self.Offset = float (sc.attrib["Offset"])
 
         self.DivideBy = 1.0

pyren/mod_ddt_screen.py

@@ -1792,7 +1792,7 @@ class DDTScreen (tk.Frame):
         xfSize = str(int(float(10) * self.scf))
         lFont = tkFont.Font(family="Arial", size=xfSize)
         pn = 0
-        for xText in self.decu.requests[rq].ReceivedDI.keys():
+        for xText,zzz in sorted(self.decu.requests[rq].ReceivedDI.items(), key=lambda item: item[1].FirstByte):
 
             pn = pn + 1
 

pyren/mod_elm.py

@@ -1808,11 +1808,12 @@ class ELM:
 
         # reset ELM
         elm_ver = self.cmd("at ws")
-        if 'v1.3a' in elm_ver:
-            mod_globals.opt_stn = True
         self.check_answer(elm_ver)
 
         # check STN
+        st_rsp = self.cmd("STPR")
+        if '?' not in st_rsp:
+            mod_globals.opt_stn = True
         if mod_globals.opt_can2 and mod_globals.opt_stn:
             tmp = self.cmd("STP 53")
             if 'OK' not in tmp:

pyren/mod_term.py

@@ -799,7 +799,7 @@ def main():
     elm = mod_elm.ELM( mod_globals.opt_port, mod_globals.opt_speed, True )
 
     # change serial port baud rate
-    if not mod_globals.opt_demo:
+    if not mod_globals.opt_demo and elm.port and elm.port.portType==0:
         elm.port.check_elm()
         if mod_globals.opt_speed < mod_globals.opt_rate:
             elm.port.soft_boudrate(mod_globals.opt_rate)