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

CUST: - extended report logging on FwUpdateSw

Browse Source
This commit is contained in:
Thomas Wiedebusch
2023-08-15 14:24:26 +02:00
parent bdb04b61f3
commit e43a06f94a
18 changed files with 92 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site> </site>
<site name="MeterProcessState" id="2"> <site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" /> <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" /> <binding protocol="http" bindingInformation="*:56011:localhost" />
Common/Common.sln.DotSettings.user
+1 -1
View File
@@ -28,7 +28,7 @@
<s:Boolean x:Key="/Default/Environment/ExcludedFiles/FilesAndFoldersToSkip/=1057AD21_002DBA22_002D4CAB_002DB3FE_002D88C5C9980E6A_002Fd_003AScripts_002Ff_003Ajquery_002D1_002E10_002E2_002Eintellisense_002Ejs/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/ExcludedFiles/FilesAndFoldersToSkip/=1057AD21_002DBA22_002D4CAB_002DB3FE_002D88C5C9980E6A_002Fd_003AScripts_002Ff_003Ajquery_002D1_002E10_002E2_002Eintellisense_002Ejs/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">NewVersion</s:String> <s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">NewVersion</s:String>
<s:Boolean x:Key="/Default/Environment/Hierarchy/EntityFrameworkOptions/IsAlreadyNotifiedAboutEntityFramework/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/Hierarchy/EntityFrameworkOptions/IsAlreadyNotifiedAboutEntityFramework/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Thomas\AppData\Local\Temp\JetBrains\ReSharperPlatformVs15\vAny_33007af5\CoverageData\_Common.-1885154465\Snapshot\snapshot.utdcvr</s:String>
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+30 -24
View File
@@ -1,6 +1,5 @@
using Logic.ProductionToProductMapper.Cordonel; using Logic.ProductionToProductMapper.Cordonel;
using Newtonsoft.Json; using Newtonsoft.Json;
using NLog;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
@@ -13,6 +12,7 @@ using System.Security.Authentication;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using NLog;
using Xylem.Common.CommonCore.Configuration; using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.CommonCore.Consts; using Xylem.Common.CommonCore.Consts;
using Xylem.Common.CommonCore.ThreadWatcher; using Xylem.Common.CommonCore.ThreadWatcher;
@@ -314,9 +314,12 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
{ {
var baseFile = JsonConvert.DeserializeObject<BaseFile>(str); var baseFile = JsonConvert.DeserializeObject<BaseFile>(str);
_logger.Trace($"Slot:{Slot} - Updated register definitions File"); _logger.Trace($"Slot:{Slot} - Updated register definitions File");
File.WriteAllText(configFilePath, baseFile.FileContent); if (baseFile != null)
if (baseFile.UploadDate != null) {
File.SetCreationTime(configFilePath, baseFile.UploadDate.Value.UtcDateTime); File.WriteAllText(configFilePath, baseFile.FileContent);
if (baseFile.UploadDate != null)
File.SetCreationTime(configFilePath, baseFile.UploadDate.Value.UtcDateTime);
}
} }
else else
{ {
@@ -431,7 +434,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
/// </summary> /// </summary>
private ErrorState _myErrorState; private ErrorState _myErrorState;
/// <inheritdoc />
/// fires up /// fires up
/// <see cref="OnErrorStatusChanged" /> /// <see cref="OnErrorStatusChanged" />
public ErrorState ErrorStatus public ErrorState ErrorStatus
@@ -509,25 +511,28 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
var tr = new StreamReader(configFile); var tr = new StreamReader(configFile);
var slotConfigList = JsonConvert.DeserializeObject<SlotConfig[]>(tr.ReadToEnd()); var slotConfigList = JsonConvert.DeserializeObject<SlotConfig[]>(tr.ReadToEnd());
var slotConfig = slotConfigList.FirstOrDefault(t => t.Slot == slot); if (slotConfigList != null)
{
var slotConfig = slotConfigList.FirstOrDefault(t => t.Slot == slot);
if (slotConfig == null) if (slotConfig == null)
{ {
throw new ApplicationException($"Slot:{slot} - File " + throw new ApplicationException($"Slot:{slot} - File " +
$"{ProgramConfig.SerialConfigFileName} does not contain valid configuration"); $"{ProgramConfig.SerialConfigFileName} does not contain valid configuration");
} }
_logger.Debug($"Slot:{slot} - Configuration loaded"); _logger.Debug($"Slot:{slot} - Configuration loaded");
if (!useRequest) if (!useRequest)
{ {
SetupGenesisMeter(slot, null, slotConfig.Streaming, ignoreCorruptedData); SetupGenesisMeter(slot, null, slotConfig.Streaming, ignoreCorruptedData);
} }
else if (!useStreaming) else if (!useStreaming)
{ {
SetupGenesisMeter(slot, slotConfig.Request, null, ignoreCorruptedData); SetupGenesisMeter(slot, slotConfig.Request, null, ignoreCorruptedData);
} }
else else
{ {
SetupGenesisMeter(slot, slotConfig.Request, slotConfig.Streaming, ignoreCorruptedData); SetupGenesisMeter(slot, slotConfig.Request, slotConfig.Streaming, ignoreCorruptedData);
}
} }
} }
@@ -1004,7 +1009,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
var listOfOfflinePasswords = JsonConvert.DeserializeObject<List<OfflinePasswordItem>>( var listOfOfflinePasswords = JsonConvert.DeserializeObject<List<OfflinePasswordItem>>(
File.ReadAllText(ProgramConfig.OfflineInfoFile)); File.ReadAllText(ProgramConfig.OfflineInfoFile));
password = listOfOfflinePasswords.First(x => x.PcbId == PcbId).Password; if (listOfOfflinePasswords != null)
password = listOfOfflinePasswords.First(x => x.PcbId == PcbId).Password;
if (!string.IsNullOrEmpty(password)) if (!string.IsNullOrEmpty(password))
{ {
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
553f6f375a0e43e8b4743939faa8ab22c68eba1c bf6bb8fceb3db5a9977dadc407cf576684bf7127
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
bb81d09c358dbeb6340341f634cb04e0dba46d0a 247396738e2c5d26ac00f9df05c0cc5c61d7f33a
Common/Utils/Logging/Logging.csproj
+1 -1
View File
@@ -176,7 +176,7 @@
<HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.5.2.2\lib\net35\NLog.dll</HintPath> <HintPath>..\..\..\ServiceFwUpdate\packages\NLog.5.2.2\lib\net35\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
ServiceFwUpdate/DllLoadTest/DllLoadTest.csproj
+2 -2
View File
@@ -36,8 +36,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
ServiceFwUpdate/DllLoadTest/packages.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
</packages> </packages>
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FwUpdateBuilder.csproj
+4 -4
View File
@@ -71,11 +71,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath> <HintPath>..\..\packages\NLog.5.2.2\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/packages.config
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="NLog" version="4.6.7" targetFramework="net472" /> <package id="NLog" version="5.2.2" targetFramework="net472" />
</packages> </packages>
ServiceFwUpdate/Ui/ServiceFwUpdateLoader/FwUpdateLoader.csproj
+4 -4
View File
@@ -71,11 +71,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath> <HintPath>..\..\packages\NLog.5.2.2\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
ServiceFwUpdate/Ui/ServiceFwUpdateLoader/packages.config
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="NLog" version="4.6.7" targetFramework="net472" /> <package id="NLog" version="5.2.2" targetFramework="net472" />
</packages> </packages>
ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+6 -1
View File
@@ -1759,7 +1759,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
} }
/// <summary> /// <summary>
/// Logging of installed meter firmware. /// Logging of installed meter firmware and meter information.
/// </summary> /// </summary>
/// <remarks date="2021-Mar-09" author="Thomas Wiedebusch"> /// <remarks date="2021-Mar-09" author="Thomas Wiedebusch">
/// - Added application list file handling as json file: One file with all new installed versions. /// - Added application list file handling as json file: One file with all new installed versions.
@@ -1770,6 +1770,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2022-Dec-05" author="Thomas Wiedebusch"> /// <remarks date="2022-Dec-05" author="Thomas Wiedebusch">
/// - Core revision data type changed from string ti int32?. /// - Core revision data type changed from string ti int32?.
/// </remarks> /// </remarks>
/// <remarks date="2023-Aug-15" author="Thomas Wiedebusch">
/// - LUT CRC and MeterSize added.
/// </remarks>
private void LogInstalledMeterFw() private void LogInstalledMeterFw()
{ {
if (_currentGenesis == null) if (_currentGenesis == null)
@@ -1779,6 +1782,8 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
LogText($"{Resources.StrMessageSystemCoreRevision} {GenesisMeter.BuildFwVersionString(_currentGenesis.CoreRevision)}"); LogText($"{Resources.StrMessageSystemCoreRevision} {GenesisMeter.BuildFwVersionString(_currentGenesis.CoreRevision)}");
LogText($"{Resources.StrMessageSystemRegion} {_currentGenesis.Region}"); LogText($"{Resources.StrMessageSystemRegion} {_currentGenesis.Region}");
LogText($"{Resources.StrMessageSystemRadio} {_currentGenesis.RadioFrequencyMhz}"); LogText($"{Resources.StrMessageSystemRadio} {_currentGenesis.RadioFrequencyMhz}");
LogText($"{Resources.StrMessageMeterSize} {_currentGenesis.MeterSize}");
LogText($"{Resources.StrMessageLutCrc} {_currentGenesis.LutCrc}");
LogText(Resources.StrMessageInstalledApp); LogText(Resources.StrMessageInstalledApp);
var appList = new List<CordonelAppVersion>(); var appList = new List<CordonelAppVersion>();
ServiceFwUpdate/Ui/ServiceFwUpdateSw/Properties/Resources.Designer.cs
Generated
+18
View File
@@ -556,6 +556,24 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Lut CRC:.
/// </summary>
internal static string StrMessageLutCrc {
get {
return ResourceManager.GetString("StrMessageLutCrc", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to MeterSize:.
/// </summary>
internal static string StrMessageMeterSize {
get {
return ResourceManager.GetString("StrMessageMeterSize", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to System Core Revision:. /// Looks up a localized string similar to System Core Revision:.
/// </summary> /// </summary>
ServiceFwUpdate/Ui/ServiceFwUpdateSw/Properties/Resources.de.resx
+6
View File
@@ -538,4 +538,10 @@
<data name="StrPulseModeTemporaryDeactivated" xml:space="preserve"> <data name="StrPulseModeTemporaryDeactivated" xml:space="preserve">
<value>Pulsmodus vorrübergehend ausgeschaltet.</value> <value>Pulsmodus vorrübergehend ausgeschaltet.</value>
</data> </data>
<data name="StrMessageLutCrc" xml:space="preserve">
<value>Lut CRC:</value>
</data>
<data name="StrMessageMeterSize" xml:space="preserve">
<value>Baugröße:</value>
</data>
</root> </root>
ServiceFwUpdate/Ui/ServiceFwUpdateSw/Properties/Resources.resx
+6
View File
@@ -538,4 +538,10 @@
<data name="StrPulseModeTemporaryDeactivated" xml:space="preserve"> <data name="StrPulseModeTemporaryDeactivated" xml:space="preserve">
<value>Pulse mode temporary deactivated.</value> <value>Pulse mode temporary deactivated.</value>
</data> </data>
<data name="StrMessageLutCrc" xml:space="preserve">
<value>Lut CRC:</value>
</data>
<data name="StrMessageMeterSize" xml:space="preserve">
<value>MeterSize:</value>
</data>
</root> </root>
ServiceFwUpdate/Ui/ServiceFwUpdateSw/ServiceFwUpdateSw.csproj
+4 -5
View File
@@ -79,12 +79,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\packages\NLog.5.2.2\lib\net46\NLog.dll</HintPath>
<HintPath>..\..\..\Common\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
ServiceFwUpdate/Ui/ServiceFwUpdateSw/packages.config
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="NLog" version="4.6.7" targetFramework="net472" /> <package id="NLog" version="5.2.2" targetFramework="net472" />
<package id="NLog.Config" version="4.6.7" targetFramework="net472" /> <package id="NLog.Config" version="4.6.7" targetFramework="net472" />
<package id="NLog.Schema" version="4.6.7" targetFramework="net472" /> <package id="NLog.Schema" version="4.6.7" targetFramework="net472" />
</packages> </packages>