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

CUST: - FwUpdateBuilder denies password file if production password is wrong,

Browse Source 
GTB: - LowLevelTools: - password file to logging, - avoid erasure of powcorr at [Tidy Files]
This commit is contained in:
Thomas Wiedebusch 2024-06-03 11:05:26 +02:00
parent 6c97ab1318
commit e9fd8152d8
6 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/.vs/config/applicationhost.config
View File

@ -155,7 +155,7 @@
</site>
<site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" />

2
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
65d75c3322f8a137c69963cfdc0cb6f1ffacf62a
1babc7d629fd8c486aff20f4990c117c2e58a68f

17
Common/Ui/GenesisToolBox/FrmLowLevelTools.cs
View File

@ -1386,8 +1386,6 @@ namespace Xylem.Common.Ui.GenesisToolBox
lblOverall.Text = msg;
lblActualProcess.Text = @"Read password file";
//var rawData = new List<Byte>();
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();

3
ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.cs
View File

@ -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;

1
ServiceFwUpdate/ServiceFwUpdate.sln
View File

@ -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

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

@ -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;
}