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

CUST: - FwUpdateSw: - Wrong messages removed, - depending on register restoring final read and compare

Browse Source
This commit is contained in:
Thomas Wiedebusch
2024-06-25 17:32:14 +02:00
parent abea710d63
commit d2ab2e553d
1 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+51 -32
View File
@@ -3770,7 +3770,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
// Reset login delay as on successfully login the meter resets the retry-lock-in-delay // Reset login delay as on successfully login the meter resets the retry-lock-in-delay
_loginDelay_ms = DefaultLoginDelay_ms; _loginDelay_ms = DefaultLoginDelay_ms;
LogText(Resources.StrLoginPwdLevel8); LogText(Resources.StrLoginPwdLevel8);
InfoProcessSuccess(lblPasswordFileCheck, Resources.StrPasswordFileValid); //InfoProcessSuccess(lblPasswordFileCheck, Resources.StrPasswordFileValid);
_passwordFileIsCorrupted = false; _passwordFileIsCorrupted = false;
return StatusReturn.Okay; return StatusReturn.Okay;
} }
@@ -4075,19 +4075,12 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2020-Dec-09" author="Thomas Wiedebusch"> /// <remarks date="2020-Dec-09" author="Thomas Wiedebusch">
/// - Initial /// - Initial
/// </remarks> /// </remarks>
/// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
/// - Activity message moved to ExecReadRegister()
/// </remarks>
private void InitReadRegister() private void InitReadRegister()
{ {
SetControlsAllButtonsDisabled(); SetControlsAllButtonsDisabled();
if (_invokerProcessState == ProcessState.CompareRegisters)
{
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterCompareActive);
}
else
{
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
}
//set the process bars
SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
_registerRestorer.OnProcessUpdate += ProcessUpdate_Event; _registerRestorer.OnProcessUpdate += ProcessUpdate_Event;
} }
@@ -4104,38 +4097,50 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2023-Nov-21" author="Thomas Wiedebusch"> /// <remarks date="2023-Nov-21" author="Thomas Wiedebusch">
/// - Skip final read and compare if not updated or no recovery request. /// - Skip final read and compare if not updated or no recovery request.
/// </remarks> /// </remarks>
/// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
/// - Status unknown implemented,
/// - activity message moved from InitReadRegister()
/// </remarks>
private StatusReturn ExecReadRegister() private StatusReturn ExecReadRegister()
{ {
Boolean retVal; Boolean retVal;
switch (_invokerProcessState) switch (_invokerProcessState)
{ {
case ProcessState.InitialReadRegisters: case ProcessState.InitialReadRegisters:
SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
retVal = _registerRestorer.InitialReadRegisters(); retVal = _registerRestorer.InitialReadRegisters();
break; break;
case ProcessState.FinalReadRegisters: case ProcessState.FinalReadRegisters:
if (_afterUpdateConnect || _recoveryRegistersRequired) if (_afterUpdateConnect || _recoveryRegistersRequired)
{ {
SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
retVal = _registerRestorer.FinalReadRegisters(); retVal = _registerRestorer.FinalReadRegisters();
} }
else else
{ {
retVal = true; return StatusReturn.Unknown;
} }
break; break;
case ProcessState.CompareRegisters: case ProcessState.CompareRegisters:
if (_afterUpdateConnect || _recoveryRegistersRequired) if ( _recoveryRegistersRequired)
{ {
SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterCompareActive);
retVal = _registerRestorer.CompareRegisters(); retVal = _registerRestorer.CompareRegisters();
} }
else else
{ {
retVal = true; return StatusReturn.Unknown;
} }
break; break;
default: default:
SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
retVal = _registerRestorer.ReadRegisters(); retVal = _registerRestorer.ReadRegisters();
break; break;
} }
@@ -4166,6 +4171,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2023-Nov-21" author="Thomas Wiedebusch"> /// <remarks date="2023-Nov-21" author="Thomas Wiedebusch">
/// - Context depending message. /// - Context depending message.
/// </remarks> /// </remarks>
/// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
/// - Status unknown implemented.
/// </remarks>
private void FinalReadRegisters(StatusReturn success, IReadOnlyList<Object> exitProcessStateObjects) private void FinalReadRegisters(StatusReturn success, IReadOnlyList<Object> exitProcessStateObjects)
{ {
if (_registerRestorer != null) if (_registerRestorer != null)
@@ -4207,23 +4215,28 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
return; return;
} }
switch (_invokerProcessState) if (success == StatusReturn.Failed)
{ {
case ProcessState.InitialReadRegisters: switch (_invokerProcessState)
msg = Resources.StrRegisterReadoutFailed; {
break; case ProcessState.InitialReadRegisters:
case ProcessState.FinalReadRegisters: msg = Resources.StrRegisterReadoutFailed;
msg = Resources.StrRegisterReadoutFailed; break;
break; case ProcessState.FinalReadRegisters:
case ProcessState.CompareRegisters: msg = Resources.StrRegisterReadoutFailed;
msg = Resources.StrRegisterCompareFailed; break;
break; case ProcessState.CompareRegisters:
default: msg = Resources.StrRegisterCompareFailed;
msg = Resources.StrRegisterReadoutFailed; break;
break; default:
msg = Resources.StrRegisterReadoutFailed;
break;
}
InfoProcessFailed(lblRegisterReadout, msg);
_processState = errorExitState;
} }
InfoProcessFailed(lblRegisterReadout, msg); // Go ahead as it is nothing to do
_processState = errorExitState; _processState = successExitState;
// change first the process state, otherwise the timer may switch the bar on again // change first the process state, otherwise the timer may switch the bar on again
SetOverallProgressDisplayOff(); SetOverallProgressDisplayOff();
} }
@@ -4769,12 +4782,12 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2020-Dec-18" author="Thomas Wiedebusch"> /// <remarks date="2020-Dec-18" author="Thomas Wiedebusch">
/// - Initial /// - Initial
/// </remarks> /// </remarks>
/// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
/// - Moved process messages to ExecRegisterRecovery().
/// </remarks>
private void InitRegisterRecovery() private void InitRegisterRecovery()
{ {
SetControlsAllButtonsDisabled(); SetControlsAllButtonsDisabled();
InfoProcessActive(lblRegisterRestore, Resources.StrRegisterAccessActive);
//set the process bars
SetOverallProgressDisplayOn(Resources.StrRegisterAccessActive);
_registerRestorer.OnProcessUpdate += ProcessUpdate_Event; _registerRestorer.OnProcessUpdate += ProcessUpdate_Event;
} }
@@ -4796,6 +4809,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2023-Oct-26" author="Thomas Wiedebusch"> /// <remarks date="2023-Oct-26" author="Thomas Wiedebusch">
/// - Removed redundant marker for recovery required. /// - Removed redundant marker for recovery required.
/// </remarks> /// </remarks>
/// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
/// - Moved process messages from InitRegisterRecovery().
/// </remarks>
private StatusReturn ExecRegisterRecovery() private StatusReturn ExecRegisterRecovery()
{ {
var retVal = StatusReturn.Okay; var retVal = StatusReturn.Okay;
@@ -4808,6 +4824,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
if (device.RecoveryRegisters == null || device.RecoveryRegisters.Count == 0) if (device.RecoveryRegisters == null || device.RecoveryRegisters.Count == 0)
return StatusReturn.Okay; return StatusReturn.Okay;
InfoProcessActive(lblRegisterRestore, Resources.StrRegisterAccessActive);
//set the process bars
SetOverallProgressDisplayOn(Resources.StrRegisterAccessActive);
retVal = _registerRestorer.WriteRegisters(device.RecoveryRegisters); retVal = _registerRestorer.WriteRegisters(device.RecoveryRegisters);
break; break;
} }