diff --git a/Thermo.Active.Config/Config/userSoftKeyConfig.xml b/Thermo.Active.Config/Config/userSoftKeyConfig.xml index a1f133bd..627e05b0 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfig.xml +++ b/Thermo.Active.Config/Config/userSoftKeyConfig.xml @@ -2,7 +2,7 @@ - true + false 1 false 1 @@ -25,7 +25,7 @@ true - + false 3 false @@ -35,9 +35,9 @@ Termoregolatori true - + - + false 4 false @@ -47,9 +47,9 @@ Portellone frontale true - + - + true 5 false @@ -59,7 +59,7 @@ Pausa ciclo true - + true @@ -71,9 +71,10 @@ Parcheggio macchina true + true - + true 7 false @@ -83,9 +84,23 @@ Riflettori true - + true + - + + true + 7 + false + 8 + + Heaters Back + Riscaldi indietro + + true + true + + + true 1 false @@ -95,7 +110,7 @@ Pompe vuoto true - + true @@ -155,7 +170,6 @@ Extra 10s riscaldo superiore true - true @@ -168,7 +182,6 @@ Extra 10s riscaldo inferiore true - true @@ -404,7 +417,7 @@ - true + false 7 false 35 @@ -451,22 +464,22 @@ - + + + \ No newline at end of file diff --git a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs index 7bbcfc07..4390baee 100644 --- a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs @@ -20,6 +20,7 @@ namespace Thermo.Active.Model.DTOModels public bool Visible { get; set; } public bool Starred { get; set; } = false; public bool Value { get; set; } + public bool OperatorConfirmationNeeded { get; set; } public string RefCallParam { get; set; } = ""; public string RefCallLabel { get; set; } = ""; @@ -36,6 +37,8 @@ namespace Thermo.Active.Model.DTOModels return false; if (Value != item.Value) return false; + if (OperatorConfirmationNeeded != item.OperatorConfirmationNeeded) + return false; if (RefCallParam != item.RefCallParam) return false; if (RefCallLabel != item.RefCallLabel) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 6a88155b..37974ba2 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1015,6 +1015,7 @@ namespace Thermo.Active.NC Starred = softKey.IsStarred, RefCallParam = softKey.RefCallParam, RefCallLabel = softKey.RefCallLabel, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Category = softKey.Category, Value = plcSoftKey.Value }); @@ -1024,6 +1025,7 @@ namespace Thermo.Active.NC { Id = softKey.Id, Category = softKey.Category, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Visible = softKey.IsVisible }); } @@ -1038,6 +1040,7 @@ namespace Thermo.Active.NC Starred = softKey.IsStarred, RefCallParam = softKey.RefCallParam, RefCallLabel = softKey.RefCallLabel, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Category = softKey.Category, Visible = softKey.IsVisible, Value = plcSoftKey.Value @@ -1079,6 +1082,7 @@ namespace Thermo.Active.NC Starred = softKey.IsStarred, RefCallParam = softKey.RefCallParam, RefCallLabel = softKey.RefCallLabel, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Category = softKey.Category, Value = plcSoftKey.Value }); @@ -1091,6 +1095,7 @@ namespace Thermo.Active.NC { Id = softKey.Id, Category = softKey.Category, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Visible = softKey.IsVisible }); } @@ -1108,6 +1113,7 @@ namespace Thermo.Active.NC Starred = softKey.IsStarred, RefCallParam = softKey.RefCallParam, RefCallLabel = softKey.RefCallLabel, + OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, Category = softKey.Category, Visible = softKey.IsVisible, Value = plcSoftKey.Value diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 749f8345..b4de4cb4 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.10.53")] \ No newline at end of file +[assembly: AssemblyVersion("0.10.54")] \ No newline at end of file