From 076f6b098cf2f177d3cdcdfea4fcf8d8e83dae42 Mon Sep 17 00:00:00 2001 From: shrlnm Date: Mon, 2 Dec 2019 23:24:37 +0300 Subject: [PATCH] 9q fix#15 --- pyren/README.md | 9 +++-- pyren/macro/rlink2/rlink2_acoustic_8.cmd | 2 +- pyren/mod_elm.py | 6 +-- pyren/mod_mtc.py | 47 ++++++++++++++++++++++-- pyren/mod_term.py | 2 +- 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/pyren/README.md b/pyren/README.md index aceb566..7573e7b 100644 --- a/pyren/README.md +++ b/pyren/README.md @@ -70,18 +70,21 @@ and extract next to directories EcuRenault, Location, Vehicles You have to get the next directory tree ``` +|- _pyren_launcher.py #(universal launcher) |- BVMEXTRACTION #(need for doc_maker) |- DocDB_xx #(need for doc_maker where xx=language) |- EcuRenault #(for CLIP mode) |- Location #(for CLIP mode) |- Vehicles #(for CLIP mode) -|- ecus #(for DDT mode) -|- graphics #(for DDT mode optional) +|- DDT2000data #(for DDT mode) +| |- ecus #(for DDT mode) +| |- graphics #(for DDT mode) +| |- vehicles #(for DDT mode) +| |- pyren #(pyren) | |- pyren.py ... ... | |- -|- _pyren_launcher.py #(universal launcher) ``` ## Installation on MacOS and Linux diff --git a/pyren/macro/rlink2/rlink2_acoustic_8.cmd b/pyren/macro/rlink2/rlink2_acoustic_8.cmd index 9166037..3c4cd85 100644 --- a/pyren/macro/rlink2/rlink2_acoustic_8.cmd +++ b/pyren/macro/rlink2/rlink2_acoustic_8.cmd @@ -11,7 +11,7 @@ delay 2 2E213109A1000122030000000000000002000000000000000042534420535345204261736963205369676E616C70726F63657373696E672044617461204352433A3058444632393036354320000000000000000000000000000000000200000000000A0D0A1000000000000000110000000B0000000100000001000000010000000000000000000000F000000043100D0A5353455F4D41494E5F436F6E6669670040000000060606060603040303030303030303030303030403030303040303030303030303030303030303030303030303030606030303060303030303030303030303031B01000100401F8000000002000000000000000200000002000000010000000200000002000000000000000200000000000000010000000100000001000000000000000000000001000000010000000100000000000000000000000100000001000000000000000300000001000000010000000100000001000000020000000000000001000000000000000100000001000000020000000100000000000000010000000100000002000000010000000100740E0100000001000000000000000000010000000100000001000000020000000100000001000000010000000100000000000000010000000100000001000000000A0D0A9B010000000A0D0A1B00000000000000010000000B00000001000000010000000100000000000000000000000C000000CC130D0A5353455F4D41494E5F436F6E66696756657273696F6E496E666F00030000000303030C030000001300000000000000000A0D0A16000000000A0D0A1800000000000000010000000B00000001000000010000000100000000000000000000001A0000008A120D0A5353455F4145435F4E6F6E4C696E4F7074436F6E666967000D000000050505050505050505050505054E000065F0A00F8AFA00000300E51E400164005425FA00A1FF3200000A0D0A78080000000A0D0A0F00000000000000080000000B0000000100000001000000010000000000000000000000B20000009F0F0D0A5353455F4145435F436F6E6669670058000000050505050505050505050505050505050505050505050505050505050505050505050505030505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050E340001009001A6FD56FF30FF56FF62FF30FF82FF2B01B8FF930BCAFF2B0162FF0E07D00730FF30FF3EFF3EFF4DFF550296004CFF2C014C1D2E01D10FE803E80300F430F8A1FF43D05A0000000E07D0075A02E80203F10600B4045A02B404D007B404E803D0075A02B4042D015A0245FDCD00CDFCCD00CD049AFFBC0244FD2AFF660006EEC0F1C0E030F890E817F835FF1A030000BA03D4FE64002E01D10F00006C0064190083D4FE000000000000580238FF000A0D0AB0480000000A0D0A1900000000000000010000000B000000010000000100000001000000000000000000000010000000E3120D0A5353455F4145435F526F6F6D4368616E6765436F6E66696700070000000305050505050528030000004B0020032C01480D46003200000A0D0A6B010000000A0D0A0F00000000000000050000000B00000001000000010000000100000000000000000000001A000000060F0D0A5353455F4147435F436F6E666967000D000000050505050505050505050505054E0000A8FD000068F75802E8032003E80374FF74FFC800C8004600000A0D0A130A0000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000062100D0A5353455F414E414C5F4D6963436F6E666967000400000005050303146A2D6A2D0000000028000000000A0D0A56010000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000066100D0A5353455F414E414C5F526566436F6E66696700040000000505030314007D007DA3000000C8000000000A0D0A65020000000A0D0A1500000000000000030000000B00000001000000010000000100000000000000000000001800000077110D0A5353455F4642465F447269766572436F6E66696700090000000505030303060505053100000000C8000000F4010000960000003A00E8034100FFFF000A0D0AB7050000000A0D0A0E000000000000000F0000000B000000010000000100000001000000000000000000000008000000D20E0D0A5353455F4E525F436F6E6669670004000000050505051888FA7A00C70B73FF000A0D0A40040000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C00000004100D0A5353455F4E525F526273436F6E666967000E0000000505050505050505050505050505540000FFFF06FFCEFF0000A8FD9808B80B1400D0073200FA004700E803000A0D0A210B0000000A0D0A1000000000000000030000000B000000010000000100000001000000000000000000000024000000980F0D0A5353455F4E525F4E66436F6E66696700120000000505050505050505050505050505050505056C18FCF4011405D4FE00000000000001000100FF7F000064000000881C16FD30F800000000000A0D0AB7080000000A0D0A1000000000000000040000000B00000001000000010000000100000000000000000000001A0000006B0F0D0A5353455F524543565F436F6E666967000A000000060506060404060305053C307501000A000200C8000000983A0000000064000000007D0000000A0D0A2D030000000A0D0A1100000000000000000000000500000001000000010000000F00000000000000000000001E000000AD0F0D0A5353455F524543565F45514E6F646573005600FFFFACFC220296001502210396003AFFAB062002F0009F09007DC800000A0D0A700A0000000A0D0A1300000000000000050000000B00000001000000010000000100000000000000000000001A0000003A100D0A5353455F524543565F414743436F6E666967000D000000050505050505050505050505054E5802A8FD0000ECFA5802E8032003E80374FF74FFC800C8004600000A0D0AF40A0000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C000000D30F0D0A5353455F53594E54485F436F6E66696700090000000303030303050505052C01000000307500000100000064000000F2060000B80BE8032C01D4FE000A0D0AB0050000000A0D0A1200000000000000000000000500000001000000010000000F00000000000000000000001E00000014100D0A5353455F53594E54485F45514E6F646573002800FA001BFC5E01C8006500F401C8001AFC1C02C8002701C4095802F501000A0D0AC3090000999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 # Phone acoustic -#2E21180A03000122030000000000000002000000000000000042534420535345204261736963205369676E616C70726F63657373696E672044617461204352433A3058443635344246354220000000000000000000000000000000000200000000000A0D0A1000000000000000110000000B0000000100000001000000010000000000000000000000F000000043100D0A5353455F4D41494E5F436F6E6669670040000000060606060603040303030303030303030303030403030303040303030303030303030303030303030303030303030606030303060303030303030303030303031B01000100401F8000000001000000000000000200000002000000020000000200000002000000000000000200000000000000010000000100000001000000000000000000000001000000010000000100000000000000000000000100000001000000000000000300000001000000020000000100000001000000020000000000000001000000000000000100000001000000020000000100000000000000010000000100000002000000010000000100740E0100000001000000000000000000010000000100000001000000020000000100000001000000010000000100000000000000010000000100000001000000000A0D0A9C010000000A0D0A1B00000000000000010000000B00000001000000010000000100000000000000000000000C000000CC130D0A5353455F4D41494E5F436F6E66696756657273696F6E496E666F00030000000303030C030000001300000000000000000A0D0A16000000000A0D0A1800000000000000010000000B00000001000000010000000100000000000000000000001A0000008A120D0A5353455F4145435F4E6F6E4C696E4F7074436F6E666967000D000000050505050505050505050505054E000065F0A00F8AFA00000300E51E400164005425FA00A1FF3200000A0D0A78080000000A0D0A0F00000000000000080000000B0000000100000001000000010000000000000000000000B20000009F0F0D0A5353455F4145435F436F6E6669670058000000050505050505050505050505050505050505050505050505050505050505050505050505030505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050E340001009001A6FD56FF30FF56FF62FF30FF82FF2B01B8FF930BCAFF2B0162FF0E07D00730FF30FF3EFF3EFF4DFF550296004CFF2C014C1D2E01D10FE803E80300F430F8A1FF43D05A0000000E07D0075A02E80203F10600B4045A02B404D007B404E803D0075A02B4042D015A0245FDCD00CDFCCD00CD049AFFBC0244FD2AFF660006EEC0F1C0E030F890E817F835FF1A030000BA03D4FE64002E01D10F00006C0064190083D4FE000000000000580238FF000A0D0AB0480000000A0D0A1900000000000000010000000B000000010000000100000001000000000000000000000010000000E3120D0A5353455F4145435F526F6F6D4368616E6765436F6E66696700070000000305050505050528030000004B0020032C01480D46003200000A0D0A6B010000000A0D0A0F00000000000000050000000B00000001000000010000000100000000000000000000001A000000060F0D0A5353455F4147435F436F6E666967000D000000050505050505050505050505054E0000A8FD00008CF19001E8032003E80374FF74FFC800C8004600000A0D0A680A0000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000062100D0A5353455F414E414C5F4D6963436F6E666967000400000005050303146A2D6A2D0000000028000000000A0D0A56010000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000066100D0A5353455F414E414C5F526566436F6E66696700040000000505030314007D007DA3000000C8000000000A0D0A65020000000A0D0A1500000000000000030000000B00000001000000010000000100000000000000000000001800000077110D0A5353455F4642465F447269766572436F6E66696700090000000505030303060505053100000000C8000000F4010000960000003A00E8034100FFFF000A0D0AB7050000000A0D0A0E000000000000000F0000000B000000010000000100000001000000000000000000000008000000D20E0D0A5353455F4E525F436F6E6669670004000000050505051888FA0000112B73FF000A0D0A30030000000A0D0A1000000000000000010000000B00000001000000010000000100000000000000000000000E0000007A0F0D0A5353455F4E525F4866436F6E6669670007000000050505050505052A3C0000000000710253070D036400000A0D0A7D010000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C00000004100D0A5353455F4E525F526273436F6E666967000E0000000505050505050505050505050505543200FFFF06FFCEFF0100A8FD9808B80B1400D0073200FA004700E803000A0D0A540B0000000A0D0A1000000000000000030000000B000000010000000100000001000000000000000000000024000000980F0D0A5353455F4E525F4E66436F6E66696700120000000505050505050505050505050505050505056C50FBF4011405000000000000000000000100FF7F000064000000881C16FD30F800000000000A0D0A1B070000000A0D0A1000000000000000040000000B00000001000000010000000100000000000000000000001A0000006B0F0D0A5353455F524543565F436F6E666967000A000000060506060404060305053C307501000A000200C8000000983A0000000064000000007D0000000A0D0A2D030000000A0D0A1100000000000000000000000500000001000000010000000F00000000000000000000001E000000AD0F0D0A5353455F524543565F45514E6F646573005600FFFFAEFC2202960010022103960036FFAB062002F0009F09007DC800000A0D0A690A0000000A0D0A1300000000000000050000000B00000001000000010000000100000000000000000000001A0000003A100D0A5353455F524543565F414743436F6E666967000D000000050505050505050505050505054E5802A8FD0000ECFA5802E8032003E80374FF74FFC800C8004600000A0D0AF40A0000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C000000D30F0D0A5353455F53594E54485F436F6E66696700090000000303030303050505052C01000000307500000100000064000000F2060000B80BE8032C01D4FE000A0D0AB0050000000A0D0A1200000000000000000000000500000001000000010000000F00000000000000000000001E00000014100D0A5353455F53594E54485F45514E6F646573002800FA001AFC5E01C8006000F401C80014FC1C02C8002E01C4095802F801000A0D0AC109000099999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 +2E21180A03000122030000000000000002000000000000000042534420535345204261736963205369676E616C70726F63657373696E672044617461204352433A3058443635344246354220000000000000000000000000000000000200000000000A0D0A1000000000000000110000000B0000000100000001000000010000000000000000000000F000000043100D0A5353455F4D41494E5F436F6E6669670040000000060606060603040303030303030303030303030403030303040303030303030303030303030303030303030303030606030303060303030303030303030303031B01000100401F8000000001000000000000000200000002000000020000000200000002000000000000000200000000000000010000000100000001000000000000000000000001000000010000000100000000000000000000000100000001000000000000000300000001000000020000000100000001000000020000000000000001000000000000000100000001000000020000000100000000000000010000000100000002000000010000000100740E0100000001000000000000000000010000000100000001000000020000000100000001000000010000000100000000000000010000000100000001000000000A0D0A9C010000000A0D0A1B00000000000000010000000B00000001000000010000000100000000000000000000000C000000CC130D0A5353455F4D41494E5F436F6E66696756657273696F6E496E666F00030000000303030C030000001300000000000000000A0D0A16000000000A0D0A1800000000000000010000000B00000001000000010000000100000000000000000000001A0000008A120D0A5353455F4145435F4E6F6E4C696E4F7074436F6E666967000D000000050505050505050505050505054E000065F0A00F8AFA00000300E51E400164005425FA00A1FF3200000A0D0A78080000000A0D0A0F00000000000000080000000B0000000100000001000000010000000000000000000000B20000009F0F0D0A5353455F4145435F436F6E6669670058000000050505050505050505050505050505050505050505050505050505050505050505050505030505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050E340001009001A6FD56FF30FF56FF62FF30FF82FF2B01B8FF930BCAFF2B0162FF0E07D00730FF30FF3EFF3EFF4DFF550296004CFF2C014C1D2E01D10FE803E80300F430F8A1FF43D05A0000000E07D0075A02E80203F10600B4045A02B404D007B404E803D0075A02B4042D015A0245FDCD00CDFCCD00CD049AFFBC0244FD2AFF660006EEC0F1C0E030F890E817F835FF1A030000BA03D4FE64002E01D10F00006C0064190083D4FE000000000000580238FF000A0D0AB0480000000A0D0A1900000000000000010000000B000000010000000100000001000000000000000000000010000000E3120D0A5353455F4145435F526F6F6D4368616E6765436F6E66696700070000000305050505050528030000004B0020032C01480D46003200000A0D0A6B010000000A0D0A0F00000000000000050000000B00000001000000010000000100000000000000000000001A000000060F0D0A5353455F4147435F436F6E666967000D000000050505050505050505050505054E0000A8FD00008CF19001E8032003E80374FF74FFC800C8004600000A0D0A680A0000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000062100D0A5353455F414E414C5F4D6963436F6E666967000400000005050303146A2D6A2D0000000028000000000A0D0A56010000000A0D0A1300000000000000010000000B00000001000000010000000100000000000000000000000C00000066100D0A5353455F414E414C5F526566436F6E66696700040000000505030314007D007DA3000000C8000000000A0D0A65020000000A0D0A1500000000000000030000000B00000001000000010000000100000000000000000000001800000077110D0A5353455F4642465F447269766572436F6E66696700090000000505030303060505053100000000C8000000F4010000960000003A00E8034100FFFF000A0D0AB7050000000A0D0A0E000000000000000F0000000B000000010000000100000001000000000000000000000008000000D20E0D0A5353455F4E525F436F6E6669670004000000050505051888FA0000112B73FF000A0D0A30030000000A0D0A1000000000000000010000000B00000001000000010000000100000000000000000000000E0000007A0F0D0A5353455F4E525F4866436F6E6669670007000000050505050505052A3C0000000000710253070D036400000A0D0A7D010000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C00000004100D0A5353455F4E525F526273436F6E666967000E0000000505050505050505050505050505543200FFFF06FFCEFF0100A8FD9808B80B1400D0073200FA004700E803000A0D0A540B0000000A0D0A1000000000000000030000000B000000010000000100000001000000000000000000000024000000980F0D0A5353455F4E525F4E66436F6E66696700120000000505050505050505050505050505050505056C50FBF4011405000000000000000000000100FF7F000064000000881C16FD30F800000000000A0D0A1B070000000A0D0A1000000000000000040000000B00000001000000010000000100000000000000000000001A0000006B0F0D0A5353455F524543565F436F6E666967000A000000060506060404060305053C307501000A000200C8000000983A0000000064000000007D0000000A0D0A2D030000000A0D0A1100000000000000000000000500000001000000010000000F00000000000000000000001E000000AD0F0D0A5353455F524543565F45514E6F646573005600FFFFAEFC2202960010022103960036FFAB062002F0009F09007DC800000A0D0A690A0000000A0D0A1300000000000000050000000B00000001000000010000000100000000000000000000001A0000003A100D0A5353455F524543565F414743436F6E666967000D000000050505050505050505050505054E5802A8FD0000ECFA5802E8032003E80374FF74FFC800C8004600000A0D0AF40A0000000A0D0A1100000000000000030000000B00000001000000010000000100000000000000000000001C000000D30F0D0A5353455F53594E54485F436F6E66696700090000000303030303050505052C01000000307500000100000064000000F2060000B80BE8032C01D4FE000A0D0AB0050000000A0D0A1200000000000000000000000500000001000000010000000F00000000000000000000001E00000014100D0A5353455F53594E54485F45514E6F646573002800FA001AFC5E01C8006000F401C80014FC1C02C8002E01C4095802F801000A0D0AC109000099999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 # reload rlink2 1101 diff --git a/pyren/mod_elm.py b/pyren/mod_elm.py index b355e71..78b5abf 100755 --- a/pyren/mod_elm.py +++ b/pyren/mod_elm.py @@ -151,7 +151,7 @@ class Port: self.portTimeout = portTimeout portName = portName.strip () - + if re.match (r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$", portName): try: self.ipaddr, self.tcpprt = portName.split (':') @@ -174,10 +174,10 @@ class Port: self.droid.bluetoothConnect ('00001101-0000-1000-8000-00805F9B34FB') except: pass - + if len (self.droid.bluetoothActiveConnections ().result) != 0: self.btcid = list (self.droid.bluetoothActiveConnections ().result.keys ())[0] - + else: self.portName = portName self.portType = 0 diff --git a/pyren/mod_mtc.py b/pyren/mod_mtc.py index e52d1b1..b60fa00 100755 --- a/pyren/mod_mtc.py +++ b/pyren/mod_mtc.py @@ -260,17 +260,56 @@ def acf_MTC_and( expr, mtc ): interm_res = acf_MTC_finde( ande, mtc ) result = result and interm_res - #print "and:", expr, result + return result - return result -def acf_MTC_compare( expr, mtc ): +def acf_MTC_or(expr, mtc): + ''' expr - expression with AND rules''' + ''' mtc - list of options ''' + ''' and-operand in MTC expression ''' + + result = False + + or_list = expr.split(',') + or_list = map(lambda x: x.strip(), or_list) + + for ore in or_list: + interm_res = acf_MTC_finde(ore, mtc) + result = result or interm_res + + if result: + return result + + return result + + +def acf_MTC_compare(expr, mtc): + ''' expr - expression with rules''' + ''' mtc - list of options ''' + ''' this function match MTC-tag with MTC-expression''' + + result = True + + and_list = expr.split('/') + and_list = map(lambda x: x.strip(), and_list) + + for ande in and_list: + if ',' in ande: + interm_res = acf_MTC_or(ande, mtc) + else: + interm_res = acf_MTC_finde(ande, mtc) + result = result and interm_res + + return result + + +def acf_MTC_compare_old( expr, mtc ): ''' expr - expression with rules''' ''' mtc - list of options ''' ''' this function match MTC-tag with MTC-expression''' result = False - + or_list = expr.split(',') or_list = map(lambda x:x.strip(),or_list) diff --git a/pyren/mod_term.py b/pyren/mod_term.py index 0b90764..7c79352 100755 --- a/pyren/mod_term.py +++ b/pyren/mod_term.py @@ -226,7 +226,7 @@ def optParser(): default=False, action="store_true") - parser.add_argument("--verbose", + parser.add_argument("-vv", "--verbose", help="show verbose output (unused)", dest="verb", default=False,