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

CUST: -FwUpdateSW: - corrected if power correction values == null

Browse Source
This commit is contained in:
Thomas Wiedebusch 2024-05-21 12:36:06 +02:00
parent 8a0064aaec
commit abbdb0555b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
8fbe991b217e7692af4817ad205b768685aa5a72
bf6bb8fceb3db5a9977dadc407cf576684bf7127

5
ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
View File

@ -1456,14 +1456,15 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
// the FW update this is lost in _currentGenesis.InstalledFwVersion and overwritten by the
// new version after the FW update!
// REMIND: Update only allowed if the actual FW version is higher or equal to threshold (Update succeeded)
if ((_currentGenesis.Region == "EMEA" &&
if (_fwUpdatePowerCorrection != null &&
((_currentGenesis.Region == "EMEA" &&
_cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.EmeaFwThresholdForPowCorr &&
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr &&
_currentGenesis.InstalledFwVersion >= PowCorrConst.EmeaFwThresholdForPowCorr) ||
(_currentGenesis.Region == "NA" &&
_cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.NaFNaFwThresholdForPowCorr &&
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr &&
_currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr))
_currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr)))
{
// CASE 2.1: Missing power correction settings from FW update package
// preset meter power correction file