Merge branch 'bugfix/softkeys' into develop

Thermo.Active.Config/Config/userSoftKeyConfig.xml

@@ -17,7 +17,7 @@
         <active>true</active>
         <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
-        <plcId>2</plcId>
+        <plcId>1</plcId>
         <localizedNames>
             <lang langKey="en">Refresh alarms</lang>
             <lang langKey="it">Refresh allarmi</lang>
@@ -27,7 +27,7 @@
 
     <softKey_procedure>
         <active>false</active>
-        <category>3</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>3</plcId>
         <localizedNames>
@@ -39,7 +39,7 @@
 
     <softKey_procedure>
         <active>false</active>
-        <category>4</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>4</plcId>
         <localizedNames>
@@ -51,7 +51,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>5</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>5</plcId>
         <localizedNames>
@@ -63,7 +63,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>6</category>
+        <category>1</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>6</plcId>
         <localizedNames>
@@ -76,7 +76,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>1</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>7</plcId>
         <localizedNames>
@@ -89,7 +89,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>1</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>8</plcId>
         <localizedNames>
@@ -110,13 +110,26 @@
             <lang langKey="it">Pompe vuoto</lang>
         </localizedNames>
         <visible>true</visible>
+        <starred>true</starred>
     </softKey_procedure>
 
     <softKey_procedure>
         <active>true</active>
-        <category>10</category>
+        <category>1</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>10</plcId>
+        <localizedNames>
+            <lang langKey="en">Last cycle</lang>
+            <lang langKey="it">Ultimo ciclo</lang>
+        </localizedNames>
+        <visible>true</visible>
+    </softKey_procedure>
+	
+    <softKey_procedure>
+        <active>false</active>
+        <category>10</category>
+        <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
+        <plcId>11</plcId>
         <localizedNames>
             <lang langKey="en">START Cycle</lang>
             <lang langKey="it">START Ciclo</lang>
@@ -126,43 +139,43 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>1</category>
+        <category>4</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>12</plcId>
         <localizedNames>
             <lang langKey="en">Reset hours pump 1</lang>
             <lang langKey="it">Reset contaore pompa 1</lang>
         </localizedNames>
-        <visible>true</visible>
+        <visible>false</visible>
     </softKey_procedure>
 
     <softKey_procedure>
         <active>false</active>
-        <category>1</category>
+        <category>4</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>13</plcId>
         <localizedNames>
             <lang langKey="en">Reset hours pump 2</lang>
             <lang langKey="it">Reset contaore pompa 2</lang>
         </localizedNames>
-        <visible>true</visible>
+        <visible>false</visible>
     </softKey_procedure>
 
     <softKey_procedure>
         <active>false</active>
-        <category>1</category>
+        <category>4</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>14</plcId>
         <localizedNames>
             <lang langKey="en">Reset hours pump 3</lang>
             <lang langKey="it">Reset contaore pompa 3</lang>
         </localizedNames>
-        <visible>true</visible>
+        <visible>false</visible>
     </softKey_procedure>
 
     <softKey_procedure>
         <active>true</active>
-        <category>1</category>
+        <category>4</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>15</plcId>
         <localizedNames>
@@ -174,7 +187,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>1</category>
+        <category>4</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>16</plcId>
         <localizedNames>
@@ -186,7 +199,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>4</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>17</plcId>
         <localizedNames>
@@ -198,7 +211,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>4</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>18</plcId>
         <localizedNames>
@@ -210,7 +223,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>19</plcId>
         <localizedNames>
@@ -222,7 +235,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>20</plcId>
         <localizedNames>
@@ -234,7 +247,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>21</plcId>
         <localizedNames>
@@ -246,7 +259,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>true</operatorConfirmationNeeded>
         <plcId>22</plcId>
         <localizedNames>
@@ -254,11 +267,13 @@
             <lang langKey="it">Ventose setup</lang>
         </localizedNames>
         <visible>true</visible>
+        <refCallParam>cycle_loader_enable</refCallParam>
+        <refCallLabel>cycle_loader_enable_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>23</plcId>
         <localizedNames>
@@ -270,7 +285,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>24</plcId>
         <localizedNames>
@@ -282,7 +297,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>25</plcId>
         <localizedNames>
@@ -294,7 +309,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>26</plcId>
         <localizedNames>
@@ -306,7 +321,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>3</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>27</plcId>
         <localizedNames>
@@ -318,7 +333,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>28</plcId>
         <localizedNames>
@@ -330,7 +345,7 @@
 
     <softKey_procedure>
         <active>false</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>29</plcId>
         <localizedNames>
@@ -342,12 +357,12 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>30</plcId>
         <localizedNames>
             <lang langKey="en">Frame X</lang>
-            <lang langKey="it">Apertura cornice</lang>
+            <lang langKey="it">Larghezza cornice</lang>
         </localizedNames>
         <visible>true</visible>
         <refCallParam>general_sizes_frame_dim_x</refCallParam>
@@ -356,7 +371,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>31</plcId>
         <localizedNames>
@@ -370,7 +385,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>32</plcId>
         <localizedNames>
@@ -384,7 +399,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>33</plcId>
         <localizedNames>
@@ -398,33 +413,21 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>7</category>
+        <category>2</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>34</plcId>
         <localizedNames>
-            <lang langKey="en">Preheating cycles</lang>
-            <lang langKey="it">Cicli di preriscaldo</lang>
+            <lang langKey="en">Windowplate Up</lang>
+            <lang langKey="it">Piastrafinestra su</lang>
         </localizedNames>
         <visible>true</visible>
     </softKey_procedure>
 
-    <softKey_procedure>
-        <active>false</active>
-        <category>7</category>
-        <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
-        <plcId>35</plcId>
-        <localizedNames>
-            <lang langKey="en">Loader Cycle Start</lang>
-            <lang langKey="it">Start Ciclo Caricatore</lang>
-        </localizedNames>
-        <visible>true</visible>
-        <refCallParam>cycle_loader_enable</refCallParam>
-        <refCallLabel>cycle_loader_enable_button</refCallLabel>
-    </softKey_procedure>
+
 
     <softKey_procedure>
         <active>true</active>
-        <category>1</category>
+        <category>7</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>36</plcId>
         <localizedNames>
@@ -438,7 +441,7 @@
 
     <softKey_procedure>
         <active>true</active>
-        <category>1</category>
+        <category>7</category>
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>37</plcId>
         <localizedNames>

Thermo.Active.NC/NcAdapter.cs

@@ -1473,7 +1473,7 @@ namespace Thermo.Active.NC
         }
 
         /// <summary>
-        /// Lettura dati ProdInfo
+        /// Lettura dati ProdInfo (LIVE)
         /// </summary>
         /// <param name="prodInfoData"></param>
         /// <returns></returns>
@@ -1488,20 +1488,24 @@ namespace Thermo.Active.NC
             // converto 1:1 dati da ThermoModels.ProdInfoModel --> DTOProdInfo
             prodInfoData = new DTOProdInfo(prodInfoRawData);
 
+            // 2020.09.02: incremento di 1 il NUMERO dei pezzi, in modo che mostro il pezzo corrente (n=fatti + 1)
+            prodInfoData.NumDone++;
+
             // if lastProdInfo is missing --> populate!
             if (lastProdInfoData == null)
                 lastProdInfoData = prodInfoRawData;
 
-            // se ho update OPPURE differenza di lettura..., sennò restituisco ultima lettura...
+            // se ho update da strobe OPPURE differenza di lettura..., sennò restituisco ultima lettura...
             if (ThermoProdUpdatedStr || (lastProdInfoData.NumDone != prodInfoRawData.NumDone))
             {
                 // do comparison with old record and if changed --> persist on DB!
                 if (!prodInfoRawData.Equals(lastProdInfoData))
                 {
-                    // save on DB!
+                    // save on DB! attenzione: num pezzi -1 perché salvo pezzo PRECEDENTE...
                     using (ProdInfoController prodInfoController = new ProdInfoController())
+                    {
                         prodInfoController.Create(prodInfoRawData.NumTarget, prodInfoRawData.NumDone, prodInfoRawData.TimeWarm, prodInfoRawData.TimeVent, prodInfoRawData.TimeVacuum, prodInfoRawData.TimeCycleGross, prodInfoRawData.TimeCycleNet, prodInfoRawData.MaterialTempEndWarm, prodInfoRawData.MaterialTempEndVent, prodInfoRawData.MoldTemp, prodInfoRawData.VacuumReadVal, prodInfoRawData.MouldEnergyOUT, prodInfoRawData.MouldEnergyIN);
-
+                    }
                     // update last info data
                     lastProdInfoData = prodInfoRawData;
 

Thermo.Active/App.config

@@ -108,7 +108,7 @@
                     <add name="SignalR-Bus" />
                 </listeners>
             </source>
-            <source name="SignalR.Transports.WebSocketTransport">
+            <!-- <source name="SignalR.Transports.WebSocketTransport">
                 <listeners>
                     <add name="SignalR-Transports" />
                 </listeners>
@@ -132,7 +132,7 @@
                 <listeners>
                     <add name="SignalR-Transports" />
                 </listeners>
-            </source>
+            </source> -->
             <source name="SignalR.ReflectedHubDescriptorProvider">
                 <listeners>
                     <add name="SignalR-Init" />
@@ -146,7 +146,6 @@
         <!-- Specifies the trace writer for output -->
         <sharedListeners>
             <!-- Listener for transport events -->
-            <add name="SignalR-Transports" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/transports.log" traceOutputOptions="None"/>
             <!--<add name="SignalR-Transports" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/transports.log" />-->
             <!-- Listener for scaleout provider events -->
             <add name="SignalR-Bus" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/bus.log" />

Thermo.Active/Properties/AssemblyInfo.cs

@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.12.64")]
+[assembly: AssemblyVersion("0.12.65")]