From e9fd8152d81f022ba9ee7ed96b1591eaa83ba2c6 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Mon, 3 Jun 2024 11:05:26 +0200 Subject: [PATCH] CUST: - FwUpdateBuilder denies password file if production password is wrong, GTB: - LowLevelTools: - password file to logging, - avoid erasure of powcorr at [Tidy Files] --- Common/.vs/config/applicationhost.config | 2 +- ...onToXlsHelper.csproj.CoreCompileInputs.cache | 2 +- Common/Ui/GenesisToolBox/FrmLowLevelTools.cs | 17 ----------------- ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs | 3 ++- ServiceFwUpdate/ServiceFwUpdate.sln | 1 - .../ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs | 1 - 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index de10b180..883679a3 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache index 84b6b3be..550809f9 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache +++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -65d75c3322f8a137c69963cfdc0cb6f1ffacf62a +1babc7d629fd8c486aff20f4990c117c2e58a68f diff --git a/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs b/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs index 31f1cd62..76d6f6b9 100644 --- a/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs +++ b/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs @@ -1386,8 +1386,6 @@ namespace Xylem.Common.Ui.GenesisToolBox lblOverall.Text = msg; lblActualProcess.Text = @"Read password file"; - //var rawData = new List(); - Task.Factory.StartNew(() => { _currentGenesis.ReLogin(); @@ -1414,21 +1412,6 @@ namespace Xylem.Common.Ui.GenesisToolBox } }).ContinueWith(delegate { - //Invoke(new Action(() => - //{ - // if (saveConfigFile.ShowDialog() == DialogResult.OK) - // { - // var fs = new FileStream(saveConfigFile.FileName, FileMode.OpenOrCreate); - // var bw = new BinaryWriter(fs); - // foreach (var t in rawData) - // { - // bw.Write(t); - // } - - // fs.Close(); - // } - //})); - //add a blank line to separate next operation LogText(""); _currentGenesis.Logout(); diff --git a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs index ec1b7889..c814cbc8 100644 --- a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs +++ b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs @@ -343,7 +343,8 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb if (meterPwdDb.Password != meterPwdDb.Skeleton && meterPwdDb.Password != Encoding.UTF8.GetString(meterPwdDb.ListOfPasswords[MeterPwdDb.PwdLevel8Idx])) { - throw new ApplicationException("Wrong production password"); + throw new ApplicationException("Production password is neither the SkeletonKey nor the required level 8 " + + "password from password service! Password file cannot be generated!"); } DbIsConnected = true; diff --git a/ServiceFwUpdate/ServiceFwUpdate.sln b/ServiceFwUpdate/ServiceFwUpdate.sln index ef9bea2b..ea52c8f9 100644 --- a/ServiceFwUpdate/ServiceFwUpdate.sln +++ b/ServiceFwUpdate/ServiceFwUpdate.sln @@ -207,7 +207,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CUST_2.6.8", "CUST_2.6.8", ..\Releases\CUST_2.6.8\2023-11-23 Quick Reference Cordonel Service FW-Update Packet - Rev C.pdf = ..\Releases\CUST_2.6.8\2023-11-23 Quick Reference Cordonel Service FW-Update Packet - Rev C.pdf Documents\2024-05-29 Quick Reference Cordonel Service FW-Update Software - Rev E.pdf = Documents\2024-05-29 Quick Reference Cordonel Service FW-Update Software - Rev E.pdf ..\Releases\CUST_2.6.8\AAA - What You Need.txt = ..\Releases\CUST_2.6.8\AAA - What You Need.txt - ..\Releases\CUST_2.6.8\FwUpdateBuilder 2.6.8.zip = ..\Releases\CUST_2.6.8\FwUpdateBuilder 2.6.8.zip ..\Releases\CUST_2.6.8\FwUpdateLoader 2.6.8.zip = ..\Releases\CUST_2.6.8\FwUpdateLoader 2.6.8.zip ..\Releases\CUST_2.6.8\FwUpdateRelease.txt = ..\Releases\CUST_2.6.8\FwUpdateRelease.txt ..\Releases\CUST_2.6.8\PasswordsForZip.txt = ..\Releases\CUST_2.6.8\PasswordsForZip.txt diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs index cf248b61..9ee662d7 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs @@ -4696,7 +4696,6 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw // This FW version does not require a LUT file InfoProcessSuccess(lblLutFileCheck, Resources.StrLutFileNotNeeded); _processState = successExitState; - LogText(Resources.StrLutFileNotNeeded); return; }