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

Merge branch 'Dev_CUST'

Browse Source
This commit is contained in:
Thomas Wiedebusch
2024-05-21 15:32:22 +02:00
parent b5375f5c8a abbdb0555b
commit 613518b0b0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+3 -2
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