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

Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production

Browse Source
This commit is contained in:
Roland Drabesch 2025-10-02 11:10:05 +02:00
commit 8e7fd9ec84
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Common/Hardware/WaterMeter/Genesis/MockGenesis/MockGenesis.cs
View File

@ -97,7 +97,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
/// </summary>
private const String RootMockFwPath = "MockFwExamples";
/// <summary>
/// <summary>
/// Mock object can overwrite PcbId for test purposes and set password to null to avoid
/// usage of wrong password and lock of the device trying to log in with the wrong password
/// </summary>
@ -108,6 +108,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
base.PcbId = value;
ClearPassword();
}
get => base.PcbId;
}
/// <summary>
@ -116,6 +117,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
public new String LutCrc
{
set => base.LutCrc = value;
get => base.LutCrc;
}
/// <summary>
@ -124,6 +126,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
public new String StrCoreRevision
{
set => base.StrCoreRevision = value;
get => base.StrCoreRevision;
}
/// <summary>
@ -141,6 +144,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
public new Int32? RadioFrequencyMhz
{
set => base.RadioFrequencyMhz = value;
get => base.RadioFrequencyMhz;
}
/// <summary>
@ -149,6 +153,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
public new UInt32? InstalledFwVersion
{
set => base.InstalledFwVersion = value;
get => base.InstalledFwVersion;
}
/// <summary>
@ -198,7 +203,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
/// <summary>
/// Mock object can overwrite login status for test purposes
/// </summary>
private new Boolean IsLoggedOn
public new Boolean IsLoggedOn
{
set => base.IsLoggedOn = value;
get => base.IsLoggedOn;
@ -213,7 +218,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.MockGenesis
/// Fw package path relative to solution main folder.
/// </summary>
private readonly String _mockFwPackageRootPath;
#endregion ----------------------------- Properties -----------------------------------------------------------
#region --------------------------------- Default package description file ------------------------------------

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c
Subproject commit ffa0abaa0448ba22350982cd3d3560ce1eaab42a

5
Common/Ui/GenesisToolBox/frmSetup.cs
View File

@ -53,6 +53,11 @@ namespace Xylem.Common.Ui.GenesisToolBox
"Genesis", ProgramConfig.SerialConfigFileName);
_offlinePwdPathName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"Genesis", ProgramConfig.OfflineInfoFile);
if (!File.Exists(_offlinePwdPathName))
{
_listOfOfflinePasswords.Add(new OfflinePasswordItem("", ""));
File.WriteAllText(_offlinePwdPathName, JsonConvert.SerializeObject(_listOfOfflinePasswords));
}
//build header of data table for reference by name
_slotConfigDataTable.Columns.Add(SlotString, typeof(String));
_slotConfigDataTable.Columns.Add(StreamingPortString, typeof(String));