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

CUST: - FwUpdateSw: - allow power correction only after successfully updated

Browse Source
This commit is contained in:
Thomas Wiedebusch 2024-05-16 16:40:28 +02:00
parent 4f8cffb28a
commit d7725698cb
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
View File

@ -3,7 +3,7 @@
"id": 9,
"version": {
"first": 1,
"last": 158
"last": 159
},
"registers": {
"AlarmStatus0": {

4
Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFilesEraseRestore.json
View File

@ -4,16 +4,12 @@
"1\\fdrdata",
"1\\logdata",
"1\\blklist",
"1\\mettable",
"1\\pulsedbg",
"1\\upg*",
"1\\img*"
],
"Restore": [
{
"Name": "1\\tstfile",
"ByteSize": 262144,
"Pattern": null
}
]
}

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

@ -1419,7 +1419,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// </summary>
/// <param name="successExitState"></param>
/// <param name="errorExitState"></param>
/// <remarks date="2024-May-13..15" author="Thomas Wiedebusch">
/// <remarks date="2024-May-13..17" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
private void CorrectPowerOverestimation(ProcessState successExitState,
@ -1455,12 +1455,15 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
// using the preset _fwUpdatePowerCorrection.ActualFwVersion on initial connect as after
// 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" &&
_cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.EmeaFwThresholdForPowCorr &&
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr) ||
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr &&
_currentGenesis.InstalledFwVersion >= PowCorrConst.EmeaFwThresholdForPowCorr) ||
(_currentGenesis.Region == "NA" &&
_cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.NaFNaFwThresholdForPowCorr &&
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr))
_fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr &&
_currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr))
{
// CASE 2.1: Missing power correction settings from FW update package
// preset meter power correction file