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

Fix justage error

Browse Source
This commit is contained in:
Roland Drabesch 2024-05-06 15:42:40 +02:00
parent 6f9b142af6
commit b0e561d2f9
32 changed files with 3002 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/.vs/config/applicationhost.config
View File

@ -155,7 +155,7 @@
</site>
<site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" />

67
Common/Common.sln
View File

@ -203,6 +203,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StreamingProtocol", "Hardwa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Omni.Data", "Omni.Data\Omni.Data.csproj", "{C0D3BDDE-324A-487D-B3B1-1AF6904F8BA1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CordoPlot", "CordoPlot\CordoPlot.csproj", "{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
@ -4717,6 +4719,70 @@ Global
{C0D3BDDE-324A-487D-B3B1-1AF6904F8BA1}.XP32bit|x64.Build.0 = Release|Any CPU
{C0D3BDDE-324A-487D-B3B1-1AF6904F8BA1}.XP32bit|x86.ActiveCfg = Release|Any CPU
{C0D3BDDE-324A-487D-B3B1-1AF6904F8BA1}.XP32bit|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.COM|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|x64.Build.0 = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|x86.ActiveCfg = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Debug|x86.Build.0 = Debug|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.PerformTest|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.Release|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.ReleaseTest|x86.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|Any CPU.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|x64.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|x64.Build.0 = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|x86.ActiveCfg = Release|Any CPU
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}.XP32bit|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -4808,6 +4874,7 @@ Global
{C2808A8E-C0BA-44EC-B7B1-1C66AD3D8478} = {43B54F41-6F09-4BCB-9F82-77621275831B}
{B6A19B80-0F0F-434C-A754-A7712FC208B2} = {43B54F41-6F09-4BCB-9F82-77621275831B}
{C0D3BDDE-324A-487D-B3B1-1AF6904F8BA1} = {68323534-4337-4E3A-89BC-11D8BB55343A}
{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D} = {03D4F23E-7E4A-4091-BC96-036C996D351A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}

4
Common/CommonConsole/CommonConsole.csproj
View File

@ -57,6 +57,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CordonelPreadjustmentUi\CordonelPreadjustmentUi.csproj">
<Project>{D0C8D887-ED52-40AB-A069-90BCE0E801E2}</Project>
<Name>CordonelPreadjustmentUi</Name>
</ProjectReference>
<ProjectReference Include="..\OmniPlus\ExchangeHub\ExchangeHub.csproj">
<Project>{6033FF0C-CF32-4BC5-8EFE-4774CCDC663D}</Project>
<Name>ExchangeHub</Name>

2037
Common/CommonConsole/Program.cs
View File

File diff suppressed because it is too large Load Diff

6
Common/CordoPlot/App.config Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>

9
Common/CordoPlot/App.xaml Normal file
View File

@ -0,0 +1,9 @@
<Application x:Class="CordoPlot.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:CordoPlot"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>

17
Common/CordoPlot/App.xaml.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace CordoPlot
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}

177
Common/CordoPlot/CordoPlot.csproj Normal file
View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FD9EAB89-D2E5-4006-8E4F-7EF7A010749D}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>CordoPlot</RootNamespace>
<AssemblyName>CordoPlot</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GLWpfControl, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.GLWpfControl.3.3.0\lib\net452\GLWpfControl.dll</HintPath>
</Reference>
<Reference Include="OpenTK, Version=3.3.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.3.3.1\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="ScottPlot, Version=5.0.32.0, Culture=neutral, PublicKeyToken=86698dc10387c39e, processorArchitecture=MSIL">
<HintPath>..\packages\ScottPlot.5.0.32\lib\net462\ScottPlot.dll</HintPath>
</Reference>
<Reference Include="ScottPlot.WPF, Version=5.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ScottPlot.WPF.5.0.32\lib\net462\ScottPlot.WPF.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp, Version=2.88.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.2.88.8\lib\net462\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.Desktop.Common, Version=2.88.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.Views.Desktop.Common.2.88.8\lib\net462\SkiaSharp.Views.Desktop.Common.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.WPF, Version=2.88.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.Views.WPF.2.88.8\lib\net462\SkiaSharp.Views.WPF.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="OpenTK.dll.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CommonCore\CommonCore.csproj">
<Project>{1B02C79E-0B19-43E2-8F6B-71EF0C786C97}</Project>
<Name>CommonCore</Name>
</ProjectReference>
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\DataPackages\DataPackages.csproj">
<Project>{0E524D43-7B66-45CD-AA74-41D51AFC3D99}</Project>
<Name>DataPackages</Name>
</ProjectReference>
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\Protocols\StreamingProtocol\StreamingProtocol.csproj">
<Project>{29617814-313E-409E-AA5D-59C78A9D4DF1}</Project>
<Name>StreamingProtocol</Name>
</ProjectReference>
<ProjectReference Include="..\Metrology\Measurements\Measurements.csproj">
<Project>{6CCDB656-C676-4360-BABA-C4596AAD175D}</Project>
<Name>Measurements</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.NativeAssets.macOS.2.88.8\build\net462\SkiaSharp.NativeAssets.macOS.targets" Condition="Exists('..\packages\SkiaSharp.NativeAssets.macOS.2.88.8\build\net462\SkiaSharp.NativeAssets.macOS.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SkiaSharp.NativeAssets.macOS.2.88.8\build\net462\SkiaSharp.NativeAssets.macOS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.NativeAssets.macOS.2.88.8\build\net462\SkiaSharp.NativeAssets.macOS.targets'))" />
<Error Condition="!Exists('..\packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets'))" />
<Error Condition="!Exists('..\packages\SkiaSharp.NativeAssets.Linux.NoDependencies.2.88.8\build\net462\SkiaSharp.NativeAssets.Linux.NoDependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.NativeAssets.Linux.NoDependencies.2.88.8\build\net462\SkiaSharp.NativeAssets.Linux.NoDependencies.targets'))" />
</Target>
<Import Project="..\packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets" Condition="Exists('..\packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets')" />
<Import Project="..\packages\SkiaSharp.NativeAssets.Linux.NoDependencies.2.88.8\build\net462\SkiaSharp.NativeAssets.Linux.NoDependencies.targets" Condition="Exists('..\packages\SkiaSharp.NativeAssets.Linux.NoDependencies.2.88.8\build\net462\SkiaSharp.NativeAssets.Linux.NoDependencies.targets')" />
</Project>

29
Common/CordoPlot/MainWindow.xaml Normal file
View File

@ -0,0 +1,29 @@
<Window x:Class="CordoPlot.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
xmlns:local="clr-namespace:CordoPlot"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="10*" />
<ColumnDefinition Width="80*"/>
<ColumnDefinition Width="10*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="21*"/>
<RowDefinition Height="398*"/>
<RowDefinition Height="21*"/>
</Grid.RowDefinitions>
<Label x:Name="FileName" >
</Label><Button Click="Button_Click" Grid.Row="0" Grid.Column="2" >File</Button>
<ScottPlot:WpfPlot x:Name="WpfPlot1" Grid.Row="1" Grid.Column="1" />
</Grid>
</Window>

138
Common/CordoPlot/MainWindow.xaml.cs Normal file
View File

@ -0,0 +1,138 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol;
using Xylem.Common.Metrology.Measurements;
namespace CordoPlot
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
private void Button_Click(Object sender, RoutedEventArgs e)
{
var dialog = new Microsoft.Win32.OpenFileDialog();
dialog.FileName = "led"; // Default file name
dialog.DefaultExt = ".log"; // Default file extension
dialog.Filter = "Text documents (.log)|*.log"; // Filter files by extension
// Show open file dialog box
bool? result = dialog.ShowDialog();
// Process open file dialog box results
if (result == true)
{
// Open document
string filename = dialog.FileName;
var AllLines = File.ReadAllLines(filename);
var listOfData = new List<IMeasurementRecord>();
var decoder = new StreamingDecoder();
var currentSyncmark = SyncMarkRecord.DecodeEveryPackage;
//DecodeMsg
foreach (var line in AllLines)
{
decoder = new StreamingDecoder();
if (line.Contains("|"))
{
var t = line.Split('|');
DateTime recived = DateTime.Now;
DateTime.TryParse(t[0], out recived);
if (t[1].Contains("@"))
{
decoder.DecodeMsg(t[1].Trim());
IMeasurementRecord recordToAdd;
if (decoder.DataBendDetectTest.IsValid)
{
decoder.DataBendDetectTest.ReceivedTime = recived;
decoder.DataBendDetectTest.SyncMarkRecord = currentSyncmark;
recordToAdd = decoder.DataBendDetectTest ;
}
else if (decoder.DataCalib.IsValid)
{
decoder.DataCalib.ReceivedTime = recived;
decoder.DataCalib.SyncMarkRecord = currentSyncmark;
recordToAdd = decoder.DataCalib;
}
else if (decoder.DataFlowTest.IsValid)
{
decoder.DataFlowTest.ReceivedTime = recived;
decoder.DataFlowTest.SyncMarkRecord = currentSyncmark;
recordToAdd = decoder.DataFlowTest;
}
else
{
//No valid data
continue;
}
listOfData.Add(recordToAdd);
}
else
{
if (line.Contains("Mark next incoming record as"))
{
if (line.Contains("Mark next incoming record as SyncStart"))
{
currentSyncmark = SyncMarkRecord.SyncStart;
}
else if (line.Contains("Mark next incoming record as DecodeIntermediate"))
{
currentSyncmark = SyncMarkRecord.DecodeIntermediate;
}
else if (line.Contains("Mark next incoming record as SkipDecoding"))
{
currentSyncmark = SyncMarkRecord.SkipDecoding;
}
else if (line.Contains("Mark next incoming record as SyncEnd"))
{
currentSyncmark = SyncMarkRecord.SyncEnd;
}
else
{
currentSyncmark = SyncMarkRecord.DecodeEveryPackage;
}
}
}
}
//FlowTestRecord
}
}
double[] dataX = { 1, 2, 3, 4, 5 };
double[] dataY = { 1, 4, 9, 16, 25 };
WpfPlot1.Plot.Add.Scatter(dataX, dataY);
WpfPlot1.Refresh();
}
}
}

25
Common/CordoPlot/OpenTK.dll.config Normal file
View File

@ -0,0 +1,25 @@
<configuration>
<dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
<dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
<dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
<dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
<dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
<dllmap os="linux" dll="libX11" target="libX11.so.6"/>
<dllmap os="linux" dll="libXi" target="libXi.so.6"/>
<dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
<dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
<dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
<dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
<dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
<dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
<dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
<dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
<!-- XQuartz compatibility (X11 on Mac) -->
<dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
<dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
<dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
<dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
<dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
<dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
</configuration>

55
Common/CordoPlot/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,55 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CordoPlot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CordoPlot")]
[assembly: AssemblyCopyright("Copyright © 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

71
Common/CordoPlot/Properties/Resources.Designer.cs generated Normal file
View File

@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace CordoPlot.Properties
{
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CordoPlot.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}

117
Common/CordoPlot/Properties/Resources.resx Normal file
View File

@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

30
Common/CordoPlot/Properties/Settings.Designer.cs generated Normal file
View File

@ -0,0 +1,30 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace CordoPlot.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}

7
Common/CordoPlot/Properties/Settings.settings Normal file
View File

@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

20
Common/CordoPlot/packages.config Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OpenTK" version="3.3.1" targetFramework="net48" />
<package id="OpenTK.GLWpfControl" version="3.3.0" targetFramework="net48" />
<package id="ScottPlot" version="5.0.32" targetFramework="net48" />
<package id="ScottPlot.WPF" version="5.0.32" targetFramework="net48" />
<package id="SkiaSharp" version="2.88.8" targetFramework="net48" />
<package id="SkiaSharp.NativeAssets.Linux.NoDependencies" version="2.88.8" targetFramework="net48" />
<package id="SkiaSharp.NativeAssets.macOS" version="2.88.8" targetFramework="net48" />
<package id="SkiaSharp.NativeAssets.Win32" version="2.88.8" targetFramework="net48" />
<package id="SkiaSharp.Views.Desktop.Common" version="2.88.8" targetFramework="net48" />
<package id="SkiaSharp.Views.WPF" version="2.88.8" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Drawing.Common" version="4.7.3" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
</packages>

7
Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj
View File

@ -111,6 +111,11 @@
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
<PropertyGroup>
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
@ -129,7 +134,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http">
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Net.Http.dll</HintPath>
<HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />

78
Common/CordonelPreadjustmentUi/MeterStateControl.cs
View File

@ -4,10 +4,10 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Ui.CordonelPreadjustmentUi.Helper.Extensions;
@ -88,6 +88,36 @@ namespace CordonelPreadjustmentUi
{
try
{
if (MeterTempMode == TempMode.CalcTof)
{
//Qickfiyx für 2016 statt der flansche auf die p150 ip thermometer
var ret = new List<decimal>();
HttpClient client = new HttpClient(); // actually only one object should be created by Application
string page = client.GetStringAsync("http://10.49.41.36/de/user.htm?Sess=").Result;
foreach (var item in page.Replace("<div style=\"display: inline-block; width: 120px;\">", "}").Split('}'))
{
if (item.Contains("&deg;C</div>"))
{
decimal d = 0;
if (decimal.TryParse(item.Replace("&deg;C<", "§").Split('§')[0], out d))
{
ret.Add(d);
}
;
}
//&deg;C
}
if (ret.Count == 2)
{
SetTemperature((ret.Sum() / 2), false);
return;
}
}
var cRecords = Meter.CurrentRecords.ToList();
Log($"cRecords.Count={cRecords.Count}");
if (cRecords != null && cRecords.Any())
@ -118,7 +148,7 @@ namespace CordonelPreadjustmentUi
Log($"avgTof;{x}({sumTof}/{countTof})");
checkTempMeter = interPol(TempFromTofLUT, x);
Meter.CurrentRecords.Clear();
}
@ -179,31 +209,31 @@ namespace CordonelPreadjustmentUi
try
{
if ((x <= points[0].Item1) && (x >= points.Last().Item1))
{
var i = 0;
foreach (var val in points)
if ((x <= points[0].Item1) && (x >= points.Last().Item1))
{
if (points[i].Item1 <= x)
var i = 0;
foreach (var val in points)
{
x1 = points[i - 1].Item1;
y1 = points[i - 1].Item2;
x2 = points[i].Item1;
y2 = points[i].Item2;
break;
if (points[i].Item1 <= x)
{
x1 = points[i - 1].Item1;
y1 = points[i - 1].Item2;
x2 = points[i].Item1;
y2 = points[i].Item2;
break;
}
i = i + 1;
}
i = i + 1;
checkTempMeter = (decimal)((y2 - y1) / (x2 - x1) * (x - x1) + y1);
}
else
{
checkTempMeter = 1;
}
checkTempMeter = (decimal)((y2 - y1) / (x2 - x1) * (x - x1) + y1);
}
else
{
checkTempMeter = 1;
}
return checkTempMeter;
return checkTempMeter;
}
catch (Exception ex)
{
@ -309,7 +339,7 @@ namespace CordonelPreadjustmentUi
var pcbid = "notFound";
try
{
if (Meter.Slot == 11)
{
pcbid = "193400032";
@ -365,7 +395,7 @@ namespace CordonelPreadjustmentUi
{
Log("StartTempWatch" + ex.Message);
}
}
public enum TempMode

2
Common/CordonelPreadjustmentUi/PreAdjustmentSettingsContainer.cs
View File

@ -18,7 +18,7 @@ namespace CordonelPreadjustmentUi
public Int32 ZeroOffset1 { get; internal set; } = 0;
public Int32 ZeroOffset2 { get; internal set; } = 0;
public Int32 ZeroOffset3 { get; internal set; } = 0;
public Int32 Samplerate { get; internal set; } = 10;
public Int32 Samplerate { get; internal set; } = 16;
public MeterSize MeterSize { get; internal set; } = MeterSize.DN50;
public LedMode LedMode { get; internal set; } = LedMode.CalibData;
#endregion

2
Common/CordonelPreadjustmentUi/Processes/Actions/OffsetTestProcess.cs
View File

@ -105,7 +105,7 @@ namespace CordonelPreadjustmentUi.Processes.Actions
if (MaxTimeoutWarnings <= 0)
{
pp.DebugMessage($"Fatal timeout while collecting data. Please check LED singnal. Has {offsetRecords.Count} from {pp.Setting.OffsetTestNumberOfLines * 3}", meterctl.Slot, "DC", meterctl.Meter.PcbId);
Ok = false;
// Ok = false;
}
if (CheckAbort(Ok, meterctl)) { return Ok; }

1
Common/Hardware/Interfaces/Ports/SerialPorts/BaseSerialPort.cs
View File

@ -444,6 +444,7 @@ namespace Xylem.Common.Hardware.Interfaces.Ports.SerialPorts
if (!string.IsNullOrEmpty(rxStringRecord))
{
//decode optional at synchronized data SyncStart, SyncEnd or DecodeIntermediate
//todo remove after air problem
if (SyncMarkRecord.SkipDecoding != dataSyncMarkThisRun)
{
OnRawRecordReceived?.Invoke(this, new StringPortDataEventArgs(rxStringRecord,

14
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
View File

@ -819,7 +819,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
//nobody is listening
}
}
public Dictionary<int,Tuple<int,DateTime>> ErrorCurrent = new Dictionary<int,Tuple<int, DateTime>>();
/// <summary>
/// Track all incoming led record packages (Calibration and Flow)
/// </summary>
@ -849,6 +849,18 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
return;
}
//if (calRec.Validation != 0)
//{
// if (!ErrorCurrent.ContainsKey(calRec.Channel))
// {
// ErrorCurrent.Add(calRec.Channel, new Tuple<int, DateTime>(1, DateTime.Now));
// }
// else
// {
// ErrorCurrent[calRec.Channel] = new Tuple<int, DateTime>(ErrorCurrent[calRec.Channel].Item1 + 1, DateTime.Now);
// }
// _logger.Info($"MessuremntError on {calRec.Channel} Code: {calRec.Validation}");
//}
}
AddData(((IMeasurementRecord)result));
}

19
Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterCalibration.cs
View File

@ -121,6 +121,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
/// <inheritdoc />
public void SetCalibFactorsAllChannels(Boolean justLog = false)
{
WriteRegister<Byte>(Register.Genesisflow.SampleRate, 2, checkRegister: true);
WriteRegister<UInt16>(Register.Genesisflow.TriggerIdle, 0x1234, true);
for (var channel = 0; channel < MeterConfig.CalibChannels; channel++)
{
if (_calibFactor[channel].IsCalculated == false) continue;
@ -132,16 +134,25 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
else
{
var registerRawCalibFactor = _calibFactor[channel].GetMeterRawCalibFactor();
WriteRegister(_calibFactor[channel].RegisterToStoreCalibFactor,
var resultWrite = WriteRegister(_calibFactor[channel].RegisterToStoreCalibFactor,
registerRawCalibFactor, checkRegister: true);
_logger.Info($"Slot:{Slot}, Channel:{channel} - Stored calibration factor({_registersToStoreCalibFactor})");
_logger.Info($"Slot:{Slot}, Channel:{channel} - Stored calibration factor({_registersToStoreCalibFactor[channel]})");
if (resultWrite)
{
_logger.Warn($"Set calibration went wrong {_calibFactor[channel].RegisterToStoreCalibFactor}, with {registerRawCalibFactor}");
}
}
}
WriteRegister<Byte>(Register.Genesisflow.SampleRate, 10, checkRegister: true);
WriteRegister(Register.Genesisflow.ResetAccumulators, true);
//WriteRegister<UInt16>(Register.Genesisflow.ForwardArrow, 0, checkRegister: true);
WriteRegister<UInt16>(Register.Genesisflow.StoreCalibration, 1);
WriteRegister<UInt16>(Register.Genesisflow.StoreCalibration, 1,true);
_logger.Info($"Slot:{Slot} - StoreCalibration { RegisterConverter.ByteArrayToValue<UInt16>(ReadRegister(Register.Genesisflow.StoreCalibration))}");
WriteRegister<UInt16>(Register.Genesisflow.TriggerActive, 1, true);
_logger.Info($"Slot:{Slot} - Set forward arrow of LCD, reset accumulators, set sample rate to 2Hz");
WriteRegister<Byte>(Register.Genesisflow.SampleRate, 10, checkRegister: true);
}
}
}

2
Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterMeasurement.cs
View File

@ -50,7 +50,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
//SkipPreparationForTestBench = true;
//TODO set display unit
//TODO calculated overflow volume for display
WriteRegister<Byte>(Register.Genesisflow.SampleRate, 16, checkRegister: true);
WriteRegister<Byte>(Register.Genesisflow.SampleRate, 0x0a, checkRegister: true);
WriteRegister(Register.Genesisflow.LedMode, (Byte)LedMode.FlowTestAndCalibData, checkRegister: true);
WriteRegister("GENESISFLOW_SealDisplay", 0, true, true);

2
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
8fbe991b217e7692af4817ad205b768685aa5a72
c43c40a030005a8f189e6179faf40a6d42bfef5c

27
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs
View File

@ -2,6 +2,7 @@
using ProductionUiCordonel.ProductionProcesses.Enum;
using ProductionUiCordonel.UserControls.FinalTest;
using System;
using System.Linq;
using System.Windows.Controls;
using System.Windows.Threading;
using Xylem.Common.CommonCore.Configuration;
@ -191,11 +192,27 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
UserControl.lblText.Dispatcher.Invoke(DispatcherPriority.Send,
new Action(() =>
{
UserControl.lblText.Content = "Lut not correct";
}
));
new Action(() =>
{
UserControl.lblText.Content = "Lut not correct";
}
));
}
var meterFWApp = Meter.MeterAppListVersion.First(a => a.AppId == 24);
if (!string.IsNullOrEmpty(res[9]) && meterFWApp.StrVersion.Replace(".", "") != uint.Parse(res[9]).ToString("X4"))
{
currentProcessState = ProductionProcessState.Error;
UserControl.lblText.Dispatcher.Invoke(DispatcherPriority.Send,
new Action(() =>
{
UserControl.lblText.Content = $"FW not correct Meter has {meterFWApp.Version} and should have {uint.Parse(res[9])}";
}
));
}

47
Common/Service/MeterProcessState/Controllers/FinalCheckController.cs
View File

@ -28,6 +28,53 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
);
}
///// <summary>
///// Get the values to correct battery usage in field
///// </summary>
///// <param name="pcbID">PcbID from Meter</param>
///// <returns></returns>
//[Route("GetPowermonCorrectionData"), HttpGet]
//public async Task<HttpResponseMessage> GetPowermonCorrectionData(String pcbID)
//{
// try
// {
// return await Task.Run(() =>
// {
// using (var dataAccess = new SqlDataAccess(GlobalConfig.ConnectionString.Value))
// {
// var sb = new StringBuilder();
// sb.AppendLine($" SELECT distinct[MapPcbIdToSerialNumber_SerialNumber], mapOrder.CordonelPressureTest_FertigungsAuftragsNr ");
// sb.AppendLine($" FROM Auftrag.dbo.Cordonel_PressureTest mapOrder ");
// sb.AppendLine($" left outer join [Auftrag].[dbo].[MapPcbIdToSerialNumber] map on mapOrder.CordonelPressureTest_PcbId = map.MapPcbIdToSerialNumber_PcbId ");
// sb.AppendLine($" left outer join Auftrag.dbo.AuftragPositionSerienNr mapSrn on map.[MapPcbIdToSerialNumber_SerialNumber] = mapSrn.SerienNr and mapSrn.Pruefgangnr = 0 ");
// sb.AppendLine($" left outer join Auftrag.dbo.AlleAuftragPositionen auftraginfo on auftraginfo.AuftragNr = mapSrn.AuftragNr and auftraginfo.PositionNr = mapSrn.PositionNr ");
// sb.AppendLine($" where mapOrder.CordonelPressureTest_PcbId = '{pcbID}'");
// var mapData = dataAccess.ExecuteQuery(sb.ToString());
// if (mapData.Rows.Count != 1)
// {
// throw new ApplicationException("No base data found");
// }
// orderNr = (Int32)mapData.Rows[0]["CordonelPressureTest_FertigungsAuftragsNr"];
// }
// return Request.CreateResponse(HttpStatusCode.OK, ret);
// });
// }
// catch (Exception ex)
// {
// return Request.CreateResponse(HttpStatusCode.InternalServerError, ex);
// }
//}
//LocalWebRequest
/// <summary>
/// Get Radio Configuration from database matching the PcbID

8
Common/Service/MeterProcessState/Controllers/TestBenchController.cs
View File

@ -126,6 +126,7 @@
FROM [CordonelMeterSizes]
WHERE [Dn_VakoID] = SUBSTRING([Identnr].[VakoCode], 4, 2)) AS [NewNennweiteID]
, [lut].[FileCrc] AS [LutCrc]
, fw.FWVersionHex as FWVersion
FROM [Cordonel_AssignedPicking] AS [MapOrder]
LEFT OUTER JOIN [MapPcbIdToSerialNumber] AS [map]
ON [MapOrder].[CordonelAssignedPicking_PcbId] = [map].[MapPcbIdToSerialNumber_PcbId]
@ -145,6 +146,12 @@
FROM [CordonelMeterSizes]
WHERE [Dn_VakoID] = SUBSTRING([Identnr].[VakoCode], 4, 2))
AND [lut].[CurrentVersionForProd] = 1
left outer join Cordonel_CurrentFw AS fw
ON [fw].Metersize = (SELECT TOP 1 [Dn_InternalId]
FROM [CordonelMeterSizes]
WHERE [Dn_VakoID] = SUBSTRING([Identnr].[VakoCode], 4, 2))
AND [fw].CurrentForProd = 1
WHERE [MapOrder].[CordonelAssignedPicking_IsDeleted] = 0
AND [MapOrder].[CordonelAssignedPicking_PcbId] = @{nameof(PcbID)} ")
.SetParameter(nameof(PcbID), PcbID)
@ -159,6 +166,7 @@
$"{x.GetInt()}", // Dn,
$"{x.GetInt()}", // NewNennweiteID,
$"{x.GetValue<int?>()}", // LutCrc
$"{x.GetValue<int?>()}", // Fwversion
});
if (results.Count() == 1)

2
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
1babc7d629fd8c486aff20f4990c117c2e58a68f
65d75c3322f8a137c69963cfdc0cb6f1ffacf62a

18
Common/Ui/LegacyGenesisControl/ctlBatch.cs
View File

@ -1619,6 +1619,24 @@ namespace XylemCommonUiLegacyGenCtl
_logger.Debug($"ScaleFactorRefToDut = {result.Value.ScaleFactorRefToDut}");
_logger.Debug($"Start Record: TimeS={result.Value.DutStartRecord.GetTimeS()}, VolumeCm={result.Value.DutStartRecord.GetVolumeCm()}");
_logger.Debug($"End Record: TimeS={result.Value.DutStopRecord.GetTimeS()}, VolumeCm={result.Value.DutStopRecord.GetVolumeCm()}");
//try
//{
// var meter = batch.ListOfMeters.First(f => f.Slot == Slot);
// if (meter is GenesisMeter genesisMeter)
// {
// foreach (var item in genesisMeter.ErrorCurrent)
// {
// _logger.Debug($"Error Cound:CHNL {item.Key} : Total count {item.Value.Item1} ; last error {item.Value.Item2}");
// }
// }
//}
//catch (Exception)
//{
//}
var sbError = string.Empty;

10
Common/Ui/LegacyGenesisControl/ctlCRdy.cs
View File

@ -530,7 +530,7 @@ namespace XylemCommonUiLegacyGenCtl
Path2State = MeterReadyResults.NotStarted;
Path3State = MeterReadyResults.NotStarted;
if (string.IsNullOrEmpty(meter.PcbId))
if (string.IsNullOrEmpty(meter.PcbId) )
{
PcbId = meter.GetPcbId();
}
@ -538,6 +538,12 @@ namespace XylemCommonUiLegacyGenCtl
{
PcbId = meter.PcbId;
}
if (string.IsNullOrEmpty(PcbId) || PcbId.Length < 5)
{
PcbId = meter.GetPcbId();
}
if (ctlCancellationToken.IsCancellationRequested)
{
return;
@ -550,7 +556,7 @@ namespace XylemCommonUiLegacyGenCtl
{
return;
}
if (!string.IsNullOrEmpty(meter.PcbId) && meter.Login())
if (!string.IsNullOrEmpty(meter.PcbId) && meter.PcbId.Length < 6 && meter.Login())
{
changeCurrentSlotState(TaskState.LoginDone);