git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4463 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 312 insertions, 262 deletions

diff --git a/tools/gencfg/schema/boards/abstract_board.xsd b/tools/gencfg/schema/boards/abstract_board.xsd
index b3a854307..1a2c38bf2 100644
--- a/tools/gencfg/schema/boards/abstract_board.xsd
+++ b/tools/gencfg/schema/boards/abstract_board.xsd
@@ -5,45 +5,48 @@
   <xs:include schemaLocation="../common/doc.xsd" />

 

   <xs:complexType name="AbstractBoardType" abstract="true">

-    <xs:complexContent>

-      <xs:extension base="DocumentedItem">

-        <xs:attribute name="BoardID" use="required">

-          <xs:annotation>

-            <xs:documentation>Board identifier string, it is used to

-              create the board files folder name and the board

-              identifier macro in board.h.</xs:documentation>

-          </xs:annotation>

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-              <xs:pattern value="\w[\w\d_]*"></xs:pattern>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="BoardPHYID" use="optional">

-          <xs:annotation>

-            <xs:documentation>PHY identifier as defined in mii.h or empty if a PHY is not present.</xs:documentation>

-          </xs:annotation>

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-              <xs:pattern value="MII_[\w\d_]+"></xs:pattern>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="BoardPHYType" use="optional">

-          <xs:annotation>

-            <xs:documentation>Type of the PHY device: RMII or MII, this attribute is defaulted to MII if not present.</xs:documentation>

-          </xs:annotation>

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="RMII"></xs:enumeration>

-              <xs:enumeration value="MII"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-      </xs:extension>

-    </xs:complexContent>

+    <xs:sequence>

+      <xs:element name="board_name" maxOccurs="1" minOccurs="1">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:whiteSpace value="collapse"></xs:whiteSpace>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:element>

+      <xs:element name="board_id" maxOccurs="1" minOccurs="1">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+            <xs:whiteSpace value="collapse"></xs:whiteSpace>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:element>

+      <xs:element name="ethernet_phy" type="EthernetPHYType"

+        maxOccurs="1" minOccurs="0">

+      </xs:element>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="EthernetPHYType">

+    <xs:sequence>

+      <xs:element name="identifier" maxOccurs="1" minOccurs="1">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:whiteSpace value="collapse"></xs:whiteSpace>

+            <xs:pattern value="MII_[\w\d_]+"></xs:pattern>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:element>

+      <xs:element name="bus_type" maxOccurs="1" minOccurs="1">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:whiteSpace value="collapse"></xs:whiteSpace>

+            <xs:enumeration value="RMII"></xs:enumeration>

+            <xs:enumeration value="MII"></xs:enumeration>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:element>

+    </xs:sequence>

   </xs:complexType>

 

 </xs:schema>

diff --git a/tools/gencfg/schema/boards/stm32f4xx_board.xsd b/tools/gencfg/schema/boards/stm32f4xx_board.xsd
index 0b3622e6f..ace3b5acb 100644
--- a/tools/gencfg/schema/boards/stm32f4xx_board.xsd
+++ b/tools/gencfg/schema/boards/stm32f4xx_board.xsd
@@ -10,61 +10,53 @@
     <xs:complexContent>
       <xs:extension base="AbstractBoardType">
         <xs:sequence>
-          <xs:element

-            name="ports"

-            type="portsType"

-            maxOccurs="1"

+                    <xs:element name="clocks" maxOccurs="1" minOccurs="1">
+                      <xs:complexType>
+                        <xs:attribute name="HSEBypass" use="required">
+                          <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                              <xs:whiteSpace value="collapse"></xs:whiteSpace>
+                              <xs:enumeration value="false"></xs:enumeration>
+                              <xs:enumeration value="true"></xs:enumeration>
+                            </xs:restriction>
+                          </xs:simpleType>
+                        </xs:attribute>

+                        <xs:attribute name="HSEFrequency"

+                          use="required">

+                          <xs:simpleType>

+                            <xs:restriction base="xs:int">

+                              <xs:whiteSpace value="collapse"></xs:whiteSpace>

+                              <xs:minInclusive value="0"></xs:minInclusive>

+                            </xs:restriction>

+                          </xs:simpleType>

+                        </xs:attribute>

+                        <xs:attribute name="LSEFrequency"

+                          use="required">

+                          <xs:simpleType>

+                            <xs:restriction base="xs:int">

+                              <xs:whiteSpace value="collapse"></xs:whiteSpace>

+

+                              <xs:minInclusive value="0"></xs:minInclusive>

+                            </xs:restriction>

+                          </xs:simpleType>

+                        </xs:attribute>

+                        <xs:attribute name="VDD" use="required">

+                          <xs:simpleType>

+                            <xs:restriction base="xs:int">

+                              <xs:whiteSpace value="collapse"></xs:whiteSpace>

+

+                              <xs:minInclusive value="180"></xs:minInclusive>

+

+                              <xs:maxInclusive value="360"></xs:maxInclusive>

+                            </xs:restriction>

+                          </xs:simpleType>

+                        </xs:attribute>

+                      </xs:complexType></xs:element>
+                    <xs:element name="ports" type="portsType" maxOccurs="1"

             minOccurs="1">

-          </xs:element>

-        </xs:sequence>

-        <xs:attribute

-          name="HSEBypass"

-          type="xs:boolean"

-          use="required">

-        </xs:attribute>

-        <xs:attribute

-          name="HSEFrequency"

-          use="required">

-          <xs:annotation>

-            <xs:documentation>

-              HSE frequency or zero if not present.

-            </xs:documentation>

-          </xs:annotation>

-          <xs:simpleType>

-            <xs:restriction base="xs:int">

-              <xs:minInclusive value="0"></xs:minInclusive>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute

-          name="LSEFrequency"

-          use="required">

-          <xs:annotation>

-            <xs:documentation>

-              LSE frequency or zero if not present.

-            </xs:documentation>

-          </xs:annotation>

-          <xs:simpleType>

-            <xs:restriction base="xs:int">

-              <xs:minInclusive value="0"></xs:minInclusive>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

+          </xs:element>


+                </xs:sequence>




 

-        <xs:attribute

-          name="VDD"

-          use="required">

-                    <xs:annotation>

-                      <xs:documentation>STM32F4xx VDD.</xs:documentation>

-                    </xs:annotation>

-                    <xs:simpleType>

-            <xs:restriction base="xs:int">

-              <xs:minInclusive value="180"></xs:minInclusive>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-              <xs:maxInclusive value="360"></xs:maxInclusive>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

       </xs:extension>

     </xs:complexContent>

   </xs:complexType>

@@ -93,4 +85,5 @@
   </xs:complexType>

 

   <xs:element name="board" type="STM32F4xxBoardType"></xs:element>

+

 </xs:schema>

diff --git a/tools/gencfg/schema/common/doc.xsd b/tools/gencfg/schema/common/doc.xsd
index b7395605b..e5be361d5 100644
--- a/tools/gencfg/schema/common/doc.xsd
+++ b/tools/gencfg/schema/common/doc.xsd
@@ -4,33 +4,26 @@
 

   <xs:complexType name="NamedItem">

     <xs:annotation>

-      <xs:documentation>>Generic item with optional name and brief

+      <xs:documentation>

+        >Generic item with optional name and brief

         description

       </xs:documentation>

     </xs:annotation>

-    <xs:attribute name="name" use="required">

-      <xs:annotation>

-        <xs:documentation>Object name.</xs:documentation>

-      </xs:annotation>

-      <xs:simpleType>

-        <xs:restriction base="xs:string">

-          <xs:pattern value="\w[\w\d_]*"></xs:pattern>

-        </xs:restriction>

-      </xs:simpleType>

-    </xs:attribute>

-    <xs:attribute name="brief" use="optional">

-      <xs:annotation>

-        <xs:documentation>Object brief description, 72 chars max in a

-          single line.</xs:documentation>

-      </xs:annotation>

-      <xs:simpleType>

-        <xs:restriction base="xs:string">

-

-          <xs:maxLength value="72"></xs:maxLength>

-          <xs:minLength value="0"></xs:minLength>

-        </xs:restriction>

-      </xs:simpleType>

-    </xs:attribute>

+    <xs:sequence>

+      <xs:element name="name" maxOccurs="1" minOccurs="1">

+        <xs:annotation>

+          <xs:documentation>Name of the object.</xs:documentation>

+        </xs:annotation>

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:whiteSpace value="collapse"></xs:whiteSpace>

+            <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+            <xs:minLength value="1"></xs:minLength>

+            <xs:maxLength value="24"></xs:maxLength>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:element>

+    </xs:sequence>

   </xs:complexType>

 

   <xs:complexType name="DocumentedItem">

@@ -41,15 +34,73 @@
     </xs:annotation>

     <xs:complexContent>

       <xs:extension base="NamedItem">

-        <xs:sequence maxOccurs="unbounded" minOccurs="0">

-          <xs:element name="details" type="xs:string"

-            maxOccurs="1" minOccurs="0">

+        <xs:sequence>

+          <xs:element name="brief" maxOccurs="1" minOccurs="1">

+            <xs:annotation>

+              <xs:documentation>

+                Brief description of the object.

+              </xs:documentation>

+            </xs:annotation>

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:minLength value="0"></xs:minLength>

+                <xs:maxLength value="72"></xs:maxLength>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="details" maxOccurs="1" minOccurs="0">

+            <xs:annotation>

+              <xs:documentation>

+                Object documentation as text, does not preserve

+                formatting.

+              </xs:documentation>

+            </xs:annotation>

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>


+          <xs:element name="pre" maxOccurs="unbounded" minOccurs="0">

             <xs:annotation>

-              <xs:documentation>Object documentation as text, does not

-                preserve formatting.</xs:documentation>

+              <xs:documentation>

+                Object pre-requisites as text, does not preserve

+                formatting.

+              </xs:documentation>

             </xs:annotation>

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

           </xs:element>

-        </xs:sequence>

+          <xs:element name="post" maxOccurs="unbounded" minOccurs="0">

+            <xs:annotation>

+              <xs:documentation>

+                Object post-requisites as text, does not preserve

+                formatting.

+              </xs:documentation>

+            </xs:annotation>

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="note" maxOccurs="unbounded" minOccurs="0">

+            <xs:annotation>

+              <xs:documentation>

+                Object note as text, does not preserve formatting.

+              </xs:documentation>

+            </xs:annotation>

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>
+                </xs:sequence>

       </xs:extension>

     </xs:complexContent>

   </xs:complexType>
diff --git a/tools/gencfg/schema/hal/abstract_adc_cfg.xsd b/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
index 4a2901c4e..52a6c9096 100644
--- a/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
+++ b/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
@@ -7,29 +7,37 @@
   <xs:complexType name="AbstractAdcGroupCfgType">

     <xs:complexContent>

       <xs:extension base="DocumentedItem">

-        <xs:attribute name="circular" type="xs:boolean"

-          use="required">

-        </xs:attribute>

-        <xs:attribute name="conversion_callback" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:pattern value="\w?[\w\d_]*"></xs:pattern>

-              <xs:minLength value="0"></xs:minLength>

-              <xs:maxLength value="24"></xs:maxLength>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="error_callback" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:pattern value="\w?[\w\d_]*"></xs:pattern>

-              <xs:minLength value="0"></xs:minLength>

-              <xs:maxLength value="24"></xs:maxLength>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

+        <xs:sequence>

+          <xs:element name="circular" maxOccurs="1" minOccurs="1">

+

+            <xs:simpleType>

+              <xs:restriction base="xs:boolean">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="conv_callback" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:minLength value="0"></xs:minLength>

+                <xs:maxLength value="24"></xs:maxLength>

+                <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="error_callback" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:minLength value="0"></xs:minLength>

+                <xs:maxLength value="24"></xs:maxLength>

+

+                <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+        </xs:sequence>




       </xs:extension>

     </xs:complexContent>

   </xs:complexType>

@@ -37,7 +45,7 @@
 

   <xs:complexType name="AbstractAdcCfgType">

     <xs:complexContent>

-      <xs:extension base="DocumentedItem"></xs:extension>

+      <xs:extension base="AbstractDriverCfgType"></xs:extension>

     </xs:complexContent>

   </xs:complexType>

 </xs:schema>

diff --git a/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd b/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
index c038263c2..331933109 100644
--- a/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
+++ b/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
@@ -20,34 +20,103 @@
       </xs:extension>

     </xs:complexContent>

   </xs:complexType>
-
-  <xs:complexType name="STM32F4xxAdcChannelSettingsType">
-    <xs:attribute name="sample" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_15"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_28"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_56"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_84"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_112"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_144"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_480"></xs:enumeration>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>

-  </xs:complexType>

+

 

   <xs:complexType name="STM32F4xxAdcGroupCfgType">

     <xs:complexContent>

       <xs:extension base="AbstractAdcGroupCfgType">

         <xs:sequence>

-          <xs:element name="sample_time" maxOccurs="1"

+          <xs:element name="alignment" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Samples are Right Aligned"></xs:enumeration>

+                <xs:enumeration value="1 Samples are Left Aligned"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="resolution" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 12 bits"></xs:enumeration>

+                <xs:enumeration value="1 10 bits"></xs:enumeration>

+                <xs:enumeration value="2 8 bits"></xs:enumeration>

+                <xs:enumeration value="3 6 bits"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="trigger_mode" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Software"></xs:enumeration>

+                <xs:enumeration value="1 Rising Edge"></xs:enumeration>

+                <xs:enumeration value="2 Falling Edge"></xs:enumeration>

+                <xs:enumeration value="3 Both Edges"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="trigger_source" maxOccurs="1"

             minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Timer 1 CC1 event"></xs:enumeration>

+                <xs:enumeration value="1 Timer 1 CC2 event"></xs:enumeration>

+                <xs:enumeration value="2 Timer 1 CC3 event"></xs:enumeration>

+                <xs:enumeration value="3 Timer 2 CC2 event"></xs:enumeration>

+                <xs:enumeration value="4 Timer 2 CC3 event"></xs:enumeration>

+                <xs:enumeration value="5 Timer 2 CC4 event"></xs:enumeration>

+                <xs:enumeration value="6 Timer 2 TRGO event"></xs:enumeration>

+                <xs:enumeration value="7 Timer 3 CC1 event"></xs:enumeration>

+                <xs:enumeration value="8 Timer 3 TRGO event"></xs:enumeration>

+                <xs:enumeration value="9 Timer 4 CC4 event"></xs:enumeration>

+                <xs:enumeration value="10 Timer 5 CC1 event"></xs:enumeration>

+                <xs:enumeration value="11 Timer 5 CC2 event"></xs:enumeration>

+                <xs:enumeration value="12 Timer 5 CC3 event"></xs:enumeration>

+                <xs:enumeration value="13 Timer 8 CC1 event"></xs:enumeration>

+                <xs:enumeration value="14 Timer 8 CC4 event"></xs:enumeration>

+                <xs:enumeration value="15 EXTI line15"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>


+          <xs:element name="discontinuous" maxOccurs="1"

+            minOccurs="1">

+

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Disabled"></xs:enumeration>

+                <xs:enumeration value="1 One discontinous conversion"></xs:enumeration>

+                <xs:enumeration

+                  value="2 Two discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="3 Three discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="4 Four discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="5 Five discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="6 Six discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="7 Seven discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="8 Eight discontinous conversions">

+                </xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="sample_time" maxOccurs="1" minOccurs="1">

             <xs:complexType>

               <xs:sequence>

-                <xs:element name="IN0" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN0" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -61,8 +130,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN1" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN1" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -76,8 +144,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN2" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN2" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -91,8 +158,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN3" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN3" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -106,8 +172,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN4" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN4" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -121,8 +186,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN5" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN5" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -136,8 +200,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN6" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN6" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -151,8 +214,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN7" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN7" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -166,8 +228,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN8" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN8" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -181,8 +242,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN9" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN9" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -196,8 +256,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN10" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN10" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -211,8 +270,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN11" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN11" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -226,8 +284,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN12" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN12" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -241,8 +298,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN13" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN13" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -256,8 +312,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN14" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN14" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -271,8 +326,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN15" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN15" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -286,8 +340,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="SENSOR" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="SENSOR" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -316,8 +369,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="VBAT" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="VBAT" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -368,68 +420,11 @@
             </xs:complexType>

           </xs:element>

         </xs:sequence>

-        <xs:attribute name="alignment" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Samples are Right Aligned"></xs:enumeration>

-              <xs:enumeration value="1 Samples are Left Aligned"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="resolution" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 12 bits"></xs:enumeration>

-              <xs:enumeration value="1 10 bits"></xs:enumeration>

-              <xs:enumeration value="2 8 bits"></xs:enumeration>

-              <xs:enumeration value="3 6 bits"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="trigger_mode" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Software"></xs:enumeration>

-              <xs:enumeration value="1 Rising Edge"></xs:enumeration>

-              <xs:enumeration value="2 Falling Edge"></xs:enumeration>

-              <xs:enumeration value="3 Both Edges"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="trigger_source" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Timer 1 CC1 event"></xs:enumeration>

-              <xs:enumeration value="1 Timer 1 CC2 event"></xs:enumeration>

-              <xs:enumeration value="2 Timer 1 CC3 event"></xs:enumeration>

-              <xs:enumeration value="3 Timer 2 CC2 event"></xs:enumeration>

-              <xs:enumeration value="4 Timer 2 CC3 event"></xs:enumeration>

-              <xs:enumeration value="5 Timer 2 CC4 event"></xs:enumeration>

-              <xs:enumeration value="6 Timer 2 TRGO event"></xs:enumeration>

-              <xs:enumeration value="7 Timer 3 CC1 event"></xs:enumeration>

-              <xs:enumeration value="8 Timer 3 TRGO event"></xs:enumeration>

-              <xs:enumeration value="9 Timer 4 CC4 event"></xs:enumeration>

-              <xs:enumeration value="10 Timer 5 CC1 event"></xs:enumeration>

-              <xs:enumeration value="11 Timer 5 CC2 event"></xs:enumeration>

-              <xs:enumeration value="12 Timer 5 CC3 event"></xs:enumeration>

-              <xs:enumeration value="13 Timer 8 CC1 event"></xs:enumeration>

-              <xs:enumeration value="14 Timer 8 CC4 event"></xs:enumeration>

-              <xs:enumeration value="15 EXTI line15"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="discontinuous_mode" type="xs:boolean"

-          use="required">

-        </xs:attribute>

-        <xs:attribute name="discontinuous_number" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:int">

-              <xs:minInclusive value="1"></xs:minInclusive>

-              <xs:maxInclusive value="8"></xs:maxInclusive>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

+

+

+

+

+

       </xs:extension>

     </xs:complexContent>

   </xs:complexType>