# HG changeset patch # User laurent # Date 1335795690 -7200 # Node ID afb63cee3a021cd56bd1b69bef8acf99041877d8 # Parent 62e102935f3ebefce0c5932b8fa409f3514ed7ae Fix Ethercat xsd files diff -r 62e102935f3e -r afb63cee3a02 etherlab/EtherCATBase.xsd --- a/etherlab/EtherCATBase.xsd Sun Apr 01 16:36:41 2012 +0200 +++ b/etherlab/EtherCATBase.xsd Mon Apr 30 16:21:30 2012 +0200 @@ -349,20 +349,20 @@ </xs:sequence> </xs:complexType> <xs:complexType name="ObjectInfoType"> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element name="DefaultString" type="xs:string"/> - <xs:sequence> + <xs:sequence minOccurs="0"> + <xs:choice> + <xs:element name="DefaultString" type="xs:string" minOccurs="0"/> + <xs:sequence minOccurs="0"> <xs:element name="MinData" type="xs:hexBinary" minOccurs="0"/> <xs:element name="MaxData" type="xs:hexBinary" minOccurs="0"/> <xs:element name="DefaultData" type="xs:hexBinary" minOccurs="0"/> </xs:sequence> - <xs:sequence> + <xs:sequence minOccurs="0"> <xs:element name="MinValue" type="HexDecValue" minOccurs="0"/> <xs:element name="MaxValue" type="HexDecValue" minOccurs="0"/> <xs:element name="DefaultValue" type="HexDecValue" minOccurs="0"/> </xs:sequence> - <xs:element name="SubItem" maxOccurs="unbounded"> + <xs:element name="SubItem" minOccurs="0" maxOccurs="unbounded"> <xs:complexType> <xs:sequence> <xs:element name="Name" type="xs:string"/> @@ -544,13 +544,13 @@ <xs:element name="URL" type="NameType" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="DescriptionURL" type="xs:string" minOccurs="0"/> <xs:choice> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> <xs:element name="VendorSpecific" type="VendorSpecificType" minOccurs="0"/> </xs:sequence> @@ -640,13 +640,13 @@ <xs:element name="Profile" type="ProfileType" minOccurs="0"/> <xs:element name="DcOpModeName" type="xs:string" minOccurs="0"/> <xs:choice minOccurs="0"> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> <xs:element name="VendorSpecific" type="VendorSpecificType" minOccurs="0"/> </xs:sequence> diff -r 62e102935f3e -r afb63cee3a02 etherlab/EtherCATInfo.xsd --- a/etherlab/EtherCATInfo.xsd Sun Apr 01 16:36:41 2012 +0200 +++ b/etherlab/EtherCATInfo.xsd Mon Apr 30 16:21:30 2012 +0200 @@ -652,13 +652,13 @@ </xs:complexType> </xs:element> <xs:choice minOccurs="0"> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> <xs:element name="VendorSpecific" type="VendorSpecificType" minOccurs="0"/> </xs:sequence> @@ -669,13 +669,13 @@ <xs:element name="Name" type="NameType" maxOccurs="unbounded"/> <xs:element name="Comment" type="NameType" minOccurs="0" maxOccurs="unbounded"/> <xs:choice> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> <xs:element name="VendorSpecific" type="VendorSpecificType" minOccurs="0"/> </xs:sequence> @@ -913,26 +913,26 @@ <xs:element name="VendorId" type="HexDecValue" minOccurs="0"/> <xs:element name="Name" type="NameType" minOccurs="0" maxOccurs="unbounded"/> <xs:choice minOccurs="0"> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> </xs:sequence> </xs:complexType> </xs:element> </xs:choice> <xs:choice minOccurs="0"> - <xs:element name="Image16x14" type="xs:string"> + <xs:element name="Image16x14" type="xs:string" minOccurs="0"> <xs:annotation> <xs:documentation>obsolete</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ImageFile16x14" type="xs:string"/> - <xs:element name="ImageData16x14" type="xs:hexBinary"/> + <xs:element name="ImageFile16x14" type="xs:string" minOccurs="0"/> + <xs:element name="ImageData16x14" type="xs:hexBinary" minOccurs="0"/> </xs:choice> </xs:sequence> <xs:attribute name="SlotGroup" type="HexDecValue" use="optional"/>