From 20d9bf716dab7fe0fbfd78fd5e574ad547d71eb7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.local.net>
Date: Thu, 17 Sep 2020 12:54:58 +0200
Subject: [PATCH] Aggiunta XML x conf parametri lastra

---
 .../Config/recipeConfigValidator.xsd          |   3 +-
 Thermo.Active.Config/Config/serverConfig.xml  | 139 ++++++++++--------
 .../Config/serverConfigValidator.xsd          |  14 ++
 3 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/Thermo.Active.Config/Config/recipeConfigValidator.xsd b/Thermo.Active.Config/Config/recipeConfigValidator.xsd
index c02d219d..2efa5f96 100644
--- a/Thermo.Active.Config/Config/recipeConfigValidator.xsd
+++ b/Thermo.Active.Config/Config/recipeConfigValidator.xsd
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    
     <xs:element name="recipe">
+        <!-- Heads -->
         <xs:complexType>
             <xs:sequence>
-                <!-- Heads -->
                 <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:all>
diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml
index 678c4205..e2791373 100644
--- a/Thermo.Active.Config/Config/serverConfig.xml
+++ b/Thermo.Active.Config/Config/serverConfig.xml
@@ -1,64 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <serverConfig>
-  <ncConfig>
-    <ncVendor>S7NET</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI/S7NET -->
-    <showNcHMI>false</showNcHMI>
-    <ncIpAddress>192.168.0.102</ncIpAddress>
-    <ncPort>102</ncPort>
-    <machineModel>Thermo 2020</machineModel>
-    <sharedPath>C:\CMS\Recipes\</sharedPath>
-    <sharedName>//PARTPRG:/</sharedName>
-    <installationDate>01/06/2020</installationDate>
-    <mgiOption>false</mgiOption>
-    <siemensKeyboardOption>false</siemensKeyboardOption>
-    <machineNumberHasLetters>false</machineNumberHasLetters>
-  </ncConfig>
-  <softwareProdConfig>
-    <enabled>false</enabled>
-    <path>C:\Program Files\Notepad++\notepad++.exe</path>
-  </softwareProdConfig>
-  <serverConfig>
-    <serverPort>9000</serverPort>
-    <serverAddress>*</serverAddress>
-    <language>en</language>
-    <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
-    <databaseAddress>localhost</databaseAddress>
-    <autoOpenCmsClient>false</autoOpenCmsClient>
-    <textEditorPath>C:\Windows\System32\notepad.exe</textEditorPath>
-    <MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
-    <MTCApplicationName>SCMA</MTCApplicationName>
-    <CMSConnectReady>false</CMSConnectReady>
-    <maxAlarmsRows>50000</maxAlarmsRows>
-    <alarmToDelete>5000</alarmToDelete>
-  </serverConfig>
-  <extSoftwares>
-      <software>
-        <longName>Calculator</longName>
-        <shortName>CAL</shortName>
-        <path>C:\Windows\System32\calc.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>true</inMainMenuBar>
-      </software>  
-      <software>
-        <longName>NotePad</longName>
-        <shortName>NP</shortName>
-        <path>C:\Windows\System32\notepad.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>true</inMainMenuBar>
-      </software>
-      <software>
-        <longName>MsPaint</longName>
-        <shortName>PA</shortName>
-        <path>C:\Windows\System32\mspaint.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>false</inMainMenuBar>
-      </software>
-      <software>
-        <longName>NotePad2</longName>
-        <shortName>NP2</shortName>
-        <path>C:\Windows\System32\notepad.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>false</inMainMenuBar>
-      </software>
+    <ncConfig>
+        <ncVendor>S7NET</ncVendor>
+        <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI/S7NET -->
+        <showNcHMI>false</showNcHMI>
+        <ncIpAddress>192.168.0.102</ncIpAddress>
+        <ncPort>102</ncPort>
+        <machineModel>Thermo 2020</machineModel>
+        <sharedPath>C:\CMS\Recipes\</sharedPath>
+        <sharedName>//PARTPRG:/</sharedName>
+        <installationDate>01/06/2020</installationDate>
+        <mgiOption>false</mgiOption>
+        <siemensKeyboardOption>false</siemensKeyboardOption>
+        <machineNumberHasLetters>false</machineNumberHasLetters>
+    </ncConfig>
+    <softwareProdConfig>
+        <enabled>false</enabled>
+        <path>C:\Program Files\Notepad++\notepad++.exe</path>
+    </softwareProdConfig>
+    <serverConfig>
+        <serverPort>9000</serverPort>
+        <serverAddress>*</serverAddress>
+        <language>en</language>
+        <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
+        <databaseAddress>localhost</databaseAddress>
+        <autoOpenCmsClient>false</autoOpenCmsClient>
+        <textEditorPath>C:\Windows\System32\notepad.exe</textEditorPath>
+        <MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
+        <MTCApplicationName>SCMA</MTCApplicationName>
+        <CMSConnectReady>false</CMSConnectReady>
+        <maxAlarmsRows>50000</maxAlarmsRows>
+        <alarmToDelete>5000</alarmToDelete>
+    </serverConfig>
+    <extSoftwares>
+        <software>
+            <longName>Calculator</longName>
+            <shortName>CAL</shortName>
+            <path>C:\Windows\System32\calc.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>true</inMainMenuBar>
+        </software>
+        <software>
+            <longName>NotePad</longName>
+            <shortName>NP</shortName>
+            <path>C:\Windows\System32\notepad.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>true</inMainMenuBar>
+        </software>
+        <software>
+            <longName>MsPaint</longName>
+            <shortName>PA</shortName>
+            <path>C:\Windows\System32\mspaint.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>false</inMainMenuBar>
+        </software>
+        <software>
+            <longName>NotePad2</longName>
+            <shortName>NP2</shortName>
+            <path>C:\Windows\System32\notepad.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>false</inMainMenuBar>
+        </software>
     </extSoftwares>
+    <additionalParameters>
+        <entry>
+            <key>warmerPlanSizeX</key>
+            <value>1500</value>
+        </entry>
+        <entry>
+            <key>warmerPlanSizeY</key>
+            <value>1200</value>
+        </entry>
+        <entry>
+            <key>warmerAutocompStartValue</key>
+            <value>30</value>
+        </entry>
+        <entry>
+            <key>warmerAutocompStep</key>
+            <value>5</value>
+        </entry>
+    </additionalParameters>
 </serverConfig>
\ No newline at end of file
diff --git a/Thermo.Active.Config/Config/serverConfigValidator.xsd b/Thermo.Active.Config/Config/serverConfigValidator.xsd
index 325b6c0c..7810fc7f 100644
--- a/Thermo.Active.Config/Config/serverConfigValidator.xsd
+++ b/Thermo.Active.Config/Config/serverConfigValidator.xsd
@@ -63,6 +63,20 @@
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
+                <xs:element name="additionalParameters" >
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:all>
+                                        <xs:element name="key" type="xs:string" />
+                                        <xs:element name="value" type="xs:string" />
+                                    </xs:all>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:all>
         </xs:complexType>
     </xs:element>