Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production
This commit is contained in:
commit
f8eafc1bc5
@ -14,4 +14,4 @@ using System.Reflection;
|
||||
//[assembly: AssemblyVersion("1.2.*.0")]
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("2.7.2.*")]
|
||||
[assembly: AssemblyVersion("2.7.3.*")]
|
||||
|
||||
@ -95,7 +95,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
|
||||
private static readonly List<String> _excludedFromCompareParameters = new List<String>
|
||||
{
|
||||
"CUSTOMER_AlarmVisualMask", // Fully hard coded, cannot be overwritten
|
||||
//"CUSTOMER_AlarmEnableMask", // Will be overwritten by SENSUSRADIO if set System state to 0xFF
|
||||
//TODO Roland removed 15-Jul-2025 "CUSTOMER_AlarmEnableMask", // Will be overwritten by SENSUSRADIO if set System state to 0xFF
|
||||
"CUSTOMER_AppArrangement", // Is read only, makes no sense to compare anything
|
||||
"SENSUSRADIO_UpgFWVersion" // After a FW-Update the FW version has changed
|
||||
};
|
||||
@ -1148,7 +1148,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
|
||||
}
|
||||
finally
|
||||
{
|
||||
var actualProcessMsg = $"{Resources.StrRegisterCompare} {strRequiredRegisterValue} ";
|
||||
var actualProcessMsg = $"{Resources.StrRegisterCompare}: {strRequiredRegisterValue} ";
|
||||
|
||||
// Avoid message if nothing to tell
|
||||
if (!string.IsNullOrEmpty(strRequiredRegisterValue))
|
||||
|
||||
@ -1 +1 @@
|
||||
b03dfbada453427a2bb1275645a5f1b525f29900
|
||||
8cb55c312de586b683d72cf58c13e2801d10e14b767777d98338d3e1473a1213
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user