From 2d3869ddaea446c0841e5ed1e160f01619748fca Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.local.net>
Date: Thu, 2 Jul 2020 12:40:38 +0200
Subject: [PATCH] Refresh config + translations

---
 .../Config/moduleBlockConfig.xml              |  1 -
 Thermo.Active.Config/Config/recipeConfig.xml  | 34 +++++++++----------
 .../Config/thermoProdConfig.xml               |  6 ++--
 .../Config/thermoProdConfigValidator.xsd      |  2 +-
 .../Thermo.Active.Model.csproj                |  2 ++
 Thermo.Active/Dict/Labels_italian.txt         |  3 ++
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Thermo.Active.Config/Config/moduleBlockConfig.xml b/Thermo.Active.Config/Config/moduleBlockConfig.xml
index 902cd86d..afe3014a 100644
--- a/Thermo.Active.Config/Config/moduleBlockConfig.xml
+++ b/Thermo.Active.Config/Config/moduleBlockConfig.xml
@@ -16,7 +16,6 @@
         <section>HEATING</section>
         <idParam>-1</idParam>
         <showDelay>false</showDelay>
-
         <priority>1</priority>
     </block>
     <block>
diff --git a/Thermo.Active.Config/Config/recipeConfig.xml b/Thermo.Active.Config/Config/recipeConfig.xml
index bc6ceda6..45c20f58 100644
--- a/Thermo.Active.Config/Config/recipeConfig.xml
+++ b/Thermo.Active.Config/Config/recipeConfig.xml
@@ -2186,6 +2186,23 @@
         <format>enum</format>
         <scaleFactor>1</scaleFactor>
         <numDec>0</numDec>
+        <enumList>
+            <enumVal>
+                <label>extraction_main_type_RE_01</label>
+                <value>1</value>
+                <anim>estrazione-normale.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>extraction_main_type_RE_02</label>
+                <value>2</value>
+                <anim>estrazione-senza-cornice.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>extraction_main_type_RE_03</label>
+                <value>3</value>
+                <anim>estrazione-assistita.json</anim>
+            </enumVal>
+        </enumList>
     </parameter>
     <parameter>
         <id>197</id>
@@ -2208,23 +2225,6 @@
         <format>integer</format>
         <scaleFactor>1</scaleFactor>
         <numDec>0</numDec>
-        <enumList>
-            <enumVal>
-                <label>extraction_main_type_RE_01</label>
-                <value>1</value>
-                <anim>estrazione-normale.json</anim>
-            </enumVal>
-            <enumVal>
-                <label>extraction_main_type_RE_02</label>
-                <value>2</value>
-                <anim>estrazione-senza-cornice.json</anim>
-            </enumVal>
-            <enumVal>
-                <label>extraction_main_type_RE_03</label>
-                <value>3</value>
-                <anim>estrazione-assistita.json</anim>
-            </enumVal>
-        </enumList>
     </parameter>
     <parameter>
         <id>199</id>
diff --git a/Thermo.Active.Config/Config/thermoProdConfig.xml b/Thermo.Active.Config/Config/thermoProdConfig.xml
index 4c42ac47..cc5d2419 100644
--- a/Thermo.Active.Config/Config/thermoProdConfig.xml
+++ b/Thermo.Active.Config/Config/thermoProdConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gauges>
     <parameter>
-        <category>Gauge</category>
+        <category>GAUGE</category>
         <name>Potenza</name>
         <label>gauge_potenza</label>
         <um>kWatt</um>
@@ -11,7 +11,7 @@
         <maxVal>2000000</maxVal>
     </parameter>
     <parameter>
-        <category>Gauge</category>
+        <category>GAUGE</category>
         <name>Vuoto</name>
         <label>gauge_vuoto</label>
         <um>Bar</um>
@@ -21,7 +21,7 @@
         <maxVal>0</maxVal>
     </parameter>
     <parameter>
-        <category>Gauge</category>
+        <category>GAUGE</category>
         <name>Aria</name>
         <label>gauge_aria</label>
         <um>Bar</um>
diff --git a/Thermo.Active.Config/Config/thermoProdConfigValidator.xsd b/Thermo.Active.Config/Config/thermoProdConfigValidator.xsd
index e31a28f5..aaf85850 100644
--- a/Thermo.Active.Config/Config/thermoProdConfigValidator.xsd
+++ b/Thermo.Active.Config/Config/thermoProdConfigValidator.xsd
@@ -25,7 +25,7 @@
     <!-- Head Type -->
     <xs:simpleType name="param_type" final="restriction">
         <xs:restriction base="xs:string">
-            <xs:enumeration value="Gauge" />
+            <xs:enumeration value="GAUGE" />
         </xs:restriction>
     </xs:simpleType>
 
diff --git a/Thermo.Active.Model/Thermo.Active.Model.csproj b/Thermo.Active.Model/Thermo.Active.Model.csproj
index 169d38a2..d557dbae 100644
--- a/Thermo.Active.Model/Thermo.Active.Model.csproj
+++ b/Thermo.Active.Model/Thermo.Active.Model.csproj
@@ -63,6 +63,7 @@
     <Compile Include="ConfigModels\AlarmsConfigModel.cs" />
     <Compile Include="ConfigModels\CmsConnectConfigModel.cs" />
     <Compile Include="ConfigModels\ExtSoftwareModel.cs" />
+    <Compile Include="ConfigModels\ThermoProdConfigModel.cs" />
     <Compile Include="ConfigModels\ModBlockConfigModel.cs" />
     <Compile Include="ConfigModels\RiskConfigModel.cs" />
     <Compile Include="ConfigModels\RecipeConfigModel.cs" />
@@ -108,6 +109,7 @@
     <Compile Include="DTOModels\ThModules\DTOModule.cs" />
     <Compile Include="DTOModels\ThModules\DTOModuleConfigModel.cs" />
     <Compile Include="DTOModels\ThModules\DTOModulesBlock.cs" />
+    <Compile Include="DTOModels\ThProd\DTOThermoProd.cs" />
     <Compile Include="DTOModels\ThRecipe\LiveData.cs" />
     <Compile Include="DTOModels\ThWarmers\DTOWarmers.cs" />
     <Compile Include="DTOModels\ThRecipe\DTORecipeParam.cs" />
diff --git a/Thermo.Active/Dict/Labels_italian.txt b/Thermo.Active/Dict/Labels_italian.txt
index b2f64413..14c25e2c 100644
--- a/Thermo.Active/Dict/Labels_italian.txt
+++ b/Thermo.Active/Dict/Labels_italian.txt
@@ -344,3 +344,6 @@ options_thermoregulator_9_enabled,options_thermoregulator_9_enabled
 options_thermoregulator_9_setpoint,options_thermoregulator_9_setpoint
 options_thermoregulator_10_enabled,options_thermoregulator_10_enabled
 options_thermoregulator_10_setpoint,options_thermoregulator_10_setpoint
+gauge_potenza,gauge_potenza
+gauge_vuoto,gauge_vuoto
+gauge_aria,gauge_aria
\ No newline at end of file