CUST: - FwUpdateBuilder: - English only, - checked password container error to deny built of FW-Update safe
This commit is contained in:
@@ -153,12 +153,8 @@ namespace Xylem.Common.CommonCore.Configuration
|
||||
private const String DefaultCordonelFwInfoUrl =
|
||||
"http://sla12iis01.emea.sensus.net/MeterProcessState/api/FileUpToDate/GetCordonelFw";
|
||||
|
||||
//TODO THW change to server version
|
||||
private const String DefaultDbDataAtEolServiceUrl =
|
||||
"http://localhost:56011/api/fwupdate/databaseateol/";
|
||||
|
||||
//private const String DefaultDbDataAtEolServiceUrl =
|
||||
// "http://sla12iis01.emea.sensus.net/MeterProcessState/api/fwupdate/databaseateol/";
|
||||
"http://sla12iis01.emea.sensus.net/MeterProcessState/api/fwupdate/databaseateol/";
|
||||
|
||||
//private const String DefaultGenesisGetOrderNumberServiceUrl =
|
||||
// "http://localhost:56011/api/Password/ordernumber?PcbId=";
|
||||
|
||||
@@ -391,8 +391,7 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb
|
||||
catch (Exception ex)
|
||||
{
|
||||
DbIsConnected = false;
|
||||
throw new ApplicationException(ex.Message);
|
||||
//return false;
|
||||
throw new ApplicationException(ex.Message + $" PcbId: {pcbId}");
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
@@ -995,6 +995,9 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
/// <remarks date="2022-Nov-29" author="Thomas Wiedebusch">
|
||||
/// - Removed FUpdateRuler, all data are going to be taken from DB.
|
||||
/// </remarks>
|
||||
/// <remarks date="2024-May-08" author="Thomas Wiedebusch">
|
||||
/// - Culture info fixed to english.
|
||||
/// </remarks>
|
||||
public FrmFwUpdateBuilder()
|
||||
{
|
||||
_cultureInfo = Thread.CurrentThread.CurrentCulture;
|
||||
@@ -1035,12 +1038,14 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
_logger.Info(StrSeparator);
|
||||
|
||||
InitializeComponent();
|
||||
|
||||
|
||||
if (_cultureInfo.IetfLanguageTag.Contains("de-"))
|
||||
radioBtnGermanLanguage.Checked = true;
|
||||
else
|
||||
radioBtnEnglishLanguage.Checked = true;
|
||||
|
||||
RadioBtnEnglishLanguage_Click(this, null);
|
||||
|
||||
lblFwUpdateInfo.Text = $@"Version: {_version.Major}.{_version.Minor}.{_version.Build}";
|
||||
|
||||
lblStatusDbConnect.ForeColor = ColorDefault;
|
||||
@@ -1329,8 +1334,11 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
return false;
|
||||
}
|
||||
|
||||
// deny generation of FW update safe as some information couldn't be loaded
|
||||
if (_fwUpdateCapability.All(x => x.ReleaseContainerLoaded == false) ||
|
||||
_fwUpdateCapability.Any(x => x.RecoveryNotNeededOrLoaded == false))
|
||||
_fwUpdateCapability.Any(x => x.RecoveryNotNeededOrLoaded == false) ||
|
||||
_fwUpdateCapability.Any(x => x.PowerCorrectionNotNeededOrLoaded == false) ||
|
||||
_fwUpdateCapability.Any(x => x.PasswordContainerLoaded == false) )
|
||||
{
|
||||
_processState = ProcessState.Error;
|
||||
return false;
|
||||
@@ -1443,7 +1451,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
// load a recovery file
|
||||
fwUpdateCapability.RecoveryNotNeededOrLoaded = GetRecoveryRegistersFromDb(cordonelDeviceInfo);
|
||||
|
||||
// load a power correction infos;
|
||||
// load power correction infos;
|
||||
// Installed FW version has to be known in advance and
|
||||
// FW package has to be loaded in advance to check for installed versus required FW version as this is the base
|
||||
// for the decision of needed power correction.
|
||||
@@ -1460,6 +1468,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
else
|
||||
{
|
||||
cordonelDeviceInfo.PowerCorrectionValues = null;
|
||||
fwUpdateCapability.PowerCorrectionNotNeededOrLoaded = true;
|
||||
}
|
||||
|
||||
// avoid multiple assignments with deviating information before adding the new generated object
|
||||
@@ -3486,6 +3495,9 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
/// <remarks date="2023-Oct-08" author="Thomas Wiedebusch">
|
||||
/// - Selector for register restore.
|
||||
/// </remarks>
|
||||
/// <remarks date="2024-May-08" author="Thomas Wiedebusch">
|
||||
/// - Add all known infos of Cordonel on selection.
|
||||
/// </remarks>
|
||||
private void gridViewPreBuildSummary_CellClick(Object sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
try
|
||||
@@ -3626,6 +3638,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
|
||||
{
|
||||
cordonelDeviceInfo.RegisterRecoveryRequired = cordonel.RegisterRecoveryRequired;
|
||||
cordonelDeviceInfo.CustomerSerialNumber = cordonel.CustomerSerialNumber;
|
||||
cordonelDeviceInfo.InstalledFwVersion = cordonel.InstalledFwVersion;
|
||||
// remove cordonel from list
|
||||
foreach (var x in _cordonelUpdateList.Where(x => x.PcbId == cordonel.PcbId))
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user