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

9q fix#28

Browse Source
This commit is contained in:
shrlnm 2020-02-02 22:55:25 +03:00
parent 35c0e39f57
commit 23b295e979
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyren/mod_ddt_data.py
View File

@ -148,7 +148,7 @@ class decu_data:
self.Step = float(sc.attrib["Step"]) self.Step = float(sc.attrib["Step"])
self.Offset = 0.0 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.Offset = float (sc.attrib["Offset"])
self.DivideBy = 1.0 self.DivideBy = 1.0

2
pyren/mod_ddt_screen.py
View File

@ -1792,7 +1792,7 @@ class DDTScreen (tk.Frame):
xfSize = str(int(float(10) * self.scf)) xfSize = str(int(float(10) * self.scf))
lFont = tkFont.Font(family="Arial", size=xfSize) lFont = tkFont.Font(family="Arial", size=xfSize)
pn = 0 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 pn = pn + 1

5
pyren/mod_elm.py
View File

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

2
pyren/mod_term.py
View File

@ -799,7 +799,7 @@ def main():
elm = mod_elm.ELM( mod_globals.opt_port, mod_globals.opt_speed, True ) elm = mod_elm.ELM( mod_globals.opt_port, mod_globals.opt_speed, True )
# change serial port baud rate # 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() elm.port.check_elm()
if mod_globals.opt_speed < mod_globals.opt_rate: if mod_globals.opt_speed < mod_globals.opt_rate:
elm.port.soft_boudrate(mod_globals.opt_rate) elm.port.soft_boudrate(mod_globals.opt_rate)