FwUpdateBuilder:

- special characters from FwUpdateSafe removed,
- customer name limited to 45 characters for FwUpdateFile.
FwUpdateSw:
- Release display soon FW-update succeeded,
- new IrDA, BaseSerialPort and TransmittProtocol from common 2.2.8.
FwUpdateLoader:
- Registration repaired if UserInformation.register does not exists.
Common:
- ReLogin skipped if already logged in,
- NA2WALARMS removed from read back of store configuration to support NA versions below 1.2.x.
This commit is contained in:
Thomas Wiedebusch
2022-07-22 09:40:10 +02:00
parent f819392e7e
commit baf39d1df0
5 changed files with 52 additions and 22 deletions
@@ -941,8 +941,12 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
/// <remarks date="2019-Jun-23" author="Thomas Wiedebusch">
/// - Initial
/// </remarks>
/// <remarks date="2022-Jul-22" author="Thomas Wiedebusch">
/// - Immediately returns if already logged in.
/// </remarks>
public Boolean ReLogin()
{
if (IsLoggedOn) return true;
return string.IsNullOrEmpty(_password) ? Login() : Login(_password);
}
@@ -970,7 +974,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
}
}
url = url + PcbId;
url += PcbId;
try
{
//use
@@ -2134,6 +2138,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
/// - Removed comparison of allConfigRegisters less than 8 because the NA version has less registers and new
/// apps will have a new register.
/// </remarks>
/// <remarks date="2022-Jul-22" author="Thomas Wiedebusch">
/// - Removed temporary NA2ALARMS readback as this has no handler in the FW.
/// </remarks>
public Boolean StoreAllConfigurations()
{
@@ -2141,11 +2148,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
a.Key.RegisterName.ToLower() == "storeconfiguration" ||
a.Key.RegisterName.ToLower() == "storecalibration");
//if (allConfigRegisters < 8)
//{
// return false;
//}
try
{
foreach (var a in _configRegister.MeterRegisterDic.Where(a =>
@@ -2174,7 +2176,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
// Wait for storing
Thread.Sleep(400);
if (a.Key.AppName == "SENSUSRADIO")
//TODO enable this for R1.2.x
if (a.Key.AppName == "SENSUSRADIO" || a.Key.AppName == "NA2WALARMS")
{
done = true;
allConfigRegisters -= 1;
@@ -2201,6 +2204,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
catch (Exception)
{
// ignored
}
return allConfigRegisters == 0;