diff --git a/Common/.vs/Common/config/applicationhost.config b/Common/.vs/Common/config/applicationhost.config index 40cde372..c55a7f21 100644 --- a/Common/.vs/Common/config/applicationhost.config +++ b/Common/.vs/Common/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Common.sln.DotSettings.user b/Common/Common.sln.DotSettings.user index 5a21fbc7..6e9db1d2 100644 --- a/Common/Common.sln.DotSettings.user +++ b/Common/Common.sln.DotSettings.user @@ -30,6 +30,7 @@ True NewVersion True + C:\Users\Thomas Müller\AppData\Local\Temp\JetBrains\ReSharperPlatformVs17\vAny_ab6433f6\CoverageData\_Common.-1885154465\Snapshot\snapshot.utdcvr True @@ -45,6 +46,7 @@ <Solution /> </SessionState> + <data><HostParameters type="LocalHostParameters" /><Argument type="StandaloneArgument"><Arguments IsNull="False"></Arguments><FileName>D:\Workspace\WorkBenchV2\Main\ZeroFlowTool\bin\Debug\GenesisDisplayTool.exe</FileName><WorkingDirectory>D:\Workspace\WorkBenchV2\Main\ZeroFlowTool\bin\Debug</WorkingDirectory><Scope><ProcessFilters /></Scope></Argument><Info type="PerformanceInfo"><MeasureType>Sampling</MeasureType><MeterKind>Rdtsc</MeterKind><InjectInfo><SymbolSearch><SearchPaths /></SymbolSearch><Scope><PatternFilters /><DenyAttributeFilters /></Scope></InjectInfo></Info><CoreOptions type="CoreOptions"><CoreTempPath IsNull="False"></CoreTempPath><RemoteEndPoint IsNull="False"></RemoteEndPoint><AdditionalEnvironmentVariables /></CoreOptions><HostOptions type="HostOptions"><HostTempPath IsNull="False"></HostTempPath></HostOptions></data> <data><HostParameters type="LocalHostParameters" /><Argument type="StandaloneArgument"><Arguments IsNull="False"></Arguments><FileName IsNull="False"></FileName><WorkingDirectory IsNull="False"></WorkingDirectory><Scope><ProcessFilters /></Scope></Argument><Info type="PerformanceInfo"><MeasureType>TracingInject</MeasureType><MeterKind>Rdtsc</MeterKind><InjectInfo><SymbolSearch><SearchPaths /></SymbolSearch><Scope><PatternFilters><Item /></PatternFilters><DenyAttributeFilters /></Scope></InjectInfo></Info><CoreOptions type="CoreOptions"><CoreTempPath IsNull="False"></CoreTempPath><RemoteEndPoint IsNull="False"></RemoteEndPoint><AdditionalEnvironmentVariables /></CoreOptions><HostOptions type="HostOptions"><HostTempPath IsNull="False"></HostTempPath></HostOptions></data> <data><HostParameters type="LocalHostParameters" /><Argument type="StandaloneArgument"><Arguments IsNull="False"></Arguments><FileName IsNull="False"></FileName><WorkingDirectory IsNull="False"></WorkingDirectory><Scope><ProcessFilters /></Scope></Argument><Info type="TimelineInfo" /><CoreOptions type="CoreOptions"><CoreTempPath IsNull="False"></CoreTempPath><RemoteEndPoint IsNull="False"></RemoteEndPoint><AdditionalEnvironmentVariables /></CoreOptions><HostOptions type="HostOptions"><HostTempPath IsNull="False"></HostTempPath><ReprofileDisableReason>LaunchedByReSharperUnitTestRunner</ReprofileDisableReason></HostOptions></data> diff --git a/Common/CommonConsole/CommonConsole.csproj b/Common/CommonConsole/CommonConsole.csproj index 89e55663..35ab3d12 100644 --- a/Common/CommonConsole/CommonConsole.csproj +++ b/Common/CommonConsole/CommonConsole.csproj @@ -121,5 +121,22 @@ Stichproben + + + 8.3.0 + + + 16.1.26017.12000 + + + 4.3.2 + + + 5.0.0 + + + 3.9.74 + + \ No newline at end of file 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 ee62f15d..9389613c 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 @@ -e5e0833ba33456b07a9a7533c01344837e98dad9 +7df2ad6be70922b931820861acc675522243ee78 diff --git a/Common/LaaPackages b/Common/LaaPackages index 69bb5675..e7aa3e27 160000 --- a/Common/LaaPackages +++ b/Common/LaaPackages @@ -1 +1 @@ -Subproject commit 69bb567543b02e71b246a70e7b0aa255f4fda529 +Subproject commit e7aa3e2723a435f0a714df661dc5d86dfd45a71c diff --git a/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.csproj b/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.csproj index 2cd29499..4ce962d9 100644 --- a/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.csproj +++ b/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.csproj @@ -17,9 +17,13 @@ - + + + + + diff --git a/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.v3.ncrunchproject b/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.v3.ncrunchproject deleted file mode 100644 index cf22dfa9..00000000 --- a/Common/Production/ProductionUiCordonel.UnitTests/ProductionUiCordonel.UnitTests.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Common/Ui/GenesisToolBox/frmRegisterStore.cs b/Common/Ui/GenesisToolBox/frmRegisterStore.cs index 618c0e0e..91236de0 100644 --- a/Common/Ui/GenesisToolBox/frmRegisterStore.cs +++ b/Common/Ui/GenesisToolBox/frmRegisterStore.cs @@ -1136,270 +1136,270 @@ namespace Xylem.Common.Ui.GenesisToolBox - #region fixparameter + //#region fixparameter //register final programming - var overAllResult = new List>(); - //611.219.280 - // - var ts = DateTimeOffset.UtcNow - new DateTimeOffset(2000, 1, 1, 0, 0, 0, new TimeSpan(0)); + //var overAllResult = new List>(); + ////611.219.280 + //// + //var ts = DateTimeOffset.UtcNow - new DateTimeOffset(2000, 1, 1, 0, 0, 0, new TimeSpan(0)); - //Alarms - ////_currentGenesis.WriteRegister("SENSUSRADIO_MainAlarmMask? - ////_currentGenesis.WriteRegister("SENSUSRADIO_ExtendedAlarmMask ? - //CUSTOMER_AlarmBroadcastMask? - //CUSTOMER_AlarmEnableMask ? - //CUSTOMER_AlarmVisualAutoClearMask? - //CUSTOMER_AlarmVisualMask ? - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SealDisplay", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + ////Alarms + //////_currentGenesis.WriteRegister("SENSUSRADIO_MainAlarmMask? + //////_currentGenesis.WriteRegister("SENSUSRADIO_ExtendedAlarmMask ? + ////CUSTOMER_AlarmBroadcastMask? + ////CUSTOMER_AlarmEnableMask ? + ////CUSTOMER_AlarmVisualAutoClearMask? + ////CUSTOMER_AlarmVisualMask ? + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SealDisplay", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SYSTEM_CalendarSeconds", - Convert.ToInt32(ts.TotalSeconds), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ExcessFlowTimeThreshold", - (new Byte[] { 0x00, 0x00, 0x00, 0x05 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ExcessFlowVolumeThreshold", - (new Byte[] { 0x00, 0x00, 0x61, 0xA8 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_LeakFlowThreshold", - (new Byte[] { 0x00, 0x00, 0x01, 0x77 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_LeakTimeThreshold", - (new Byte[] { 0x00, 0x00, 0x4E, 0xC0 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_Locale", - (new Byte[] { 0x00, 0x00, 0x01, 0x60 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureHighDelay", - (new Byte[] { 0x00, 0x00, 0x02, 0x58 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureHighThreshold", - (new Byte[] { 0x00, 0x0B, 0x71, 0xB0 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureLowDelay", - (new Byte[] { 0x00, 0x00, 0x02, 0x58 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureLowThreshold", - (new Byte[] { 0x00, 0x00, 0x75, 0x30 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ReverseFlowTimeThreshold", - (new Byte[] { 0x00, 0x00, 0x00, 0x78 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureHighDelay", - (new Byte[] { 0x00, 0x00, 0x01, 0x2C }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureHighThreshold", - (new Byte[] { 0x00, 0x00, 0x01, 0xF4 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureLowDelay", - (new Byte[] { 0x00, 0x00, 0x01, 0x2C }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureLowThreshold", - (new Byte[] { 0x00, 0x00, 0x00, 0x14 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ArrowThreshold", - (new Byte[] { 0x00, 0x1E, 0x84, 0x80 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_DisplayPow10", - (new Byte[] { 0x00, 0x00, 0x00, 0xFD }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_DisplayUnits", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ForwardArrow", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_HardErrorLimit", - (new Byte[] { 0x00, 0x00, 0x00, 0x04 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LedMode", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowMaxPeriod", (new Byte[] { 0x00, 0x00, 0x00, 0x3C }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowMaxPeriod", 60 << 16, true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SYSTEM_CalendarSeconds", + // Convert.ToInt32(ts.TotalSeconds), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ExcessFlowTimeThreshold", + // (new Byte[] { 0x00, 0x00, 0x00, 0x05 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ExcessFlowVolumeThreshold", + // (new Byte[] { 0x00, 0x00, 0x61, 0xA8 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_LeakFlowThreshold", + // (new Byte[] { 0x00, 0x00, 0x01, 0x77 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_LeakTimeThreshold", + // (new Byte[] { 0x00, 0x00, 0x4E, 0xC0 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_Locale", + // (new Byte[] { 0x00, 0x00, 0x01, 0x60 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureHighDelay", + // (new Byte[] { 0x00, 0x00, 0x02, 0x58 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureHighThreshold", + // (new Byte[] { 0x00, 0x0B, 0x71, 0xB0 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureLowDelay", + // (new Byte[] { 0x00, 0x00, 0x02, 0x58 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_PressureLowThreshold", + // (new Byte[] { 0x00, 0x00, 0x75, 0x30 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_ReverseFlowTimeThreshold", + // (new Byte[] { 0x00, 0x00, 0x00, 0x78 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureHighDelay", + // (new Byte[] { 0x00, 0x00, 0x01, 0x2C }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureHighThreshold", + // (new Byte[] { 0x00, 0x00, 0x01, 0xF4 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureLowDelay", + // (new Byte[] { 0x00, 0x00, 0x01, 0x2C }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_TemperatureLowThreshold", + // (new Byte[] { 0x00, 0x00, 0x00, 0x14 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ArrowThreshold", + // (new Byte[] { 0x00, 0x1E, 0x84, 0x80 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_DisplayPow10", + // (new Byte[] { 0x00, 0x00, 0x00, 0xFD }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_DisplayUnits", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ForwardArrow", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_HardErrorLimit", + // (new Byte[] { 0x00, 0x00, 0x00, 0x04 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LedMode", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + ////overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowMaxPeriod", (new Byte[] { 0x00, 0x00, 0x00, 0x3C }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowMaxPeriod", 60 << 16, true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowThreshold", - (new Byte[] { 0x00, 0x00, 0x00, 0xC8 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_MeterSize", - (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_PipeFillingDelay", - (new Byte[] { 0x00, 0x00, 0x00, 0x1E }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ResetAccumulators", - (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, false)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SampleRate", - (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_LowFlowThreshold", + // (new Byte[] { 0x00, 0x00, 0x00, 0xC8 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_MeterSize", + // (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_PipeFillingDelay", + // (new Byte[] { 0x00, 0x00, 0x00, 0x1E }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ResetAccumulators", + // (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, false)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SampleRate", + // (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_UpdateThreshold", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("IRDA_AdapterPresenceLimit", - (new Byte[] { 0x00, 0x00, 0x00, 0x60 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("IRDA_PulseReportRate", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_FlowPoint", - (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_FlowUnits", - (new Byte[] { 0x00, 0x00, 0x00, 0x04 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureOffset", - (new Byte[] { 0x00, 0x00, 0x03, 0xF5 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressurePresent", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureRate", - (new Byte[] { 0x00, 0x0D, 0xBB, 0xA0 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureUnits", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseLength", - (new Byte[] { 0x00, 0x00, 0x00, 0x07 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseMode", - (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseWeight", - (new Byte[] { 0x00, 0x00, 0x27, 0x10 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_TemperatureUnits", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_AverageFlowPeriod", - (new Byte[] { 0x00, 0x00, 0x00, 0x05 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_DataLogContents", - (new Byte[] { 0x08, 0x00, 0x24, 0x03 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_DataLogPeriod", - (new Byte[] { 0x00, 0x00, 0x00, 0x3C }).Reverse().ToArray(), true, false)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_FixedDateDayOfMonth", - (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_FixedDateReadingContents", - (new Byte[] { 0x08, 0x00, 0x24, 0x03 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_PeriodicLogLifeTimeCounter", - (new Byte[] { 0x00, 0x00, 0x00, 0x0 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_ResetCounter", - (new Byte[] { 0x00, 0x00, 0x00, 0x0 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("POWERMON_BatterySelection", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, false)); - overAllResult.Add(_currentGenesis_WriteRegister("POWERMON_WarnFromClamp", - (new Byte[] { 0x00, 0x01, 0x51, 0x80 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_WakeupInterval", - (new Byte[] { 0x00, 0x00, 0x00, 0x03 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_MbusState", - (new Byte[] { 0x00, 0x00, 0x00, 0x07 }).Reverse().ToArray(), true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_UtcTimeOffset", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_UpdateThreshold", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("IRDA_AdapterPresenceLimit", + // (new Byte[] { 0x00, 0x00, 0x00, 0x60 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("IRDA_PulseReportRate", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_FlowPoint", + // (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_FlowUnits", + // (new Byte[] { 0x00, 0x00, 0x00, 0x04 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureOffset", + // (new Byte[] { 0x00, 0x00, 0x03, 0xF5 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressurePresent", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureRate", + // (new Byte[] { 0x00, 0x0D, 0xBB, 0xA0 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PressureUnits", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseLength", + // (new Byte[] { 0x00, 0x00, 0x00, 0x07 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseMode", + // (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_PulseWeight", + // (new Byte[] { 0x00, 0x00, 0x27, 0x10 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("METROLOGYASST_TemperatureUnits", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_AverageFlowPeriod", + // (new Byte[] { 0x00, 0x00, 0x00, 0x05 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_DataLogContents", + // (new Byte[] { 0x08, 0x00, 0x24, 0x03 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_DataLogPeriod", + // (new Byte[] { 0x00, 0x00, 0x00, 0x3C }).Reverse().ToArray(), true, false)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_FixedDateDayOfMonth", + // (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_FixedDateReadingContents", + // (new Byte[] { 0x08, 0x00, 0x24, 0x03 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_PeriodicLogLifeTimeCounter", + // (new Byte[] { 0x00, 0x00, 0x00, 0x0 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_ResetCounter", + // (new Byte[] { 0x00, 0x00, 0x00, 0x0 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("POWERMON_BatterySelection", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, false)); + //overAllResult.Add(_currentGenesis_WriteRegister("POWERMON_WarnFromClamp", + // (new Byte[] { 0x00, 0x01, 0x51, 0x80 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_WakeupInterval", + // (new Byte[] { 0x00, 0x00, 0x00, 0x03 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_MbusState", + // (new Byte[] { 0x00, 0x00, 0x00, 0x07 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_UtcTimeOffset", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); - // just read later //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_FrequencyIndicator}).Reverse(), true, true); + //// just read later //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_FrequencyIndicator}).Reverse(), true, true); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_HistoricalAlarmsDays", - (new Byte[] { 0x00, 0x00, 0x00, 0x1D }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_HistoricalAlarmsDays", + // (new Byte[] { 0x00, 0x00, 0x00, 0x1D }).Reverse().ToArray(), true, true)); - //Original - //0x11, 0x12, 0x13, 0x14, 0x21, 0x22, 0x23, 0x24, 0x31, 0x32, 0x33, 0x34, 0x41, 0x42, 0x43, 0x44 - //Write to register - //0x14, 0x13, 0x12, 0x11, 0x24, 0x23, 0x22, 0x21, 0x34, 0x33, 0x32, 0x31, 0x44, 0x43, 0x42, 0x41 + ////Original + ////0x11, 0x12, 0x13, 0x14, 0x21, 0x22, 0x23, 0x24, 0x31, 0x32, 0x33, 0x34, 0x41, 0x42, 0x43, 0x44 + ////Write to register + ////0x14, 0x13, 0x12, 0x11, 0x24, 0x23, 0x22, 0x21, 0x34, 0x33, 0x32, 0x31, 0x44, 0x43, 0x42, 0x41 - //good one - //E6-C8-88-00-DE-B8-68-C0-D6-A8-48-80-CE-98-28-40 - //0E-05-04-04-00-14-30-68-D0-14-0E-80-40-63-93-73-22 + ////good one + ////E6-C8-88-00-DE-B8-68-C0-D6-A8-48-80-CE-98-28-40 + ////0E-05-04-04-00-14-30-68-D0-14-0E-80-40-63-93-73-22 - //&bad one - //0E-05-04-05-00-00-88-C8-E6-C0-68-B8-DE-80-48-A8-D6-40-28-98-CE + ////&bad one + ////0E-05-04-05-00-00-88-C8-E6-C0-68-B8-DE-80-48-A8-D6-40-28-98-CE - //0E-05-04-04-00-22-73-93-63-40-80-0E-14-D0-68-30-14 + ////0E-05-04-04-00-22-73-93-63-40-80-0E-14-D0-68-30-14 - var funkadresse = new List(); - funkadresse.AddRange((new Byte[] { 0xE6, 0xC8, 0x88, 0x00 }).ToArray()); - funkadresse.AddRange((new Byte[] { 0xDE, 0xB8, 0x68, 0xC0 }).ToArray()); - funkadresse.AddRange((new Byte[] { 0xD6, 0xA8, 0x48, 0x80 }).ToArray()); - funkadresse.AddRange((new Byte[] { 0xCE, 0x98, 0x28, 0x40 }).ToArray()); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_EncryptionKey", funkadresse.ToArray(), - true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_EncryptionKey", - (new Byte[] - { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }).ToArray(), true, true)); - //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_Authentification", (new Byte[] { 0x14, 0x30, 0x68, 0xD0, 0x14, 0x0E, 0x80, 0x40, 0x63, 0x93, 0x73, 0x22 }).ToArray(), true, true)); - //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_Authentification", (new Byte[] + //var funkadresse = new List(); + //funkadresse.AddRange((new Byte[] { 0xE6, 0xC8, 0x88, 0x00 }).ToArray()); + //funkadresse.AddRange((new Byte[] { 0xDE, 0xB8, 0x68, 0xC0 }).ToArray()); + //funkadresse.AddRange((new Byte[] { 0xD6, 0xA8, 0x48, 0x80 }).ToArray()); + //funkadresse.AddRange((new Byte[] { 0xCE, 0x98, 0x28, 0x40 }).ToArray()); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_EncryptionKey", funkadresse.ToArray(), + // true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_EncryptionKey", + // (new Byte[] + // { + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + // }).ToArray(), true, true)); + ////overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_Authentification", (new Byte[] { 0x14, 0x30, 0x68, 0xD0, 0x14, 0x0E, 0x80, 0x40, 0x63, 0x93, 0x73, 0x22 }).ToArray(), true, true)); + ////overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_Authentification", (new Byte[] + ////{ + //// 0xD0,0x68 , 0x30 ,0x14, + //// 0x40,0x80, 0x0E ,0x14, + //// 0x22, 0x73, 0x93,0x63 + ////}).ToArray(), true, true)); + //////E6C88800DEB868C0D6A84880CE982840 + + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_CustomerText", + // (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + + //using (var dataacces = + // new SqlDataAccess( + // "Data Source=SLASQL01;;Initial Catalog=Auftrag;Persist Security Info=False;User ID=GenesisPasswordService;Password=PcbID;") + //) //{ - // 0xD0,0x68 , 0x30 ,0x14, - // 0x40,0x80, 0x0E ,0x14, - // 0x22, 0x73, 0x93,0x63 - //}).ToArray(), true, true)); - ////E6C88800DEB868C0D6A84880CE982840 - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_CustomerText", - (new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, true)); + // var sb = new StringBuilder(); + // sb.AppendLine( + // $" SELECT distinct [MapPcbIdToSerialNumber_SerialNumber],Adresse,FunkschluesselIndex,SENSUSRADIO_PowerLevel, SENSUSRADIO_PowerLevelOption, SENSUSRADIO_ImpedanceCodeNew,SENSUSRADIO_ImpedanceCodeOption "); + // sb.AppendLine($" FROM [Auftrag].[dbo].[MapPcbIdToSerialNumber] pcb "); + // sb.AppendLine( + // $" inner join tmpRadioConfig radio on radio.pcbID = pcb.MapPcbIdToSerialNumber_PcbId"); + // sb.AppendLine( + // $" inner join Genesis_Meter meter on meter.Seriennummer = pcb.MapPcbIdToSerialNumber_SerialNumber"); + // sb.AppendLine($" where [MapPcbIdToSerialNumber_PcbId] = '{_currentGenesis.GetPcbId()}'"); - using (var dataacces = - new SqlDataAccess( - "Data Source=SLASQL01;;Initial Catalog=Auftrag;Persist Security Info=False;User ID=GenesisPasswordService;Password=PcbID;") - ) - { + // var MapData = dataacces.ExecuteQuery(sb.ToString()); + // if (MapData.Rows.Count != 1) + // { + // MessageBox.Show("Faild to get order data"); + // return; + // } - var sb = new StringBuilder(); - sb.AppendLine( - $" SELECT distinct [MapPcbIdToSerialNumber_SerialNumber],Adresse,FunkschluesselIndex,SENSUSRADIO_PowerLevel, SENSUSRADIO_PowerLevelOption, SENSUSRADIO_ImpedanceCodeNew,SENSUSRADIO_ImpedanceCodeOption "); - sb.AppendLine($" FROM [Auftrag].[dbo].[MapPcbIdToSerialNumber] pcb "); - sb.AppendLine( - $" inner join tmpRadioConfig radio on radio.pcbID = pcb.MapPcbIdToSerialNumber_PcbId"); - sb.AppendLine( - $" inner join Genesis_Meter meter on meter.Seriennummer = pcb.MapPcbIdToSerialNumber_SerialNumber"); - sb.AppendLine($" where [MapPcbIdToSerialNumber_PcbId] = '{_currentGenesis.GetPcbId()}'"); - - var MapData = dataacces.ExecuteQuery(sb.ToString()); - if (MapData.Rows.Count != 1) - { - MessageBox.Show("Faild to get order data"); - return; - } - - var SENSUSRADIO_RadioAddress = Convert.ToUInt32((Int64)MapData.Rows[0]["Adresse"] - 10000000000); - var SENSUSRADIO_PowerLevel = Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_PowerLevel"]); - var SENSUSRADIO_PowerLevelOption = - Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_PowerLevelOption"]); - var SENSUSRADIO_ImpedanceCodeNew = - Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_ImpedanceCodeNew"]); - var SENSUSRADIO_ImpedanceCodeOption = - Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_ImpedanceCodeOption"]); + // var SENSUSRADIO_RadioAddress = Convert.ToUInt32((Int64)MapData.Rows[0]["Adresse"] - 10000000000); + // var SENSUSRADIO_PowerLevel = Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_PowerLevel"]); + // var SENSUSRADIO_PowerLevelOption = + // Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_PowerLevelOption"]); + // var SENSUSRADIO_ImpedanceCodeNew = + // Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_ImpedanceCodeNew"]); + // var SENSUSRADIO_ImpedanceCodeOption = + // Convert.ToUInt32(MapData.Rows[0]["SENSUSRADIO_ImpedanceCodeOption"]); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_RadioAddress", - SENSUSRADIO_RadioAddress, true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_PowerLevel", SENSUSRADIO_PowerLevel, - true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_PowerLevelOption", - SENSUSRADIO_PowerLevelOption, true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_ImpedanceCodeNew", - SENSUSRADIO_ImpedanceCodeNew, true, true)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_ImpedanceCodeOption", - SENSUSRADIO_ImpedanceCodeOption, true, true)); + // overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_RadioAddress", + // SENSUSRADIO_RadioAddress, true, true)); + // overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_PowerLevel", SENSUSRADIO_PowerLevel, + // true, true)); + // overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_PowerLevelOption", + // SENSUSRADIO_PowerLevelOption, true, true)); + // overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_ImpedanceCodeNew", + // SENSUSRADIO_ImpedanceCodeNew, true, true)); + // overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_ImpedanceCodeOption", + // SENSUSRADIO_ImpedanceCodeOption, true, true)); - } + //} - //MapData.Rows[0]["Adresse"] + ////MapData.Rows[0]["Adresse"] - overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SealDisplay", - (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SealDisplay", + // (new Byte[] { 0x00, 0x00, 0x00, 0x01 }).Reverse().ToArray(), true, true)); - //radio end state! - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_SystemState", - (new Byte[] { 0x00, 0x00, 0x00, 0xFF }).Reverse().ToArray(), true, false)); + ////radio end state! + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_SystemState", + // (new Byte[] { 0x00, 0x00, 0x00, 0xFF }).Reverse().ToArray(), true, false)); - overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_SystemState", - (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); + //overAllResult.Add(_currentGenesis_WriteRegister("SENSUSRADIO_SystemState", + // (new Byte[] { 0x00, 0x00, 0x00, 0x02 }).Reverse().ToArray(), true, true)); - var sbR = new StringBuilder(); - if (overAllResult.Any(a => a.Item2 == false)) - { - - foreach (var failedIndex in overAllResult) - { - if (!failedIndex.Item2) - { - sbR.AppendLine($"Register={failedIndex.Item1} failed"); - } - - } - } - else - { - sbR.AppendLine($"done without errors"); - } - - _currentGenesis.Logout(); - MessageBox.Show("Result:" + sbR.ToString()); - - #endregion - - //radio - //storeconfig _all - //log out - //using (var dataacces = new SqlDataAccess(GlobalConfig.connectionString.Value)) + //var sbR = new StringBuilder(); + //if (overAllResult.Any(a => a.Item2 == false)) //{ + // foreach (var failedIndex in overAllResult) + // { + // if (!failedIndex.Item2) + // { + // sbR.AppendLine($"Register={failedIndex.Item1} failed"); + // } + + // } + //} + //else + //{ + // sbR.AppendLine($"done without errors"); + //} + + //_currentGenesis.Logout(); + //MessageBox.Show("Result:" + sbR.ToString()); + + //#endregion + + ////radio + ////storeconfig _all + ////log out + ////using (var dataacces = new SqlDataAccess(GlobalConfig.connectionString.Value)) + ////{ + @@ -2226,7 +2226,7 @@ namespace Xylem.Common.Ui.GenesisToolBox } } - public static Boolean GetCalibrationResultsFromDbperRun(int RunId, CalibrationResults calibResults, + public static Boolean GetCalibrationResultsFromDbperRun(String RunId, CalibrationResults calibResults, out String errorMsg) { errorMsg = "";