Merge remote-tracking branch 'CMS/develop' into develop

Thermo.Active.Config/Config/userSoftKeyConfig.xml

@@ -31,10 +31,12 @@
         <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
         <plcId>3</plcId>
         <localizedNames>
-            <lang langKey="en">Termoregulator</lang>
+            <lang langKey="en">Thermoregulator</lang>
             <lang langKey="it">Termoregolatori</lang>
         </localizedNames>
         <visible>true</visible>
+        <refCallParam>options_thermoregulator_enable</refCallParam>
+        <refCallLabel>options_thermoregulator_enable_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -85,6 +87,8 @@
         </localizedNames>
         <visible>true</visible>
         <starred>true</starred>
+        <refCallParam>heaters_enable</refCallParam>
+        <refCallLabel>heaters_enable_button</refCallLabel>		
     </softKey_procedure>
 
     <softKey_procedure>

Thermo.Active/Controllers/WebApi/RecipeController.cs

@@ -296,7 +296,6 @@ namespace Thermo.Active.Controllers.WebApi
     [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.RECIPE_MANAGER, Action = ACTIONS.READ)]
     public IHttpActionResult Load(string newName)
     {
-
       // chiamo metodo di lettura...
       var dataRead = NcFileAdapter.LoadRecipe(newName);
       if (dataRead == null)
@@ -310,8 +309,6 @@ namespace Thermo.Active.Controllers.WebApi
       // update current live data!
       NcFileAdapter.SaveRecipeCurrent();
 
-
-
       CmsError libraryError = WriteCurrentRecipeToPlc();
       if (libraryError.IsError())
       {

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.21.106")]
+[assembly: AssemblyVersion("0.99.107")]