diff --git a/script/slaveinfo2xml.py b/script/slaveinfo2xml.py index b2ec41f253ca6ee20fdee7787c8941618c8fe9cc..6a6802026b1ed924efcefbc1e361c3edf3dc5047 100755 --- a/script/slaveinfo2xml.py +++ b/script/slaveinfo2xml.py @@ -112,7 +112,7 @@ class Device: reRevision = re.compile('Revision number:.*\((\d+)\)') rePdo = re.compile('([RT])xPdo\s+0x([0-9A-F]+)') rePdoEntry = \ - re.compile('0x([0-9A-F]+):([0-9A-F]+) +"([^"]*)", (\d+) bit') + re.compile('0x([0-9A-F]+):([0-9A-F]+),\s+(\d+) bit,\s+"([^"]*)"') pdo = None f = open(fileName, 'r') while True: @@ -139,8 +139,8 @@ class Device: match = rePdoEntry.search(line) if match: pdoEntry = PdoEntry(int(match.group(1), 16), \ - int(match.group(2), 16), match.group(3), \ - int(match.group(4))) + int(match.group(2), 16), match.group(4), \ + int(match.group(3))) pdo.appendEntry(pdoEntry) f.close()