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 00000000..02536c84 Binary files /dev/null and b/Common/LaaProduction/LaaProduction_SigningKey.snk differ diff --git a/Common/Service/MeterProcessState/LaaProduction_SigningKey.snk b/Common/Service/MeterProcessState/LaaProduction_SigningKey.snk new file mode 100644 index 00000000..6758a684 Binary files /dev/null and b/Common/Service/MeterProcessState/LaaProduction_SigningKey.snk differ 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}");