From 136f3c40ffdad9928ba5f8fcfdfa64d1aced2a50 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.local.net>
Date: Fri, 4 Sep 2020 19:23:57 +0200
Subject: [PATCH] Update xml e validatore modBlock

---
 .../Config/moduleBlockConfig.xml              |  9 +++++++++
 .../Config/moduleBlockConfigValidator.xsd     | 20 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/Thermo.Active.Config/Config/moduleBlockConfig.xml b/Thermo.Active.Config/Config/moduleBlockConfig.xml
index ed5b01e9..9ebeb7b9 100644
--- a/Thermo.Active.Config/Config/moduleBlockConfig.xml
+++ b/Thermo.Active.Config/Config/moduleBlockConfig.xml
@@ -71,6 +71,9 @@
         <idParam>80</idParam>
         <showDelay>true</showDelay>
         <priority>3</priority>
+        <category>Pyrometer</category>
+        <subCategory_1>Pyrometer</subCategory_1>
+        <subCategory_2></subCategory_2>
     </block>
     <block>
         <id>9</id>
@@ -116,6 +119,9 @@
         <idParam>99</idParam>
         <showDelay>true</showDelay>
         <priority>2</priority>
+        <category>Drawing</category>
+        <subCategory_1></subCategory_1>
+        <subCategory_2></subCategory_2>
     </block>
     <block>
         <id>14</id>
@@ -152,6 +158,9 @@
         <idParam>139</idParam>
         <showDelay>true</showDelay>
         <priority>4</priority>
+        <category>Cooling</category>
+        <subCategory_1>Pyrometer</subCategory_1>
+        <subCategory_2></subCategory_2>
     </block>
     <block>
         <id>19</id>
diff --git a/Thermo.Active.Config/Config/moduleBlockConfigValidator.xsd b/Thermo.Active.Config/Config/moduleBlockConfigValidator.xsd
index 5dbe717c..dfc8ef79 100644
--- a/Thermo.Active.Config/Config/moduleBlockConfigValidator.xsd
+++ b/Thermo.Active.Config/Config/moduleBlockConfigValidator.xsd
@@ -16,6 +16,9 @@
                             <xs:element name="priority" type="xs:int" />
                             <xs:element name="scaleFactor" type="xs:int" minOccurs="0" />
                             <xs:element name="numDec" type="xs:int" minOccurs="0" />
+                            <xs:element name="category" type="param_type" minOccurs="0" />
+                            <xs:element name="subCategory_1" type="xs:string" minOccurs="0" />
+                            <xs:element name="subCategory_2" type="xs:string" minOccurs="0" />
                         </xs:all>
                     </xs:complexType>
                 </xs:element>
@@ -23,6 +26,23 @@
         </xs:complexType>
     </xs:element>
 
+    <!-- Head Type -->
+    <xs:simpleType name="param_type" final="restriction">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="General" />
+            <xs:enumeration value="Positions" />
+            <xs:enumeration value="Cycle"/>
+            <xs:enumeration value="Heats"/>
+            <xs:enumeration value="Pyrometer"/>
+            <xs:enumeration value="Drawing"/>
+            <xs:enumeration value="UpperPlate"/>
+            <xs:enumeration value="Cooling"/>
+            <xs:enumeration value="Vacuum"/>
+            <xs:enumeration value="Extraction"/>
+            <xs:enumeration value="Options"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
     <!-- Language Type -->
     <xs:complexType name="langType">
         <xs:simpleContent>