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

GenesisMeter: - corrected region detection of "NA"

Browse Source 
ServiceFwUpdateSw: - output of FW version in report file
This commit is contained in:
Thomas Wiedebusch
2023-08-31 11:39:55 +02:00
parent 330417b355
commit 3b60dcc25f
10 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.shared/SharedAssemblyInfo.cs
+2 -2
View File
@@ -14,5 +14,5 @@ using System.Reflection;
//[assembly: AssemblyVersion("1.2.*.0")] //[assembly: AssemblyVersion("1.2.*.0")]
[assembly: AssemblyVersion("2.6.3.*")] [assembly: AssemblyVersion("2.6.4.*")]
[assembly: AssemblyFileVersion("2.6.3.0")] [assembly: AssemblyFileVersion("2.6.4.0")]
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\drabesch_ro\Repo\lab\la_operations\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/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+4
View File
@@ -1256,6 +1256,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
Region = "EMEA"; Region = "EMEA";
RadioFrequencyMhz = RegisterConverter.ConvertTo<Int32>(radioFrequencyRaw); RadioFrequencyMhz = RegisterConverter.ConvertTo<Int32>(radioFrequencyRaw);
} }
else
{
Region = "NA";
}
} }
catch (Exception) // exception will be thrown on uninstalled SENSUSRADIO catch (Exception) // exception will be thrown on uninstalled SENSUSRADIO
{ {
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
c43c40a030005a8f189e6179faf40a6d42bfef5c bf6bb8fceb3db5a9977dadc407cf576684bf7127
Common/LaaProduction/LaaProduction.csproj
+2 -2
View File
@@ -39,7 +39,7 @@
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>LaaProduction_SigningKey.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>LaaProduction_SigningKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -64,7 +64,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="LaaProduction_SigningKey.pfx" /> <None Include="LaaProduction_SigningKey.snk" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Common/LaaProduction/LaaProduction_SigningKey.snk
BIN
View File
Binary file not shown.
Common/Service/MeterProcessState/LaaProduction_SigningKey.snk
BIN
View File
Binary file not shown.
Common/Service/MeterProcessState/MeterProcessState.csproj
+10
View File
@@ -325,6 +325,7 @@
<Content Include="Content\JSON\CordonelTestSpec.json"> <Content Include="Content\JSON\CordonelTestSpec.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="LaaProduction_SigningKey.snk" />
<None Include="Properties\PublishProfiles\a.pubxml" /> <None Include="Properties\PublishProfiles\a.pubxml" />
<Content Include="README.md" /> <Content Include="README.md" />
<None Include="Scripts\jquery-1.10.2.intellisense.js" /> <None Include="Scripts\jquery-1.10.2.intellisense.js" />
@@ -477,6 +478,15 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<DelaySign>false</DelaySign>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>LaaProduction_SigningKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
65d75c3322f8a137c69963cfdc0cb6f1ffacf62a 247396738e2c5d26ac00f9df05c0cc5c61d7f33a
ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+4
View File
@@ -1779,12 +1779,16 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
/// <remarks date="2023-Aug-15" author="Thomas Wiedebusch"> /// <remarks date="2023-Aug-15" author="Thomas Wiedebusch">
/// - LUT CRC and MeterSize added. /// - LUT CRC and MeterSize added.
/// </remarks> /// </remarks>
/// <remarks date="2023-Aug-31" author="Thomas Wiedebusch">
/// - FW version added.
/// </remarks>
private void LogInstalledMeterFw() private void LogInstalledMeterFw()
{ {
if (_currentGenesis == null) if (_currentGenesis == null)
return; return;
LogText(StrSeparator); LogText(StrSeparator);
LogText($"PCB ID: {_currentGenesis.PcbId}"); LogText($"PCB ID: {_currentGenesis.PcbId}");
LogText($"FW Version: {_currentGenesis.FwVersion}");
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}");