From cb16049c72f82be952413ea3088a5f3e52a805f5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 5 Oct 2020 15:05:40 +0200 Subject: [PATCH 1/4] typo, start vers 1 --- Thermo.Active/Controllers/WebApi/RecipeController.cs | 1 - Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Thermo.Active/Controllers/WebApi/RecipeController.cs b/Thermo.Active/Controllers/WebApi/RecipeController.cs index 1d72a2b6..b2c05ccd 100644 --- a/Thermo.Active/Controllers/WebApi/RecipeController.cs +++ b/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) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 61226fd7..d9bfad73 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.107")] \ No newline at end of file From f0ee892ce5b81f5a00f855c873e197655fd62233 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 5 Oct 2020 15:08:32 +0200 Subject: [PATCH 2/4] typo --- Thermo.Active/Controllers/WebApi/RecipeController.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Thermo.Active/Controllers/WebApi/RecipeController.cs b/Thermo.Active/Controllers/WebApi/RecipeController.cs index b2c05ccd..41f05e73 100644 --- a/Thermo.Active/Controllers/WebApi/RecipeController.cs +++ b/Thermo.Active/Controllers/WebApi/RecipeController.cs @@ -309,8 +309,6 @@ namespace Thermo.Active.Controllers.WebApi // update current live data! NcFileAdapter.SaveRecipeCurrent(); - - CmsError libraryError = WriteCurrentRecipeToPlc(); if (libraryError.IsError()) { From 8769127f91ab0dd988ff524525bbf1a91cf87578 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 5 Oct 2020 15:10:36 +0200 Subject: [PATCH 3/4] set vers 0.99 --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index d9bfad73..3099a5ef 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/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("1.0.107")] \ No newline at end of file +[assembly: AssemblyVersion("0.99.107")] \ No newline at end of file From e4ed4b6b0f876093a6dc5325b41df30f117541f2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 5 Oct 2020 15:12:42 +0200 Subject: [PATCH 4/4] update xml softkeys --- Thermo.Active.Config/Config/userSoftKeyConfig.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Thermo.Active.Config/Config/userSoftKeyConfig.xml b/Thermo.Active.Config/Config/userSoftKeyConfig.xml index 2b9b88bd..78203dd0 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfig.xml +++ b/Thermo.Active.Config/Config/userSoftKeyConfig.xml @@ -31,10 +31,12 @@ false 3 - Termoregulator + Thermoregulator Termoregolatori true + options_thermoregulator_enable + options_thermoregulator_enable_button @@ -85,6 +87,8 @@ true true + heaters_enable + heaters_enable_button