diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs index 9a066c82..73fec26f 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs @@ -1849,7 +1849,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore RequestProtocolProcess(); //if register check by read back is not required we return the acknowledge state - if (!checkRegister || regDef.RegisterDetail.Privilege.Lvl8 == Registers.Access.Wo) + if (!checkRegister || regDef.RegisterDetail.Privilege.Lvl8 == Registers.Access.WO) { return responseRecord.Acknowledge == RequestAcknowledgeState.Ok; } diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/RegisterRestorer.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/RegisterRestorer.cs index 08da362b..10222d55 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/RegisterRestorer.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/RegisterRestorer.cs @@ -193,7 +193,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore foreach (var reg in meterRegisters.MeterRegisterDic.Where(r => r.Key.RegisterDetail?.Version.First != null && r.Key.RegisterDetail.Version.Last != null && r.Key.RestoreCapability.StaticTypeValue != null && r.Key.DataType != typeof(Rpc) && r.Key.IsAvailable && - (r.Key.RegisterDetail.Privilege.Lvl8 == Access.Rw || r.Key.RegisterDetail.Privilege.Lvl8 == Access.Ro))) + (r.Key.RegisterDetail.Privilege.Lvl8 == Access.RW || r.Key.RegisterDetail.Privilege.Lvl8 == Access.RO))) { _registersPostUpdate.MeterRegisterDic.TryAdd(reg.Key, reg.Value); // only registers which are present before the update @@ -252,7 +252,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore foreach (var reg in meterRegisters.MeterRegisterDic.Where(r => r.Key.RegisterDetail?.Version.First != null && r.Key.RegisterDetail.Version.Last != null && r.Key.RestoreCapability.StaticTypeValue != null && r.Key.DataType != typeof(Rpc) && r.Key.IsAvailable && - (r.Key.RegisterDetail.Privilege.Lvl8 == Access.Rw || r.Key.RegisterDetail.Privilege.Lvl8 == Access.Ro))) + (r.Key.RegisterDetail.Privilege.Lvl8 == Access.RW || r.Key.RegisterDetail.Privilege.Lvl8 == Access.RO))) { _registersPreUpdate.MeterRegisterDic.TryAdd(reg.Key, reg.Value); // only registers which are present before the update @@ -266,7 +266,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore // changed, only registers which are present before the update can be restored! foreach (var reg in _registersPreUpdate.MeterRegisterDic.Where(r => r.Key.RestoreCapability.CheckRestoreCapability() && - r.Key.RegisterDetail.Privilege.Lvl8 == Access.Rw)) + r.Key.RegisterDetail.Privilege.Lvl8 == Access.RW)) { _restoreRegNames.Add(reg.Key.GetIdent()); } diff --git a/Common/Hardware/WaterMeter/Genesis/Registers/Access.cs b/Common/Hardware/WaterMeter/Genesis/Registers/Access.cs index 9fa5a1d4..9d8259fb 100644 --- a/Common/Hardware/WaterMeter/Genesis/Registers/Access.cs +++ b/Common/Hardware/WaterMeter/Genesis/Registers/Access.cs @@ -8,22 +8,22 @@ /// /// Not set, means no valid input/information /// - NotSet, + NS, /// /// No Access /// - Na, + NA, /// /// read only /// - Ro, + RO, /// /// Write only /// - Wo, + WO, /// /// Read and Write /// - Rw + RW } } diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs index d474aa1c..78dacc60 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs @@ -62,7 +62,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions UserControl.lblText.Content = $"Read {dic.GetIdent()}({done1}/{total.Count})"; } )); - if (dic.RegisterName.ToLower() != "password" && dic.RegisterDetail.Privilege.Lvl8 != Access.Wo) + if (dic.RegisterName.ToLower() != "password" && dic.RegisterDetail.Privilege.Lvl8 != Access.WO) { switch (dic.GetIdent().ToLower()) { diff --git a/Common/Tools/Tools.JsonToXlsHelper/Program.cs b/Common/Tools/Tools.JsonToXlsHelper/Program.cs index fda06c0d..d76f5a38 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/Program.cs +++ b/Common/Tools/Tools.JsonToXlsHelper/Program.cs @@ -138,21 +138,21 @@ namespace Tools.JsonToXlsHelper foreach (var privilegeitem in detailValue.Children()) { - var accessValue = Access.NotSet; + var accessValue = Access.NS; switch (((JProperty)privilegeitem).Value.ToString().ToUpper()) { case "RO": - accessValue = Access.Ro; + accessValue = Access.RO; break; case "RW": - accessValue = Access.Rw; + accessValue = Access.RW; break; case "WO": - accessValue = Access.Wo; + accessValue = Access.WO; break; case "NA": - accessValue = Access.Na; + accessValue = Access.NA; break; } @@ -366,13 +366,13 @@ namespace Tools.JsonToXlsHelper { switch (a) { - case Access.Na: + case Access.NA: return "Na"; - case Access.Ro: + case Access.RO: return "Ro"; - case Access.Wo: + case Access.WO: return "Wo"; - case Access.Rw: + case Access.RW: return "Rw"; default: return "NotSet"; diff --git a/Common/Ui/GenesisToolBox/frmRegisterStore.cs b/Common/Ui/GenesisToolBox/frmRegisterStore.cs index 64bfbb3c..a87d869e 100644 --- a/Common/Ui/GenesisToolBox/frmRegisterStore.cs +++ b/Common/Ui/GenesisToolBox/frmRegisterStore.cs @@ -661,8 +661,8 @@ namespace Xylem.Common.Ui.GenesisToolBox //var regDef = _currentGenesis.GetRegisterDefinitionByName(reg); SetProgreess($"Read Register {regDef.RegisterName}", total, done + 1); if (regDef.RegisterDetail != null && ( - regDef.RegisterDetail.Privilege.Lvl8 == Access.Ro || - regDef.RegisterDetail.Privilege.Lvl8 == Access.Rw)) + regDef.RegisterDetail.Privilege.Lvl8 == Access.RO || + regDef.RegisterDetail.Privilege.Lvl8 == Access.RW)) { try { @@ -755,8 +755,8 @@ namespace Xylem.Common.Ui.GenesisToolBox { ((DataRow)rowItem)["RawValueFile"] = keyValue.value; - if (regDef.RegisterDetail.Privilege.Lvl8 == Access.Ro || - regDef.RegisterDetail.Privilege.Lvl8 == Access.Rw) + if (regDef.RegisterDetail.Privilege.Lvl8 == Access.RO || + regDef.RegisterDetail.Privilege.Lvl8 == Access.RW) { Byte[] rawRegister; if (regDef.DataType == typeof(String) || regDef.DataType == typeof(Int64) || @@ -1454,8 +1454,8 @@ namespace Xylem.Common.Ui.GenesisToolBox foreach (var VARIABLE in List) { - if ((VARIABLE.RegisterDetail.Privilege.Lvl8 == Access.Ro - || VARIABLE.RegisterDetail.Privilege.Lvl8 == Access.Rw) + if ((VARIABLE.RegisterDetail.Privilege.Lvl8 == Access.RO + || VARIABLE.RegisterDetail.Privilege.Lvl8 == Access.RW) ) { var a = _currentGenesis.ReadRegister(VARIABLE.GetIdent());