From 3b60dcc25f78f8bf94937e4d9f7d877c657a38aa Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Thu, 31 Aug 2023 11:39:55 +0200 Subject: [PATCH] GenesisMeter: - corrected region detection of "NA" ServiceFwUpdateSw: - output of FW version in report file --- Common/.shared/SharedAssemblyInfo.cs | 4 ++-- Common/.vs/config/applicationhost.config | 2 +- .../Genesis/GenesisCore/GenesisMeter.cs | 4 ++++ ...rMeterRegisters.csproj.CoreCompileInputs.cache | 2 +- Common/LaaProduction/LaaProduction.csproj | 4 ++-- Common/LaaProduction/LaaProduction_SigningKey.snk | Bin 0 -> 596 bytes .../LaaProduction_SigningKey.snk | Bin 0 -> 596 bytes .../MeterProcessState/MeterProcessState.csproj | 10 ++++++++++ ...JsonToXlsHelper.csproj.CoreCompileInputs.cache | 2 +- .../Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs | 4 ++++ 10 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 Common/LaaProduction/LaaProduction_SigningKey.snk create mode 100644 Common/Service/MeterProcessState/LaaProduction_SigningKey.snk diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index 444717ff..3e8af694 100644 --- a/Common/.shared/SharedAssemblyInfo.cs +++ b/Common/.shared/SharedAssemblyInfo.cs @@ -14,5 +14,5 @@ using System.Reflection; //[assembly: AssemblyVersion("1.2.*.0")] -[assembly: AssemblyVersion("2.6.3.*")] -[assembly: AssemblyFileVersion("2.6.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.6.4.*")] +[assembly: AssemblyFileVersion("2.6.4.0")] \ No newline at end of file diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index 40cde372..1b9332b4 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs index 9a066c82..45140ea8 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs @@ -1256,6 +1256,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore Region = "EMEA"; RadioFrequencyMhz = RegisterConverter.ConvertTo(radioFrequencyRaw); } + else + { + Region = "NA"; + } } catch (Exception) // exception will be thrown on uninstalled SENSUSRADIO { diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index d110f5fc..82bc2c16 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c43c40a030005a8f189e6179faf40a6d42bfef5c +bf6bb8fceb3db5a9977dadc407cf576684bf7127 diff --git a/Common/LaaProduction/LaaProduction.csproj b/Common/LaaProduction/LaaProduction.csproj index 1a44e122..2ffde5b6 100644 --- a/Common/LaaProduction/LaaProduction.csproj +++ b/Common/LaaProduction/LaaProduction.csproj @@ -39,7 +39,7 @@ true - LaaProduction_SigningKey.pfx + LaaProduction_SigningKey.snk @@ -64,7 +64,7 @@ - + diff --git a/Common/LaaProduction/LaaProduction_SigningKey.snk b/Common/LaaProduction/LaaProduction_SigningKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..02536c845db6f6c70cf10334b7a3e92012c63fb0 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa5009621Z!nPAl3@4E*+@$O|@~C4d}en9Z~?; zPbe<${d+dj8LALSLosT676pP@ItcSriV0s4_KyuA>T1D6{01Pv)TtHzzla_AKA#fT z8_B3srGCB7DOfr7Hy-}FN^Hs3rblF(_xL`|L-=#&_M;vul)S&*kKU`_@RZ(2&Z^JP z0W!bi6}S`&8AZ{%Ow}UP2$P79U$Z5q^VdLHoMHoE@TIEFQYw0u$(!3xrEAqN*|{agZbl<>z=4GIknihkJub zTs(j6&eA1(Z1?O3-%VGKEDOfBhg#Kbcl2vvzX~Uc5L=}5nvFGh@}fcDc@54I1Yd?5 zb>Z_lkuU#7Oi*gTsn7tSHkwR$vW*^O*CApD5?f$Vz|d|7gyl}IIM<3;>iNu1P9M`r zeA@h6m|ckEw(F0H?_jg@*XLZsZ--Qjy!;GjvG(pE+Q1x^nat{C64d{cJ>|B@H{b)j z5@fI;M1XP48?ucEN2_FG?jE)__I&gs_rNNKU^~U&c7px?R>YgMX;@AwZo*ESB-*Mx z(EIcvdslYhV@|)sDD+x=p|6=z&;v*9?$VF2a# i;yFjO>QxyZT_0uI<2`Gq`!iYGwL(zGfS~k&@1L=H93o8s literal 0 HcmV?d00001 diff --git a/Common/Service/MeterProcessState/LaaProduction_SigningKey.snk b/Common/Service/MeterProcessState/LaaProduction_SigningKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..6758a68471c32c44d3bdf6c9192a0ce8f4d17007 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096!{Ri}aH;@O9g%E%q;cef1Z0`kL z^DF0Zl3X}4%Y(^KAR~Iq#V<`pt8p*}7v5L%a&p?&bogz9Cbwj4#&>0Tgz=-rhpxws zgE#B@{<+H3?0BP6;wjmvH#D-aIcrGDWZ_wj3?HTwkNLhPOKD8jF11=rjJXA`885&G z7EauqK4|&rIaDmv(#e@xrsywo#qY==wh5Y&+b2HcFvC0LzY6j4!j*$&>d1w|m6fS?`18!PFB4`KaJy!A6OaL$ zU?;|VvGq8_g`4WY;eG+$mj=>gC5gbQg*?3_k+BAypvqG!X~$t+d2s7oF#b&M;h$jC zX48{RN)?g#hBOO=>Sv6Fa))ZeT73>nc4Wd$oJ1WG_*v^dA4PvqKWT1N@7o*ji05^% zd=;v%sV6cKRsXlr7%~J1Qe2=xdC+zOXC16{(_bejISwC(p@wkL5qmiLJl7L z6|XOKUFGo_cvuM&{^VMVD?)Q+>F8TO+_V=&vVJ3{{G-yusX21In&#J3Q4G})OvWV7 i=fB@XuLq!0R$_tP<(tMv!xGA&|41}HV@3tm^CUv(3nK3T literal 0 HcmV?d00001 diff --git a/Common/Service/MeterProcessState/MeterProcessState.csproj b/Common/Service/MeterProcessState/MeterProcessState.csproj index 2a5ef8e3..5d46f90b 100644 --- a/Common/Service/MeterProcessState/MeterProcessState.csproj +++ b/Common/Service/MeterProcessState/MeterProcessState.csproj @@ -325,6 +325,7 @@ PreserveNewest + @@ -477,6 +478,15 @@ prompt MinimumRecommendedRules.ruleset + + true + + + false + + + LaaProduction_SigningKey.snk + 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..8dda2975 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 +247396738e2c5d26ac00f9df05c0cc5c61d7f33a diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs index a061aea6..ce62aaba 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs @@ -1779,12 +1779,16 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw /// /// - LUT CRC and MeterSize added. /// + /// + /// - FW version added. + /// private void LogInstalledMeterFw() { if (_currentGenesis == null) return; LogText(StrSeparator); LogText($"PCB ID: {_currentGenesis.PcbId}"); + LogText($"FW Version: {_currentGenesis.FwVersion}"); LogText($"{Resources.StrMessageSystemCoreRevision} {GenesisMeter.BuildFwVersionString(_currentGenesis.CoreRevision)}"); LogText($"{Resources.StrMessageSystemRegion} {_currentGenesis.Region}"); LogText($"{Resources.StrMessageSystemRadio} {_currentGenesis.RadioFrequencyMhz}");