Commit 4c8833a7 authored by Reto Da Forno's avatar Reto Da Forno
Browse files

make tag 'mode' for data trace optional and new 'size' tag added

parent 6419053f
......@@ -530,8 +530,17 @@ def start_test(testid, cur, cn, obsdict_key, obsdict_id):
else:
logger.warning("Key %u not found in symbol table." % (obskey))
continue
mode = dwtconf.xpath('d:mode', namespaces=ns)[0].text.strip()
xmlblock += "\t<dataTraceConf>\n\t\t<variable>%s</variable>\n\t\t<varName>%s</varName>\n\t\t<mode>%s</mode>\n\t</dataTraceConf>\n" % (varaddr, var, mode)
mode = dwtconf.xpath('d:mode', namespaces=ns)
if mode:
mode = mode[0].text.strip()
else:
mode = 'W' # use default
size = dwtconf.xpath('d:size', namespaces=ns)
if size:
size = size[0].text.strip()
else:
size = 4
xmlblock += "\t<dataTraceConf>\n\t\t<variable>%s</variable>\n\t\t<varName>%s</varName>\n\t\t<mode>%s</mode>\n\t\t<size>%d</size>\n\t</dataTraceConf>\n" % (varaddr, var, mode, size)
xmlblock += "</obsDebugConf>\n\n"
for obsid in obsids:
obsid = int(obsid)
......
......@@ -227,8 +227,17 @@
<xs:element name="dataTraceConf" minOccurs="0" maxOccurs="4">
<xs:complexType>
<xs:sequence>
<xs:element name="variable" type="xs:string"/>
<xs:element name="mode" type="dataTraceModeListType"/>
<xs:element name="variable" type="xs:string" />
<xs:element name="mode" type="dataTraceModeListType" minOccurs="0" />
<xs:element name="size" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:integer">
<xs:enumeration value="1"/>
<xs:enumeration value="2"/>
<xs:enumeration value="4"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment