From 8386c0818fc67cf6242f7b9f3084f2aa33eea2d7 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Thu, 5 Mar 2026 11:03:59 +0100 Subject: [PATCH] ProductionUiCordonel: - NA reboot counter chack skipped with warning --- Common/CommonCore/Consts/StatusReturn.cs | 7 +++++- .../FM2014/FM2014Core/FM2014.cs | 7 +++++- .../FM2014/FM2014Core/FM2014CmdResponse.cs | 2 +- .../GenericProcesses/ConnectCordonel.cs | 22 +++++++++++++++---- .../Properties/Resources.Designer.cs | 4 ++-- .../Properties/Resources.de.resx | 2 +- .../Properties/Resources.resx | 2 +- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/Common/CommonCore/Consts/StatusReturn.cs b/Common/CommonCore/Consts/StatusReturn.cs index 2949692a..4759f616 100644 --- a/Common/CommonCore/Consts/StatusReturn.cs +++ b/Common/CommonCore/Consts/StatusReturn.cs @@ -38,6 +38,11 @@ /// /// the measurement is out of range for threshold checks /// - MeasurementOutOfRange + MeasurementOutOfRange, + + /// + /// The setup value is out of range + /// + SetupOutOfRange } } \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs index 5b454007..a38cdddc 100644 --- a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs +++ b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs @@ -616,8 +616,13 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core get => _doublePulseDeadtime_ms; set { + // Fire an event if setup is OOR if (value > DOUBLE_PULSE_DEADTIME_MAX_ms) + { + return; + } + _doublePulseDeadtime_ms = value; // Calculate and set up the values 'S' and 's' needed for the FM2014 @@ -932,7 +937,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core var cmdName = CmdName.CmdSwitchDoublePulseDeadtimeOff; var actualFm2014 = CmdType.broadcast == GetCmdType(cmdName) ? BroadcastFm2014 : fm2014; - // Check if double pulse deadtime has been set or si switched off + // Check if double pulse deadtime has been set or is switched off if (DOUBLE_PULSE_DEADTIME_MIN_ms == fm2014.DoublePulseDeadtime_ms) { // This is a command without parameter diff --git a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014CmdResponse.cs b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014CmdResponse.cs index 6e2b10a9..c7f1cfbc 100644 --- a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014CmdResponse.cs +++ b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014CmdResponse.cs @@ -46,7 +46,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core public Double? DoubleValue { get; private set; } /// - /// Measurement SI unit + /// Unit of the measurement /// public String Unit { get; private set; } diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericProcesses/ConnectCordonel.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericProcesses/ConnectCordonel.cs index cdad399e..d6c9c07f 100644 --- a/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericProcesses/ConnectCordonel.cs +++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericProcesses/ConnectCordonel.cs @@ -43,6 +43,12 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Gener /// /// - Reboot counter temporary deactivated with WARNING. /// + /// + /// - Reboot counter reactivated. + /// + /// + /// - Reboot counter for NA region temporary deactivated. + /// public override StatusReturn ExecuteProcess() { Boolean retVal; @@ -79,10 +85,18 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Gener { if (rebootCount > MeterResetPsu.MAX_REBOOTS_FOR_HEALTHY_HW) { - ErrorMsgDispatcher(Resources.StrErrorMsgTooManyReboots + - $" - {Resources.StrProcessStateAllowed}: {MeterResetPsu.MAX_REBOOTS_FOR_HEALTHY_HW}" + - $" - {Resources.StrProcessStateDetected}: {rebootCount}"); - return StatusReturn.Failed; + if (Meter.Region.Equals("NA")) + { + WarningMsgDispatcher(Resources.StrWarningRebootCounterCheckSkipped + + $" - {Resources.StrProcessStateDetected}: {rebootCount}"); + } + else // EMEA + { + ErrorMsgDispatcher(Resources.StrErrorMsgTooManyReboots + + $" - {Resources.StrProcessStateAllowed}: {MeterResetPsu.MAX_REBOOTS_FOR_HEALTHY_HW}" + + $" - {Resources.StrProcessStateDetected}: {rebootCount}"); + return StatusReturn.Failed; + } } // Skip reboot counter check on reties as it passed here the initial phase as a retry may follow an diff --git a/Common/Production/ProductionUiCordonel/Properties/Resources.Designer.cs b/Common/Production/ProductionUiCordonel/Properties/Resources.Designer.cs index f410049c..31e3d977 100644 --- a/Common/Production/ProductionUiCordonel/Properties/Resources.Designer.cs +++ b/Common/Production/ProductionUiCordonel/Properties/Resources.Designer.cs @@ -2718,9 +2718,9 @@ namespace Xylem.Common.Production.ProductionUiCordonel.Properties { /// /// Looks up a localized string similar to WARNING: Reboot counter check skipped. /// - internal static string StrWarningRebbotCounterCheckSkipped { + internal static string StrWarningRebootCounterCheckSkipped { get { - return ResourceManager.GetString("StrWarningRebbotCounterCheckSkipped", resourceCulture); + return ResourceManager.GetString("StrWarningRebootCounterCheckSkipped", resourceCulture); } } } diff --git a/Common/Production/ProductionUiCordonel/Properties/Resources.de.resx b/Common/Production/ProductionUiCordonel/Properties/Resources.de.resx index 54e89ee9..771e9225 100644 --- a/Common/Production/ProductionUiCordonel/Properties/Resources.de.resx +++ b/Common/Production/ProductionUiCordonel/Properties/Resources.de.resx @@ -682,7 +682,7 @@ WARNUNG: Ergebnis muß überprüft werden! Prozeß - + WARNUNG: Hardwareneustartüberprüfung (Reboot) ausgelassen diff --git a/Common/Production/ProductionUiCordonel/Properties/Resources.resx b/Common/Production/ProductionUiCordonel/Properties/Resources.resx index 14de40f1..7c2b89a7 100644 --- a/Common/Production/ProductionUiCordonel/Properties/Resources.resx +++ b/Common/Production/ProductionUiCordonel/Properties/Resources.resx @@ -682,7 +682,7 @@ WARNING: Result needs inspection! Process - + WARNING: Reboot counter check skipped