just commit
This commit is contained in:
Stoyan Zlatev
parent
577f6a4b1c
commit
6dd242e0b6
@ -181,9 +181,40 @@
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<application path="/swagger" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="http" bindingInformation="*:50076:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(4)" id="6">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<application path="/swagger" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="http" bindingInformation="*:50176:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(5)" id="7">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="https" bindingInformation="*:50000:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(6)" id="8">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="https" bindingInformation="*:50056:localhost" />
|
||||
<binding protocol="http" bindingInformation="*:56011:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<siteDefaults>
|
||||
<!-- To enable logging, please change the below attribute "enabled" to "true" -->
|
||||
|
||||
@ -200,6 +200,32 @@
|
||||
<bindings>
|
||||
<binding protocol="http" bindingInformation="*:50076:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(5)" id="8">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="http" bindingInformation="*:50176:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(6)" id="9">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="https" bindingInformation="*:50000:localhost" />
|
||||
<binding protocol="http" bindingInformation="*:56011:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<site name="MeterProcessState(7)" id="10">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="https" bindingInformation="*:50056:localhost" />
|
||||
<binding protocol="http" bindingInformation="*:56011:localhost" />
|
||||
</bindings>
|
||||
</site>
|
||||
<siteDefaults>
|
||||
<!-- To enable logging, please change the below attribute "enabled" to "true" -->
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.33423.255
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.14.36429.23 d17.14
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{7A0EE7B8-6B7E-41E9-B679-319C8CA48CF1}"
|
||||
EndProject
|
||||
@ -354,7 +354,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SIRT", "SIRT", "{02EA681E-C
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LaaPackages", "LaaPackages", "{7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb.Resources", "LaaPackages\LaaProductionWeb.Resources\LaaProductionWeb.Resources.csproj", "{9E070488-15DE-418A-8606-5B79056C6E9F}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb.Resources", "LaaPackages\LaaProductionWeb.Resources\LaaProductionWeb.Resources.csproj", "{DA65E376-3D35-4D96-913A-7197FCA6DF48}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.Features.Cordonel", "LaaPackages\LaaPackages.Features.Cordonel\LaaPackages.Features.Cordonel.csproj", "{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}"
|
||||
EndProject
|
||||
@ -377,9 +377,6 @@ EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Services.LaserImport", "Common.Services.LaserImport\Common.Services.LaserImport.csproj", "{6746517C-BE89-4637-A283-0A932A50497A}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
_MANUAL_CONTROL|Any CPU = _MANUAL_CONTROL|Any CPU
|
||||
_MANUAL_CONTROL|Mixed Platforms = _MANUAL_CONTROL|Mixed Platforms
|
||||
@ -6006,78 +6003,78 @@ Global
|
||||
{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|x64.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|x64.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|x86.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.COM|x86.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|x64.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|x64.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|x86.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.GenesisDisplayTool_V01|x86.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|x64.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|x64.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|x86.ActiveCfg = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.PerformTest|x86.Build.0 = Debug|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.ReleaseTest|x86.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.VPN_Debug|x86.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x64.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|x64.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|x64.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|x86.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.COM|x86.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|x64.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|x64.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|x86.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.GenesisDisplayTool_V01|x86.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|x64.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|x64.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|x86.ActiveCfg = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.PerformTest|x86.Build.0 = Debug|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|x64.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|x64.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.ReleaseTest|x86.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|Any CPU.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|x64.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.VPN_Debug|x86.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|Any CPU.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|x64.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
|
||||
{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
@ -6725,7 +6722,7 @@ Global
|
||||
{D7A7E1FF-D024-407F-B30D-4C519CFA7BF1} = {A6B3AB5A-A567-4C77-80FB-1E1E19A00713}
|
||||
{AFC428F5-0141-4A3F-BEF2-470A89D972F6} = {C17363DF-A043-4F25-8EBA-2B3B078227DC}
|
||||
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {99B23EE9-CE50-4924-A055-C39EFA038721}
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F} = {7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}
|
||||
{DA65E376-3D35-4D96-913A-7197FCA6DF48} = {7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}
|
||||
{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB} = {7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}
|
||||
{15A06398-ECB6-49C9-ACB4-52A495A886A6} = {7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}
|
||||
{F90B940C-9A83-496D-AAE0-11CD02CE0A22} = {7B7EC9A1-2091-4CCD-9F01-C579ABD9241D}
|
||||
@ -6740,6 +6737,9 @@ Global
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}
|
||||
EndGlobalSection
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
|
||||
EndGlobalSection
|
||||
GlobalSection(Performance) = preSolution
|
||||
HasPerformanceSessions = true
|
||||
EndGlobalSection
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
@ -55,10 +56,33 @@
|
||||
<Project>{4e8bb839-d40a-488c-88ce-f21811f1f476}</Project>
|
||||
<Name>Common.Hardware.WaterMeter.eRegister</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\GenesisCore\GenesisCore.csproj">
|
||||
<Project>{04201E95-90A0-4B73-A72F-379739B2A3AE}</Project>
|
||||
<Name>GenesisCore</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\GenesisStatus\GenesisStatus.csproj">
|
||||
<Project>{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}</Project>
|
||||
<Name>GenesisStatus</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
|
||||
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
|
||||
<Name>Registers</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
|
||||
<Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project>
|
||||
<Name>WaterMeterCore</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Hardware\WaterMeter\WaterMeterCore\WaterMeterRegisters\WaterMeterRegisters.csproj">
|
||||
<Project>{26AFCF1E-1287-48B8-A506-32B1E8A0DD0E}</Project>
|
||||
<Name>WaterMeterRegisters</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\LaaPackages\LaaPackages.SqlClient\LaaPackages.SqlClient.csproj">
|
||||
<Project>{F90B940C-9A83-496D-AAE0-11CD02CE0A22}</Project>
|
||||
<Name>LaaPackages.SqlClient</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="file.json" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@ -1,50 +1,85 @@
|
||||
namespace CommonConsole
|
||||
{
|
||||
using Common.Hardware.SIRT;
|
||||
|
||||
using Common.Hardware.SIRT.Tasks;
|
||||
using Common.Hardware.WaterMeter.eRegister.Features;
|
||||
using Common.Hardware.WaterMeter.eRegister.Telegrams;
|
||||
using System;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
|
||||
public static partial class Program
|
||||
{
|
||||
static void Main()
|
||||
static void Main_Pwd()
|
||||
{
|
||||
SIRTLogger.Message += Console.WriteLine;
|
||||
var sirtHub = new SIRTHub();
|
||||
_ = sirtHub.TryOpen("COM6", out var _1, out var _2);
|
||||
_ = sirtHub.TryOpen("COM7", out var _3, out var _4);
|
||||
var addresses = new uint[]
|
||||
//ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) =>
|
||||
//{
|
||||
// return true;
|
||||
//};
|
||||
using (var httpRequest = new HttpRequestMessage(HttpMethod.Get, "https://nodes.sms-esaap.com:8081/api/v3/custom/keysetkeys?orderNumber=3251950&radioAdress=10402032336"))
|
||||
{
|
||||
319017452,
|
||||
319017453,
|
||||
319017454,
|
||||
httpRequest.Headers.Add("Cache-Control", "no-cache");
|
||||
httpRequest.Headers.Add("X-Node-Token", "d5b8c0b2-81f6-4421-80d0-44eb2093e616");
|
||||
using (var httpResponse = new HttpClient().SendAsync(httpRequest).Result)
|
||||
{
|
||||
using (var httpContent = httpResponse.Content)
|
||||
{
|
||||
var content = httpContent.ReadAsStringAsync().Result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
309031154,
|
||||
static void Main_SIRT()
|
||||
{
|
||||
//var _semiStr = "08F5126B8061000001F40000830C00FF0000000000000009130197DB65070E10A87716DACA00007FFF0004000000000000000000000000000000000000000000000403003C0003013140EF511D00000000000000000000050005300000";
|
||||
//var semiStr = "083D126B8061000002020000BF0C00FF0000000000000009130197DB65050E10A87716DAC900007FFF015A000000000000000000000000000000000000000000000403003C00030131413F6C1D000000000000000000015B015B300000";
|
||||
//var semiBytes = semiStr.GetBytes();
|
||||
//var semi = new SEMI(semiBytes, 868, 0);
|
||||
|
||||
//var debugStr = "0B00126B8061000C010B0106050151F5A57213006800202000000000002C543E02010116003002710000827100000000000005A000";
|
||||
//var debugBytes = debugStr.GetBytes();
|
||||
//var debug = new DEBUG(debugBytes, 0);
|
||||
|
||||
//var logfile = @"..\..\log.txt";
|
||||
SIRTLogger.Message += Console.WriteLine;
|
||||
|
||||
var hub = new SIRTHub();
|
||||
hub.TryOpen("COM6", out var id1, out var mhz1);
|
||||
hub.TryOpen("COM7", out var id2, out var mhz2);
|
||||
|
||||
var task = new WritePamTask
|
||||
{
|
||||
Timeout = 15000,
|
||||
WakeUpCmd = true,
|
||||
WakeUpModul = true,
|
||||
DelPamSemi = true,
|
||||
Frequency = 868,
|
||||
ResponseAddress = 309035105,
|
||||
RequestAddress = 309035105,
|
||||
EncryptionKeyI = "5DD3EF5233B4DAA6836721F2866182DA".GetBytes(),
|
||||
Data = new SetMeterType
|
||||
{
|
||||
Type = MeterTypes.Residential__0x0B
|
||||
}
|
||||
.Append(new ProvidePin(AuthLevel.III))
|
||||
};
|
||||
Console.ReadKey();
|
||||
sirtHub.CloseAll();
|
||||
SIRTLogger.Message -= Console.WriteLine;
|
||||
|
||||
while (task.State != SIRTTaskState.Completed)
|
||||
{
|
||||
if (hub.Start(task))
|
||||
{
|
||||
task.Wait();
|
||||
}
|
||||
}
|
||||
|
||||
hub.CloseAll();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static void Main_ProgrammingParameters_Cordonel()
|
||||
static void Main() // __CSD_Config()
|
||||
{
|
||||
var alarmMask = 0 << AlarmMask.ALARM_REBOOT
|
||||
var alarmMask = 1 << AlarmMask.ALARM_REBOOT
|
||||
| 1 << AlarmMask.ALARM_LOW_BATTERY
|
||||
| 0 << AlarmMask.ALARM_VERY_LOW_BATTERY
|
||||
| 0 << AlarmMask.ALARM_CONFIG_ERROR
|
||||
@ -53,56 +88,61 @@
|
||||
| 1 << AlarmMask.ALARM_REVERSE_FLOW
|
||||
| 1 << AlarmMask.ALARM_SUSPECT_LEAK
|
||||
| 1 << AlarmMask.ALARM_BROKEN_PIPE
|
||||
| 0 << AlarmMask.ALARM_LOW_PRESSURE
|
||||
| 0 << AlarmMask.ALARM_HIGH_PRESSURE
|
||||
| 0 << AlarmMask.ALARM_LOW_TEMPERATURE
|
||||
| 0 << AlarmMask.ALARM_HIGH_TEMPERATURE
|
||||
| 1 << AlarmMask.ALARM_LOW_PRESSURE
|
||||
| 1 << AlarmMask.ALARM_HIGH_PRESSURE
|
||||
| 1 << AlarmMask.ALARM_LOW_TEMPERATURE
|
||||
| 1 << AlarmMask.ALARM_HIGH_TEMPERATURE
|
||||
| 0 << AlarmMask.ALARM_RADIO_ERROR
|
||||
| 0 << AlarmMask.ALARM_METROLOGY_PARAMS
|
||||
| 0 << AlarmMask.ALARM_METROLOGY_MEASURE
|
||||
| 0 << AlarmMask.ALARM_MAX;
|
||||
var alarmBytes = BitConverter.GetBytes(alarmMask);
|
||||
Array.Reverse(alarmBytes);
|
||||
Console.WriteLine($"{"ALARMS:",11} {alarmMask,11} - {BitConverter.ToString(alarmBytes).Replace("-", "")}");
|
||||
Console.WriteLine($"{"VAM:",5} {alarmMask,11} {BitConverter.ToString(alarmBytes).Replace("-", "")}");
|
||||
|
||||
|
||||
|
||||
uint content = // (uint)1 << LogContentBits.AlarmStatus // ALWAYS ON
|
||||
//| (uint)1 << LogContentBits.BillingCounter // ALWAYS ON
|
||||
(uint)0 << LogContentBits.ReverseCounter //
|
||||
| (uint)0 << LogContentBits.MaxFlow //
|
||||
| (uint)0 << LogContentBits.MaxFlowTime //
|
||||
uint content = (uint)1 << LogContentBits.AlarmStatus // ALWAYS ON
|
||||
| (uint)1 << LogContentBits.BillingCounter // ALWAYS ON
|
||||
|
||||
| (uint)1 << LogContentBits.ReverseCounter //
|
||||
| (uint)1 << LogContentBits.MaxFlow //
|
||||
| (uint)1 << LogContentBits.MaxFlowTime //
|
||||
| (uint)0 << LogContentBits.PeakFlow //
|
||||
| (uint)0 << LogContentBits.PeakFlowTime //
|
||||
| (uint)0 << LogContentBits.AvgFlow //
|
||||
| (uint)0 << LogContentBits.BrokenPipe //
|
||||
| (uint)0 << LogContentBits.BrokenPipeTime //
|
||||
| (uint)0 << LogContentBits.MinFlow //
|
||||
| (uint)1 << LogContentBits.MinFlow //
|
||||
| (uint)0 << LogContentBits.MinFlowTime //
|
||||
| (uint)0 << LogContentBits.ForwardCounter //
|
||||
| (uint)0 << LogContentBits._UTC32 // ALWAYS ON
|
||||
//| (uint)0 << LogContentBits._MaskSelector_1_1 //
|
||||
//| (uint)0 << LogContentBits._MaskSelector_1_2 //
|
||||
|
||||
| (uint)1 << LogContentBits._UTC32 // ALWAYS ON
|
||||
| (uint)0 << LogContentBits._MaskSelector_1_1 // X
|
||||
| (uint)0 << LogContentBits._MaskSelector_1_2 // X
|
||||
|
||||
| (uint)0 << LogContentBits.MinPress //
|
||||
| (uint)0 << LogContentBits.MinPressTime //
|
||||
| (uint)0 << LogContentBits.MaxPress //
|
||||
| (uint)0 << LogContentBits.MaxPressTime //
|
||||
| (uint)1 << LogContentBits.MaxPress //
|
||||
| (uint)1 << LogContentBits.MaxPressTime //
|
||||
| (uint)0 << LogContentBits.MinTemp //
|
||||
| (uint)0 << LogContentBits.MinTempTime //
|
||||
| (uint)0 << LogContentBits.MaxTemp //
|
||||
| (uint)0 << LogContentBits.MaxTempTime //
|
||||
| (uint)0 << LogContentBits.CurrentPress //
|
||||
| (uint)0 << LogContentBits.CurrentTemp; //
|
||||
//| (uint)1 << LogContentBits.ExtendedAlarm // ALWAYS ON
|
||||
//| (uint)1 << LogContentBits._RecordCheckSum; // ALWAYS ON
|
||||
| (uint)0 << LogContentBits.CurrentTemp //
|
||||
|
||||
| (uint)1 << LogContentBits.ExtendedAlarm // ALWAYS ON
|
||||
| (uint)1 << LogContentBits._RecordCheckSum; // ALWAYS ON
|
||||
|
||||
var contentBytes = BitConverter.GetBytes(content);
|
||||
Array.Reverse(contentBytes);
|
||||
Console.WriteLine($"{"DATALOGGER:",11} {content,11} - {BitConverter.ToString(contentBytes).Replace("-", "")}");
|
||||
Console.WriteLine($"{"DLG:",5} {content,11} {BitConverter.ToString(contentBytes).Replace("-", "")}");
|
||||
|
||||
uint fdr = // (uint)1 << LogContentBits.AlarmStatus // ALWAYS ON
|
||||
//| (uint)1 << LogContentBits.BillingCounter // ALWAYS ON
|
||||
(uint)0 << LogContentBits.ReverseCounter //
|
||||
uint fdr = (uint)1 << LogContentBits.AlarmStatus // ALWAYS ON
|
||||
| (uint)1 << LogContentBits.BillingCounter // ALWAYS ON
|
||||
|
||||
| (uint)1 << LogContentBits.ReverseCounter //
|
||||
| (uint)0 << LogContentBits.MaxFlow //
|
||||
| (uint)0 << LogContentBits.MaxFlowTime //
|
||||
| (uint)0 << LogContentBits.PeakFlow //
|
||||
@ -113,9 +153,11 @@
|
||||
| (uint)0 << LogContentBits.MinFlow //
|
||||
| (uint)0 << LogContentBits.MinFlowTime //
|
||||
| (uint)0 << LogContentBits.ForwardCounter //
|
||||
| (uint)0 << LogContentBits._UTC32 // ALWAYS ON
|
||||
//| (uint)0 << LogContentBits._MaskSelector_1_1 //
|
||||
//| (uint)0 << LogContentBits._MaskSelector_1_2 //
|
||||
|
||||
| (uint)1 << LogContentBits._UTC32 // ALWAYS ON
|
||||
| (uint)0 << LogContentBits._MaskSelector_1_1 // X
|
||||
| (uint)0 << LogContentBits._MaskSelector_1_2 // X
|
||||
|
||||
| (uint)0 << LogContentBits.MinPress //
|
||||
| (uint)0 << LogContentBits.MinPressTime //
|
||||
| (uint)0 << LogContentBits.MaxPress //
|
||||
@ -125,103 +167,24 @@
|
||||
| (uint)0 << LogContentBits.MaxTemp //
|
||||
| (uint)0 << LogContentBits.MaxTempTime //
|
||||
| (uint)0 << LogContentBits.CurrentPress //
|
||||
| (uint)0 << LogContentBits.CurrentTemp; //
|
||||
//| (uint)1 << LogContentBits.ExtendedAlarm // ALWAYS ON
|
||||
//| (uint)1 << LogContentBits._RecordCheckSum; // ALWAYS ON
|
||||
| (uint)0 << LogContentBits.CurrentTemp //
|
||||
|
||||
| (uint)1 << LogContentBits.ExtendedAlarm // ALWAYS ON
|
||||
| (uint)1 << LogContentBits._RecordCheckSum; // ALWAYS ON
|
||||
|
||||
var fdrBytes = BitConverter.GetBytes(fdr);
|
||||
Array.Reverse(fdrBytes);
|
||||
Console.WriteLine($"{"FDR:",11} {fdr,11} - {BitConverter.ToString(fdrBytes).Replace("-", "")}");
|
||||
Console.WriteLine($"{"FDR:",5} {fdr,11} {BitConverter.ToString(fdrBytes).Replace("-", "")}");
|
||||
|
||||
Console.WriteLine();
|
||||
|
||||
//uint min = 201344787;
|
||||
//uint def = 206906379;
|
||||
//uint max = 4294967295;
|
||||
|
||||
//for (byte i = 0; i < LogContentBits.BitMask.Length; i++)
|
||||
//{
|
||||
// Console.WriteLine($"Min: {(min >> i) % 2} - Def: {(def >> i) % 2} - Max: {(max >> i) % 2} - {LogContentBits.BitMask[i]}");
|
||||
//}
|
||||
|
||||
} // CONTENT: 67110031 - 04-00-04-8F => 0400048F <-> 8F040004 04000C03
|
||||
|
||||
static void Main123()
|
||||
{
|
||||
// Console.WriteLine(BitConverter.ToInt32(new byte[] { 0xEC, 0xFF, 0xFF, 0xFF }, 0));
|
||||
|
||||
// SIRTServer.StartServer(Console.WriteLine, Console.WriteLine, 6, 8);
|
||||
// SIRTServer.StartProgramming(433, 412013443, "0E9FACC6A0E1EF1C3B27A49BAC216535");
|
||||
// SIRTServer.StartProgramming(433, 412013444, "0E9FACC6A0E1EF1C3B27A49BAC216535");
|
||||
// SIRTServer.StartProgramming(433, 412013356, "80D46C00E1BED73FE0DA85D95CA4BEE3");
|
||||
// SIRTServer.StartProgramming(433, 412013081, "7B5F2F606155C670BD9891231A598EF3");
|
||||
// SIRTServer.StartProgramming(433, 412013082, "A10BB3C32B71894BD8BB17884973E616");
|
||||
// SIRTServer.StartProgramming(433, 412013083, "15EEC94741740FB1EA736CF6468A4790");
|
||||
// SIRTServer.StartProgramming(433, 412013084, "6E742330A56149E8CF94ABD70576573D");
|
||||
// SIRTServer.StartProgramming(433, 412013087, "C4D1DC170D7E219C26FDE76F9B2DC89A");
|
||||
// SIRTServer.StartProgramming(433, 412013078, "4E788CF5F57FF977C85F458049D00387");
|
||||
// SIRTServer.StartProgramming(868, 402001154, "0E9FACC6A0E1EF1C3B27A49BAC216535");
|
||||
// SIRTServer.StartProgramming(433, 412012695, "867DD2A34C382B7D1190DD563E6B52C4");
|
||||
// SIRTServer.StartProgramming(433, 412013356, "80D46C00E1BED73FE0DA85D95CA4BEE3");
|
||||
}
|
||||
|
||||
public static void MainRF(params string[] args)
|
||||
{
|
||||
//var pam03 = new PAM03();
|
||||
|
||||
//pam03.Run("COM6", "402010030", "E6C88800DEB868C0D6A84880CE982840");
|
||||
//pam03.Run("COM6", "402010027", "D9C154DC274966AB71AD5D804A322178");
|
||||
|
||||
//return pam03.Run("COM7", "412004190", "0E9FACC6A0E1EF1C3B27A49BAC216535");
|
||||
// 10402010030 E6C88800DEB868C0D6A84880CE982840
|
||||
|
||||
//try
|
||||
//{
|
||||
// return pam03.Run("COM10", "402009768", "3CB64CBCB71F8D0F9F69FF18DF5D24D3");
|
||||
//}
|
||||
//catch (System.Exception e)
|
||||
//{
|
||||
// return -1;
|
||||
//}
|
||||
}
|
||||
|
||||
class FDRMask
|
||||
{
|
||||
public const byte LOG_ALARM_STATE = 0; // 0x00000001, //!< AlarmState (16 bits)
|
||||
public const byte LOG_BILLING_COUNTER = 1; // 0x00000002, //!< BillingCounter
|
||||
public const byte LOG_REVERSE_COUNTER = 2; // 0x00000004, //!< Backward or ReverseCounter
|
||||
public const byte LOG_MAX_FLOW_VAL = 3; // 0x00000008, //!< Value of MaxFlow
|
||||
public const byte LOG_MAX_FLOW_TIME = 4; // 0x00000010, //!< Date/Time of MaxFlow
|
||||
public const byte LOG_PEAK_FLOW_VAL = 5; // 0x00000020, //!< Value of PeakFlow
|
||||
public const byte LOG_PEAK_FLOW_TIME = 6; // 0x00000040, //!< Date/Time of PeakFlow
|
||||
public const byte LOG_AVG_FLOW_VAL = 7; // 0x00000080, //!< Current Flow Value (Average of Period)
|
||||
public const byte LOG_BROKEN_PIPE_FLOW_VAL = 8; // 0x00000100, //!< Value of BrokenPipe
|
||||
public const byte LOG_BROKEN_PIPE_FLOW_TIME = 9; // 0x00000200, //!< Date/Time of BrokenPipe
|
||||
public const byte LOG_MIN_FLOW_VAL = 10; // 0x00000400, //!< Value of FlowMin
|
||||
public const byte LOG_MIN_FLOW_TIME = 11; // 0x00000800, //!< Date/Time of FlowMin
|
||||
public const byte LOG_FORWARD_COUNTER = 12; // 0x00001000, //!< ForwardCounter
|
||||
// public const byte LOG_FORWARD_COUNTER = 12; // 0x00002000, //!< ForwardCounter
|
||||
// public const byte LOG_FORWARD_COUNTER = 12; // 0x00004000, //!< ForwardCounter
|
||||
// public const byte LOG_FORWARD_COUNTER = 12; // 0x00008000, //!< ForwardCounter
|
||||
public const byte LOG_MIN_PRESS_VAL = 13; // 0x00010000, //!< Pressure Minimum
|
||||
public const byte LOG_MIN_PRESS_TIME = 14; // 0x00020000, //!< Pressure Minimum Time
|
||||
public const byte LOG_MAX_PRESS_VAL = 15; // 0x00040000, //!< Pressure Maximum
|
||||
public const byte LOG_MAX_PRESS_TIME = 16; // 0x00080000, //!< Pressure Maximum Time
|
||||
public const byte LOG_MIN_TEMP_VAL = 17; // 0x00100000, //!< Temperature Minimum
|
||||
public const byte LOG_MIN_TEMP_TIME = 18; // 0x00200000, //!< Temperature Minimum
|
||||
public const byte LOG_MAX_TEMP_VAL = 19; // 0x00400000, //!< Temperature Maximum
|
||||
public const byte LOG_MAX_TEMP_TIME = 20; // 0x00800000, //!< Temperature Maximum
|
||||
public const byte LOG_CUR_PRESS_VAL = 21; // 0x01000000, //!< Pressure Current Value
|
||||
public const byte LOG_CUR_TEMP_VAL = 22; // 0x02000000, //!< Temperature Current Value
|
||||
public const byte LOG_EXT_ALARM_STATE = 23; // 0x04000000, //<! Extended Alarm Status
|
||||
};
|
||||
|
||||
class LogContentBits
|
||||
{
|
||||
public const byte AlarmStatus = 0; // 0x00000001 ;The active alarm information at UTC32
|
||||
public const byte BillingCounter = 1; // 0x00000002 ;The billing counter at UTC32
|
||||
public const byte ReverseCounter = 2; // 0x00000004 ;The reverse counter at UTC32
|
||||
public const byte MaxFlow = 3; // 0x00000008 ;The maximum flow of the current FDR period UTC32n -… UTC32n-1
|
||||
public const byte MaxFlow = 3; // 0x00000008 ;The maximum flow of the current FDR period UTC32n … UTC32n1
|
||||
public const byte MaxFlowTime = 4; // 0x00000010 ;The Date/Time information when Qmax happened in the FDR period
|
||||
public const byte PeakFlow = 5; // 0x00000020 ;The peak flow of the current FDR period
|
||||
public const byte PeakFlowTime = 6; // 0x00000040 ;The Date/Time information when Qpeak happened in the FDR period
|
||||
@ -232,16 +195,16 @@
|
||||
public const byte MinFlowTime = 11; // 0x00000800 ;The Date/Time information when Qmin happened in the FDR period
|
||||
public const byte ForwardCounter = 12; // 0x00001000 ;The forward counter at UTC32
|
||||
public const byte _UTC32 = 13; // 0x00002000 ;Date/Time information when the record was stored.
|
||||
public const byte _MaskSelector_1_1 = 14; // 0x00004000 ;Two selector bits to switch the bitmask of the RF-communication between the internal pages
|
||||
public const byte _MaskSelector_1_2 = 15; // 0x00008000 ;Two selector bits to switch the bitmask of the RF-communication between the internal pages
|
||||
public const byte _MaskSelector_1_1 = 14; // 0x00004000 ;Two selector bits to switch the bitmask of the RFcommunication between the internal pages
|
||||
public const byte _MaskSelector_1_2 = 15; // 0x00008000 ;Two selector bits to switch the bitmask of the RFcommunication between the internal pages
|
||||
public const byte MinPress = 16; // 0x00010000 ;The minimum pressure in the current LOG period
|
||||
public const byte MinPressTime = 17; // 0x00020000 ;The number of 1-second intervals when Pmin happened in the LOG period
|
||||
public const byte MinPressTime = 17; // 0x00020000 ;The number of 1second intervals when Pmin happened in the LOG period
|
||||
public const byte MaxPress = 18; // 0x00040000 ;The maximum pressure in the current LOG period
|
||||
public const byte MaxPressTime = 19; // 0x00080000 ;The number of 1-second intervals when Pmax happened in the LOG period
|
||||
public const byte MaxPressTime = 19; // 0x00080000 ;The number of 1second intervals when Pmax happened in the LOG period
|
||||
public const byte MinTemp = 20; // 0x00100000 ;The minimum temperature in the current LOG period
|
||||
public const byte MinTempTime = 21; // 0x00200000 ;The number of 1-second intervals when Tmin happened in the LOG period
|
||||
public const byte MinTempTime = 21; // 0x00200000 ;The number of 1second intervals when Tmin happened in the LOG period
|
||||
public const byte MaxTemp = 22; // 0x00400000 ;The maximum temperature in the current LOG period
|
||||
public const byte MaxTempTime = 23; // 0x00800000 ;The number of 1-second intervals when Tmax happened in the LOG period
|
||||
public const byte MaxTempTime = 23; // 0x00800000 ;The number of 1second intervals when Tmax happened in the LOG period
|
||||
public const byte CurrentPress = 24; // 0x01000000 ;The last measured instantaneous pressure at RTC32
|
||||
public const byte CurrentTemp = 25; // 0x02000000 ;The last measured instantaneous temperature at RTC32
|
||||
public const byte ExtendedAlarm = 26; // 0x04000000 ;Similar to the AlarmStatus; P and T related Alarms.
|
||||
@ -288,43 +251,6 @@
|
||||
};
|
||||
}
|
||||
|
||||
[Flags]
|
||||
enum LogContentHex : uint
|
||||
{
|
||||
AlarmStatus = 0x00000001, // ;The active alarm information at UTC32
|
||||
BillingCounter = 0x00000002, // ;The billing counter at UTC32
|
||||
ReverseCounter = 0x00000004, // ;The reverse counter at UTC32
|
||||
MaxFlow = 0x00000008, // ;The maximum flow of the current FDR period UTC32n -… UTC32n-1
|
||||
MaxFlowTime = 0x00000010, // ;The Date/Time information when Qmax happened in the FDR period
|
||||
PeakFlow = 0x00000020, // ;The peak flow of the current FDR period
|
||||
PeakFlowTime = 0x00000040, // ;The Date/Time information when Qpeak happened in the FDR period
|
||||
AvgFlow = 0x00000080, // ;The average flow rate in the current FDR period
|
||||
BrokenPipe = 0x00000100, // ;The weak flow in the current FDR period
|
||||
BrokenPipeTime = 0x00000200, // ;The Date/Time information when Qweak happened in the FDR period
|
||||
MinFlow = 0x00000400, // ;The minimum flow in the current FDR period
|
||||
MinFlowTime = 0x00000800, // ;The Date/Time information when Qmin happened in the FDR period
|
||||
ForwardCounter = 0x00001000, // ;The forward counter at UTC32
|
||||
_UTC32 = 0x00002000, // ;Date/Time information when the record was stored.
|
||||
_MaskSelector_1_1 = 0x00004000, // ;Two selector bits to switch the bitmask of the RF-communication between the internal pages
|
||||
_MaskSelector_1_2 = 0x00008000, // ;
|
||||
MinPress = 0x00010000, // ;The minimum pressure in the current LOG period
|
||||
MinPressTime = 0x00020000, // ;The number of 1-second intervals when Pmin happened in the LOG period
|
||||
MaxPress = 0x00040000, // ;The maximum pressure in the current LOG period
|
||||
MaxPressTime = 0x00080000, // ;The number of 1-second intervals when Pmax happened in the LOG period
|
||||
MinTemp = 0x00100000, // ;The minimum temperature in the current LOG period
|
||||
MinTempTime = 0x00200000, // ;The number of 1-second intervals when Tmin happened in the LOG period
|
||||
MaxTemp = 0x00400000, // ;The maximum temperature in the current LOG period
|
||||
MaxTempTime = 0x00800000, // ;The number of 1-second intervals when Tmax happened in the LOG period
|
||||
CurrentPress = 0x01000000, // ;The last measured instantaneous pressure at RTC32
|
||||
CurrentTemp = 0x02000000, // ;The last measured instantaneous temperature at RTC32
|
||||
ExtendedAlarm = 0x04000000, // ;"Similar to the AlarmStatus; P and T related Alarms. "
|
||||
_RecordCheckSum = 0x08000000, // ;A Checksum across the entire FDR record
|
||||
_Reserved_1 = 0x10000000, // ;A reserved mask for a further item
|
||||
_Reserved_2 = 0x20000000, // ;A reserved mask for a further item
|
||||
_MaskSelector_2_1 = 0x40000000, // ;The mirror of the MaskSelector_1
|
||||
_MaskSelector_2_2 = 0x80000000, // ;The mirror of the MaskSelector_2
|
||||
}
|
||||
|
||||
class AlarmMask
|
||||
{
|
||||
public const byte ALARM_REBOOT = 0; // immer An
|
||||
@ -344,209 +270,28 @@
|
||||
public const byte ALARM_METROLOGY_PARAMS = 14;
|
||||
public const byte ALARM_METROLOGY_MEASURE = 15;
|
||||
public const byte ALARM_MAX = 16;
|
||||
}; // ' CSD ', IIF(i.CSD_Wert IS NULL, i.CSD_Charcode, 'mit neue konfiguration')
|
||||
|
||||
public static void Main1()
|
||||
{
|
||||
Console.WriteLine(BitConverter.ToInt32(new byte[] { 0xE9, 0xFF, 0xFF, 0xFF }, 0));
|
||||
Console.WriteLine(BitConverter.ToInt32(new byte[] { 0xAD, 0xFF, 0xFF, 0xFF }, 0));
|
||||
Console.WriteLine(BitConverter.ToInt32(new byte[] { 0xE6, 0xFF, 0xFF, 0xFF }, 0));
|
||||
Console.WriteLine(BitConverter.ToInt32(new byte[] { 0x03, 0x00, 0x00, 0x00 }, 0));
|
||||
//var alarmMask = 1 << AlarmMask.ALARM_REBOOT
|
||||
// | 1 << AlarmMask.ALARM_LOW_BATTERY
|
||||
// | 0 << AlarmMask.ALARM_VERY_LOW_BATTERY
|
||||
// | 0 << AlarmMask.ALARM_CONFIG_ERROR
|
||||
// | 1 << AlarmMask.ALARM_EMPTY_PIPE
|
||||
// | 0 << AlarmMask.ALARM_MAGNETIC_TAMPER
|
||||
// | 1 << AlarmMask.ALARM_REVERSE_FLOW
|
||||
// | 1 << AlarmMask.ALARM_SUSPECT_LEAK
|
||||
// | 1 << AlarmMask.ALARM_BROKEN_PIPE
|
||||
// | 0 << AlarmMask.ALARM_LOW_PRESSURE
|
||||
// | 0 << AlarmMask.ALARM_HIGH_PRESSURE
|
||||
// | 0 << AlarmMask.ALARM_LOW_TEMPERATURE
|
||||
// | 0 << AlarmMask.ALARM_HIGH_TEMPERATURE
|
||||
// | 0 << AlarmMask.ALARM_RADIO_ERROR
|
||||
// | 0 << AlarmMask.ALARM_METROLOGY_PARAMS
|
||||
// | 0 << AlarmMask.ALARM_METROLOGY_MEASURE
|
||||
// | 0 << AlarmMask.ALARM_MAX;
|
||||
//var alarmBytes = BitConverter.GetBytes(alarmMask);
|
||||
//Array.Reverse(alarmBytes);
|
||||
//Console.WriteLine($"ALARM_MASK: {alarmMask} - {BitConverter.ToString(alarmBytes).Replace("-", "")}");
|
||||
public static string[] BitMask = new string[]
|
||||
{
|
||||
"ALARM_REBOOT",
|
||||
"ALARM_LOW_BATTERY",
|
||||
"ALARM_VERY_LOW_BATTERY",
|
||||
"ALARM_CONFIG_ERROR",
|
||||
"ALARM_EMPTY_PIPE",
|
||||
"ALARM_MAGNETIC_TAMPER",
|
||||
"ALARM_REVERSE_FLOW",
|
||||
"ALARM_SUSPECT_LEAK",
|
||||
"ALARM_BROKEN_PIPE",
|
||||
"ALARM_LOW_PRESSURE",
|
||||
"ALARM_HIGH_PRESSURE",
|
||||
"ALARM_LOW_TEMPERATURE",
|
||||
"ALARM_HIGH_TEMPERATURE",
|
||||
"ALARM_RADIO_ERROR",
|
||||
"ALARM_METROLOGY_PARAMS",
|
||||
"ALARM_METROLOGY_MEASURE",
|
||||
"ALARM_MAX",
|
||||
};
|
||||
|
||||
//var dataLogger = 1 << FDRMask.LOG_ALARM_STATE
|
||||
// | 1 << FDRMask.LOG_BILLING_COUNTER
|
||||
// | 0 << FDRMask.LOG_REVERSE_COUNTER
|
||||
// | 0 << FDRMask.LOG_MAX_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_FLOW_TIME
|
||||
// | 0 << FDRMask.LOG_PEAK_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_PEAK_FLOW_TIME
|
||||
// | 1 << FDRMask.LOG_CUR_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_BROKEN_PIPE_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_BROKEN_PIPE_FLOW_TIME
|
||||
// | 1 << FDRMask.LOG_MIN_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_FLOW_TIME
|
||||
// | 0 << FDRMask.LOG_FORWARD_COUNTER
|
||||
// | 0 << FDRMask.LOG_MIN_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_PRESS_TIME
|
||||
// | 0 << FDRMask.LOG_MAX_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_PRESS_TIME
|
||||
// | 0 << FDRMask.LOG_MIN_TEMP_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_TEMP_TIME
|
||||
// | 0 << FDRMask.LOG_MAX_TEMP_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_TEMP_TIME
|
||||
// | 0 << FDRMask.LOG_CUR_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_CUR_TEMP_VAL
|
||||
// | 1 << FDRMask.LOG_EXT_ALARM_STATE;
|
||||
|
||||
//var dataLoggerBytes = BitConverter.GetBytes(dataLogger);
|
||||
//Array.Reverse(dataLoggerBytes);
|
||||
//Console.WriteLine($"DATA_LOGGER: {dataLogger} - {BitConverter.ToString(dataLoggerBytes).Replace("-", "")}");
|
||||
|
||||
//var fixDateReading = 1 << FDRMask.LOG_ALARM_STATE
|
||||
// | 1 << FDRMask.LOG_BILLING_COUNTER
|
||||
// | 0 << FDRMask.LOG_REVERSE_COUNTER
|
||||
// | 0 << FDRMask.LOG_MAX_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_FLOW_TIME
|
||||
// | 0 << FDRMask.LOG_PEAK_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_PEAK_FLOW_TIME
|
||||
// | 1 << FDRMask.LOG_CUR_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_BROKEN_PIPE_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_BROKEN_PIPE_FLOW_TIME
|
||||
// | 1 << FDRMask.LOG_MIN_FLOW_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_FLOW_TIME
|
||||
// | 0 << FDRMask.LOG_FORWARD_COUNTER
|
||||
// | 0 << FDRMask.LOG_MIN_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_PRESS_TIME
|
||||
// | 0 << FDRMask.LOG_MAX_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_PRESS_TIME
|
||||
// | 0 << FDRMask.LOG_MIN_TEMP_VAL
|
||||
// | 0 << FDRMask.LOG_MIN_TEMP_TIME
|
||||
// | 0 << FDRMask.LOG_MAX_TEMP_VAL
|
||||
// | 0 << FDRMask.LOG_MAX_TEMP_TIME
|
||||
// | 0 << FDRMask.LOG_CUR_PRESS_VAL
|
||||
// | 0 << FDRMask.LOG_CUR_TEMP_VAL
|
||||
// | 1 << FDRMask.LOG_EXT_ALARM_STATE;
|
||||
|
||||
//var fixDateReadingBytes = BitConverter.GetBytes(fixDateReading);
|
||||
//Array.Reverse(fixDateReadingBytes);
|
||||
//Console.WriteLine($"FDR_LOGGER: {fixDateReading} - {BitConverter.ToString(fixDateReadingBytes).Replace("-", "")}");
|
||||
|
||||
//var x1 = 0xD29F;
|
||||
//var x2 = 0xD39F;
|
||||
|
||||
//Console.WriteLine(new string('=', 50));
|
||||
//Console.WriteLine($"ALARM_REBOOT: [{(int)AlarmMask.ALARM_REBOOT,2}] {(x1 >> AlarmMask.ALARM_REBOOT) % 2} {(x2 >> AlarmMask.ALARM_REBOOT) % 2} ");
|
||||
//Console.WriteLine($"ALARM_LOW_BATTERY: [{(int)AlarmMask.ALARM_LOW_BATTERY,2}] {(x1 >> AlarmMask.ALARM_LOW_BATTERY) % 2} {(x2 >> AlarmMask.ALARM_LOW_BATTERY) % 2} ");
|
||||
//Console.WriteLine($"ALARM_VERY_LOW_BATTERY: [{(int)AlarmMask.ALARM_VERY_LOW_BATTERY,2}] {(x1 >> AlarmMask.ALARM_VERY_LOW_BATTERY) % 2} {(x2 >> AlarmMask.ALARM_VERY_LOW_BATTERY) % 2} ");
|
||||
//Console.WriteLine($"ALARM_CONFIG_ERROR: [{(int)AlarmMask.ALARM_CONFIG_ERROR,2}] {(x1 >> AlarmMask.ALARM_CONFIG_ERROR) % 2} {(x2 >> AlarmMask.ALARM_CONFIG_ERROR) % 2} ");
|
||||
//Console.WriteLine($"ALARM_EMPTY_PIPE: [{(int)AlarmMask.ALARM_EMPTY_PIPE,2}] {(x1 >> AlarmMask.ALARM_EMPTY_PIPE) % 2} {(x2 >> AlarmMask.ALARM_EMPTY_PIPE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_MAGNETIC_TAMPER: [{(int)AlarmMask.ALARM_MAGNETIC_TAMPER,2}] {(x1 >> AlarmMask.ALARM_MAGNETIC_TAMPER) % 2} {(x2 >> AlarmMask.ALARM_MAGNETIC_TAMPER) % 2} ");
|
||||
//Console.WriteLine($"ALARM_REVERSE_FLOW: [{(int)AlarmMask.ALARM_REVERSE_FLOW,2}] {(x1 >> AlarmMask.ALARM_REVERSE_FLOW) % 2} {(x2 >> AlarmMask.ALARM_REVERSE_FLOW) % 2} ");
|
||||
//Console.WriteLine($"ALARM_SUSPECT_LEAK: [{(int)AlarmMask.ALARM_SUSPECT_LEAK,2}] {(x1 >> AlarmMask.ALARM_SUSPECT_LEAK) % 2} {(x2 >> AlarmMask.ALARM_SUSPECT_LEAK) % 2} ");
|
||||
//Console.WriteLine($"ALARM_BROKEN_PIPE: [{(int)AlarmMask.ALARM_BROKEN_PIPE,2}] {(x1 >> AlarmMask.ALARM_BROKEN_PIPE) % 2} {(x2 >> AlarmMask.ALARM_BROKEN_PIPE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_LOW_PRESSURE: [{(int)AlarmMask.ALARM_LOW_PRESSURE,2}] {(x1 >> AlarmMask.ALARM_LOW_PRESSURE) % 2} {(x2 >> AlarmMask.ALARM_LOW_PRESSURE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_HIGH_PRESSURE: [{(int)AlarmMask.ALARM_HIGH_PRESSURE,2}] {(x1 >> AlarmMask.ALARM_HIGH_PRESSURE) % 2} {(x2 >> AlarmMask.ALARM_HIGH_PRESSURE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_LOW_TEMPERATURE: [{(int)AlarmMask.ALARM_LOW_TEMPERATURE,2}] {(x1 >> AlarmMask.ALARM_LOW_TEMPERATURE) % 2} {(x2 >> AlarmMask.ALARM_LOW_TEMPERATURE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_HIGH_TEMPERATURE: [{(int)AlarmMask.ALARM_HIGH_TEMPERATURE,2}] {(x1 >> AlarmMask.ALARM_HIGH_TEMPERATURE) % 2} {(x2 >> AlarmMask.ALARM_HIGH_TEMPERATURE) % 2} ");
|
||||
//Console.WriteLine($"ALARM_RADIO_ERROR: [{(int)AlarmMask.ALARM_RADIO_ERROR,2}] {(x1 >> AlarmMask.ALARM_RADIO_ERROR) % 2} {(x2 >> AlarmMask.ALARM_RADIO_ERROR) % 2} ");
|
||||
//Console.WriteLine($"ALARM_METROLOGY_PARAMS: [{(int)AlarmMask.ALARM_METROLOGY_PARAMS,2}] {(x1 >> AlarmMask.ALARM_METROLOGY_PARAMS) % 2} {(x2 >> AlarmMask.ALARM_METROLOGY_PARAMS) % 2} ");
|
||||
//Console.WriteLine($"ALARM_METROLOGY_MEASURE: [{(int)AlarmMask.ALARM_METROLOGY_MEASURE,2}] {(x1 >> AlarmMask.ALARM_METROLOGY_MEASURE) % 2} {(x2 >> AlarmMask.ALARM_METROLOGY_MEASURE) % 2}");
|
||||
//Console.WriteLine($"ALARM_MAX: [{(int)AlarmMask.ALARM_MAX,2}] {(x1 >> AlarmMask.ALARM_MAX) % 2} {(x2 >> AlarmMask.ALARM_MAX) % 2} ");
|
||||
|
||||
|
||||
//Console.WriteLine(int.MaxValue);
|
||||
//Console.WriteLine(uint.MaxValue);
|
||||
//Console.WriteLine(long.MaxValue);
|
||||
|
||||
}
|
||||
|
||||
//public static void /*MainCSD()*/ Main()
|
||||
//{
|
||||
// var alarmEnableMask = 0xD39F0000;
|
||||
// var ix = 0;
|
||||
|
||||
// foreach (var item in Enum.GetValues(typeof(AlarmMask)).Cast<AlarmMask>().OrderBy(x => (uint)x).ToArray())
|
||||
// {
|
||||
// Console.WriteLine($"{item,23} = {item:X} = {(uint)item,5} = {(alarmEnableMask << ix++) & 1}");
|
||||
// }
|
||||
|
||||
// foreach (var item in Enum.GetValues(typeof(FDRMask)).Cast<FDRMask>().OrderBy(x => x).ToArray())
|
||||
// {
|
||||
// Console.WriteLine($"{item} = {item:X} = {(uint)item}");
|
||||
// }
|
||||
|
||||
// ushort value = 3;
|
||||
|
||||
// Console.WriteLine($"0: {value >> 0 & 1}");
|
||||
// Console.WriteLine($"0: {value >> 1 & 1}");
|
||||
// Console.WriteLine($"0: {value >> 2 & 1}");
|
||||
|
||||
// Console.WriteLine("CSD CSD 772161_MW");
|
||||
// Console.WriteLine("=============================================================================");
|
||||
|
||||
// var alarm = AlarmMask.ALARM_REBOOT
|
||||
// | AlarmMask.ALARM_EMPTY_PIPE
|
||||
// | AlarmMask.ALARM_LOW_BATTERY
|
||||
// | AlarmMask.ALARM_REVERSE_FLOW;
|
||||
|
||||
// Console.WriteLine($"CUSTOMER_AlarmVisualMask: {BitConverter.ToString(BitConverter.GetBytes((int)alarm))}");
|
||||
|
||||
|
||||
// var dlg = FDRMask.LOG_BILLING_COUNTER
|
||||
// | FDRMask.LOG_MIN_FLOW_VAL
|
||||
// | FDRMask.LOG_CUR_FLOW_VAL // ... AverageFlow !?
|
||||
// | FDRMask.LOG_ALARM_STATE
|
||||
// | FDRMask.LOG_EXT_ALARM_STATE;
|
||||
|
||||
// Console.WriteLine($"PERIODICLOG_DataLogContents: {BitConverter.ToString(BitConverter.GetBytes((int)dlg))}");
|
||||
|
||||
// var fdr = FDRMask.LOG_BILLING_COUNTER
|
||||
// | FDRMask.LOG_MIN_FLOW_VAL
|
||||
// | FDRMask.LOG_CUR_FLOW_VAL // ... AverageFlow !?
|
||||
// | FDRMask.LOG_ALARM_STATE
|
||||
// | FDRMask.LOG_EXT_ALARM_STATE;
|
||||
|
||||
// Console.WriteLine($"PERIODICLOG_FixedDateReadingContents: {BitConverter.ToString(BitConverter.GetBytes((int)fdr))}");
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// CSD 769400 Arqiva Thames Water
|
||||
/// </summary>
|
||||
public static void Main1231231()
|
||||
{
|
||||
Console.WriteLine("CSD 769400 Arqiva Thames Water");
|
||||
Console.WriteLine("=============================================================================");
|
||||
Console.WriteLine("--- DN50 --------------------------------------------------------------------");
|
||||
Console.WriteLine($"CUSTOMER_ExcessFlowVolumeThreshold: {BitConverter.ToString(BitConverter.GetBytes((int)(37.5 * 1000) / 256))}");
|
||||
|
||||
var alarm = 1 << AlarmMask.ALARM_EMPTY_PIPE
|
||||
| 1 << AlarmMask.ALARM_SUSPECT_LEAK
|
||||
| 1 << AlarmMask.ALARM_LOW_BATTERY
|
||||
| 1 << AlarmMask.ALARM_HIGH_TEMPERATURE
|
||||
| 1 << AlarmMask.ALARM_LOW_TEMPERATURE
|
||||
| 1 << AlarmMask.ALARM_HIGH_PRESSURE
|
||||
| 1 << AlarmMask.ALARM_LOW_PRESSURE;
|
||||
|
||||
Console.WriteLine($"CUSTOMER_AlarmVisualMask: {BitConverter.ToString(BitConverter.GetBytes(alarm))}");
|
||||
|
||||
|
||||
var dlg = 1 <<FDRMask.LOG_BILLING_COUNTER
|
||||
| 1 <<FDRMask.LOG_REVERSE_COUNTER
|
||||
| 1 <<FDRMask.LOG_MIN_FLOW_TIME
|
||||
| 1 <<FDRMask.LOG_MIN_FLOW_VAL
|
||||
| 1 <<FDRMask.LOG_AVG_FLOW_VAL
|
||||
| 1 <<FDRMask.LOG_PEAK_FLOW_TIME
|
||||
| 1 <<FDRMask.LOG_PEAK_FLOW_VAL
|
||||
| 1 <<FDRMask.LOG_MAX_FLOW_TIME
|
||||
| 1 <<FDRMask.LOG_MAX_FLOW_VAL
|
||||
| 1 <<FDRMask.LOG_ALARM_STATE;
|
||||
|
||||
Console.WriteLine($"PERIODICLOG_DataLogContents: {BitConverter.ToString(BitConverter.GetBytes(dlg))}");
|
||||
|
||||
var fdr = 1 << FDRMask.LOG_BILLING_COUNTER
|
||||
| 1 << FDRMask.LOG_ALARM_STATE;
|
||||
|
||||
Console.WriteLine($"PERIODICLOG_FixedDateReadingContents: {BitConverter.ToString(BitConverter.GetBytes(fdr))}");
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@ -16,21 +16,23 @@
|
||||
<Deterministic>true</Deterministic>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<TargetFrameworkProfile />
|
||||
<PublishUrl>Z:\Aktuelle Anwendungen\Publish\Cordonel Assembly Line\</PublishUrl>
|
||||
<PublishUrl>\\sla12file\auftrag\Aktuelle Anwendungen\Publish\Cordonel Assembly Line\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateEnabled>true</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<UpdateUrl>\\sla12file\auftrag\Aktuelle Anwendungen\Publish\Cordonel Assembly Line\</UpdateUrl>
|
||||
<ProductName>Cordonel Assembly Line</ProductName>
|
||||
<PublisherName>Xylem Sensus Laatzen</PublisherName>
|
||||
<SuiteName>Cordonel Assembly Line</SuiteName>
|
||||
<WebPage>publish.htm</WebPage>
|
||||
<ApplicationRevision>31</ApplicationRevision>
|
||||
<AutorunEnabled>true</AutorunEnabled>
|
||||
<ApplicationRevision>33</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||
|
||||
@ -626,10 +626,10 @@ namespace CordonelAssemblyLine.Model
|
||||
|
||||
|
||||
if (genesisStatus.AlternativeRequiredBatteryLoadPercent != null
|
||||
&& genesisStatus.AlternativeRequiredBatteryLoadPercent < genesisStatus.DrainedBatteryLoadPercent - 0.5)
|
||||
&& genesisStatus.AlternativeRequiredBatteryLoadPercent < genesisStatus.DrainedBatteryLoadPercent + 0.5)
|
||||
{
|
||||
sbMSG.AppendLine($"{nameof(genesisStatus.AlternativeRequiredBatteryLoadPercent)}: " +
|
||||
$"{genesisStatus.AlternativeRequiredBatteryLoadPercent} < " + $"{genesisStatus.DrainedBatteryLoadPercent}");
|
||||
$"{genesisStatus.AlternativeRequiredBatteryLoadPercent} < " + $"{genesisStatus.DrainedBatteryLoadPercent + 0.5}");
|
||||
ret = false;
|
||||
}
|
||||
|
||||
@ -830,8 +830,9 @@ namespace CordonelAssemblyLine.Model
|
||||
|
||||
if (bool.TryParse(retString, out var result))
|
||||
{
|
||||
Result = $"SetPickingState = {result}";
|
||||
SetState(Result);
|
||||
return result;
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1056,6 +1057,9 @@ namespace CordonelAssemblyLine.Model
|
||||
}
|
||||
|
||||
// _barScanner.Input = "3251943";
|
||||
// _barScanner.Input = "3250541";
|
||||
// _barScanner.Input = "3251029";
|
||||
// _barScanner.Input = "3250910";
|
||||
|
||||
if (_barScanner != null && !string.IsNullOrEmpty(_barScanner.Input))
|
||||
{
|
||||
|
||||
@ -168,10 +168,10 @@
|
||||
message.Frequency = this.Frequency;
|
||||
message.SirtId = this.Id;
|
||||
|
||||
if (this.chanelsMap.TryGetValue(message.Address, out var chanel))
|
||||
{
|
||||
chanel.Receive(message);
|
||||
}
|
||||
//if (this.chanelsMap.TryGetValue(message.Address, out var chanel))
|
||||
//{
|
||||
// chanel.Receive(message);
|
||||
//}
|
||||
|
||||
this.MessageReceived?.Invoke(message);
|
||||
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
Data = new ChangeWakeUp(WakeUpMode.StayAwake)
|
||||
.Append(new ChangeNumberOfLatWindows(this.parameters.LatWindowsInitialization))
|
||||
.Append(new ChangeTransmissionInterval(this.parameters.TransmissionIntervalInitialization))
|
||||
// .Append(new ChangeSensusRFEncryptionKey(features.EncryptionKey))
|
||||
.Append(new ChangeSensusRFEncryptionKey(features.EncryptionKey))
|
||||
.Append(new ProvidePin(AuthLevel.II)),
|
||||
Timeout = 10_000
|
||||
});
|
||||
@ -129,6 +129,8 @@
|
||||
.Append(new ChangeTransmissionInterval(this.parameters.Transmission_Intervall))
|
||||
.Append(new ProvidePin(AuthLevel.II)),
|
||||
});
|
||||
|
||||
this.LoadProgrammingParameters(features);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -204,32 +204,32 @@
|
||||
this.SetPending();
|
||||
}
|
||||
|
||||
protected override bool UseEncryption(SIRTMessage response)
|
||||
{
|
||||
if (response is null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
//protected override bool UseEncryption(SIRTMessage response)
|
||||
//{
|
||||
// if (response is null)
|
||||
// {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
var payload = response.Payload;
|
||||
// var payload = response.Payload;
|
||||
|
||||
if (payload is null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// if (payload is null)
|
||||
// {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
var payloadLength = payload.Length;
|
||||
// var payloadLength = payload.Length;
|
||||
|
||||
if (payloadLength == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// if (payloadLength == 0)
|
||||
// {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
this.IsEncrypted = (payloadLength == 13 && payload.GetCrc() != 0) // is bup encrypted
|
||||
|| response.Payload.Length == 54 // is debug encrypted
|
||||
|| response.Payload.Length == 93; // is semi encrypted
|
||||
// this.IsEncrypted = (payloadLength == 13 && payload.GetCrc() != 0) // is bup encrypted
|
||||
// || response.Payload.Length == 54 // is debug encrypted
|
||||
// || response.Payload.Length == 93; // is semi encrypted
|
||||
|
||||
return this.IsEncrypted;
|
||||
}
|
||||
// return this.IsEncrypted;
|
||||
//}
|
||||
}
|
||||
}
|
||||
@ -4,6 +4,7 @@
|
||||
{
|
||||
Residential = 0,
|
||||
CandI = 1,
|
||||
Other_0x0A = 10,
|
||||
Residential__0x0B = 11,
|
||||
CandI__0x0C = 12,
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 653498d43dcca1234a8fba95959ca02bb2c3f480
|
||||
Subproject commit 1cd877ff8628cdcb94a7ad2751d61dc77e1211da
|
||||
@ -6,7 +6,7 @@
|
||||
<appSettings>
|
||||
<!--<add key="ConnectionString" value="Server=SLASQL01.emea.sensus.net; Database=Testreplikation; User ID=sa; Password=sqlserver;" />-->
|
||||
<add key="ConnectionString" value="Server=DELAZ1SQL01.world.fluidtechnology.net; Database=Auftrag; User ID=sa; Password=sqlserver;" />
|
||||
<add key="EncryptionKeisUrl" value="http://sla12iis01.emea.sensus.net/LaaProductionWeb/api/eregister/radiokey/byserialno/{0}" />
|
||||
<add key="EncryptionKeisUrl" value="http://sla12iis01/LaaProductionWeb/api/eregister/radiokey/byserialno/{0}" />
|
||||
<add key="SIRTComPorts" value="COM6,COM7" />
|
||||
<add key="PSNR" value="1000" />
|
||||
<add key="SIRT_433" value=""/>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
if (!this.ShutdownRunningInstance())
|
||||
{
|
||||
var mainWindow = new MainWindow();
|
||||
var args = e.Args; // new object[] { "EregisterInitialize", 146 }; //
|
||||
var args = e.Args; // new object[] { "EregisterFinalize", 1152 }; //
|
||||
var argsLength = args?.Length ?? 0;
|
||||
|
||||
if (argsLength > 0)
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
this.sharedId = AuftragDbContext.P2000Shared.FindSharedId(psnr, "EregisterFinalize");
|
||||
var parametersList = AuftragDbContext.LoadEregisterProgrammingParametersListForSharedId(this.sharedId);
|
||||
|
||||
this.LoadEncryptionKeys(parametersList);
|
||||
this.LoadEncryptionKeysAsync(parametersList).Wait();
|
||||
|
||||
var programmingTasksEnumerable = this.eregisterFactory
|
||||
.LoadInspectionFinalizationTasks(parametersList)
|
||||
|
||||
@ -88,7 +88,7 @@
|
||||
});
|
||||
|
||||
protected virtual void PrepareProgramming()
|
||||
{
|
||||
{
|
||||
if (!int.TryParse($"{Appsettings.GetSetting("PSNR")}", out var psnr))
|
||||
{
|
||||
MessageBox.Show("Prüfstationnummer ist nicht konfiguriert.", "Fehler");
|
||||
@ -99,7 +99,8 @@
|
||||
this.sharedId = AuftragDbContext.P2000Shared.FindSharedId(psnr, "EregisterInitialize");
|
||||
var parametersList = AuftragDbContext.LoadEregisterProgrammingParametersListForSharedId(this.sharedId);
|
||||
|
||||
this.LoadEncryptionKeys(parametersList);
|
||||
this.LoadEncryptionKeysAsync(parametersList)
|
||||
.Wait();
|
||||
|
||||
var programmingTasks = this.eregisterFactory
|
||||
.LoadInspectionInitializationTasks(parametersList)
|
||||
@ -108,7 +109,7 @@
|
||||
this.UpdateUIProgrammingTasks(programmingTasks);
|
||||
}
|
||||
|
||||
protected async void LoadEncryptionKeys(EregisterProgrammingParametersList parametersList)
|
||||
protected async Task LoadEncryptionKeysAsync(EregisterProgrammingParametersList parametersList)
|
||||
{
|
||||
var keyStore = new SQLiteKeyStore();
|
||||
var uriFormat = Appsettings.GetSetting("EncryptionKeisUrl");
|
||||
@ -117,12 +118,12 @@
|
||||
|
||||
foreach (var epp in parametersList)
|
||||
{
|
||||
if (keyStore.TryGetKey((uint)epp.TempAdresse, (uint)epp.Adresse, out encryptionKey))
|
||||
{
|
||||
epp.EncryptionKey = encryptionKey;
|
||||
epp.IsValid = true;
|
||||
}
|
||||
else
|
||||
//if (keyStore.TryGetKey((uint)epp.TempAdresse, (uint)epp.Adresse, out encryptionKey))
|
||||
//{
|
||||
// epp.EncryptionKey = encryptionKey;
|
||||
// epp.IsValid = true;
|
||||
//}
|
||||
//else
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user