marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access fields to upper case

Browse Source
This commit is contained in:
Stoyan Zlatev 2023-09-01 09:43:49 +02:00
parent 539ed9e3ed
commit e1524efc87
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
View File

@ -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;
}

6
Common/Hardware/WaterMeter/Genesis/GenesisCore/RegisterRestorer.cs
View File

@ -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());
}

10
Common/Hardware/WaterMeter/Genesis/Registers/Access.cs
View File

@ -8,22 +8,22 @@
/// <summary>
/// Not set, means no valid input/information
/// </summary>
NotSet,
NS,
/// <summary>
/// No Access
/// </summary>
Na,
NA,
/// <summary>
/// read only
/// </summary>
Ro,
RO,
/// <summary>
/// Write only
/// </summary>
Wo,
WO,
/// <summary>
/// Read and Write
/// </summary>
Rw
RW
}
}

2
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs
View File

@ -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())
{

18
Common/Tools/Tools.JsonToXlsHelper/Program.cs
View File

@ -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";

12
Common/Ui/GenesisToolBox/frmRegisterStore.cs
View File

@ -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());