diff --git a/Common/Common.sln b/Common/Common.sln index 63d1b71b..d93b1eda 100644 --- a/Common/Common.sln +++ b/Common/Common.sln @@ -181,8 +181,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIRTBroadcaster.Client", "S EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SIRT", "SIRT", "{AF973E0E-2B44-4F1A-B1E7-77C8B4F30579}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsole", "TestConsole\TestConsole.csproj", "{A912EB1F-39CD-4499-9250-5DCD789CA9DB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIRTBroadcaster.Host", "SIRTBroadcaster.Host\SIRTBroadcaster.Host.csproj", "{A9D1A99D-6E55-4394-86AD-B5C53E9225EB}" EndProject Global @@ -4187,70 +4185,6 @@ Global {4221F992-599E-498C-A409-6D1E70E0A6F9}.XP32bit|x64.Build.0 = Release|Any CPU {4221F992-599E-498C-A409-6D1E70E0A6F9}.XP32bit|x86.ActiveCfg = Release|Any CPU {4221F992-599E-498C-A409-6D1E70E0A6F9}.XP32bit|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.COM|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|x64.ActiveCfg = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|x64.Build.0 = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|x86.ActiveCfg = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Debug|x86.Build.0 = Debug|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.PerformTest|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.Release|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.ReleaseTest|x86.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|Any CPU.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|x64.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|x64.Build.0 = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|x86.ActiveCfg = Release|Any CPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB}.XP32bit|x86.Build.0 = Release|Any CPU {A9D1A99D-6E55-4394-86AD-B5C53E9225EB}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU {A9D1A99D-6E55-4394-86AD-B5C53E9225EB}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU {A9D1A99D-6E55-4394-86AD-B5C53E9225EB}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -4397,7 +4331,6 @@ Global {C27BA66C-C3A7-48A2-A644-CBA77E28E531} = {AF973E0E-2B44-4F1A-B1E7-77C8B4F30579} {4221F992-599E-498C-A409-6D1E70E0A6F9} = {AF973E0E-2B44-4F1A-B1E7-77C8B4F30579} {AF973E0E-2B44-4F1A-B1E7-77C8B4F30579} = {99B23EE9-CE50-4924-A055-C39EFA038721} - {A912EB1F-39CD-4499-9250-5DCD789CA9DB} = {C17363DF-A043-4F25-8EBA-2B3B078227DC} {A9D1A99D-6E55-4394-86AD-B5C53E9225EB} = {AF973E0E-2B44-4F1A-B1E7-77C8B4F30579} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/Common/TestConsole/App.config b/Common/TestConsole/App.config deleted file mode 100644 index aee9adf4..00000000 --- a/Common/TestConsole/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Common/TestConsole/Program.cs b/Common/TestConsole/Program.cs deleted file mode 100644 index 889a2c5d..00000000 --- a/Common/TestConsole/Program.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace TestConsole -{ - using System; - - class Program - { - static void Main(string[] args) - { - //uint address = 536870912; - //var addressBytes = BitConverter.GetBytes(address); - - //Console.WriteLine(BitConverter.ToString(addressBytes)); - - //var a = BitConverter.ToUInt32(addressBytes, 0); - //var b = BitConverter.ToUInt32(addressBytes.Reverse().ToArray(), 0); - - //Console.WriteLine($"a: {a}"); - //Console.WriteLine($"b: {b}"); - - for (byte i = 0; true; i++) - { - Console.WriteLine($"0x{i:X2} = {i}"); - - if (i == byte.MaxValue) - { - break; - } - } - } - } -} diff --git a/Common/TestConsole/Properties/AssemblyInfo.cs b/Common/TestConsole/Properties/AssemblyInfo.cs deleted file mode 100644 index d7640a9d..00000000 --- a/Common/TestConsole/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("TestConsole")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TestConsole")] -[assembly: AssemblyCopyright("Copyright © 2023")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a912eb1f-39cd-4499-9250-5dcd789ca9db")] - -// 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")] diff --git a/Common/TestConsole/TestConsole.csproj b/Common/TestConsole/TestConsole.csproj deleted file mode 100644 index 5337a8c0..00000000 --- a/Common/TestConsole/TestConsole.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Debug - AnyCPU - {A912EB1F-39CD-4499-9250-5DCD789CA9DB} - Exe - TestConsole - TestConsole - v4.8.1 - 512 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - {C27BA66C-C3A7-48A2-A644-CBA77E28E531} - SIRTBroadcaster.Abstraction - - - - \ No newline at end of file diff --git a/Common/TestConsole/packages.config b/Common/TestConsole/packages.config deleted file mode 100644 index c865026e..00000000 --- a/Common/TestConsole/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Common/VB6UIComponents/Properties/AssemblyInfo.cs b/Common/VB6UIComponents/Properties/AssemblyInfo.cs deleted file mode 100644 index 20c1648e..00000000 --- a/Common/VB6UIComponents/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("VB6UIComponents")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VB6UIComponents")] -[assembly: AssemblyCopyright("Copyright © 2023")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6f3f5fec-9f0a-40c2-a4b7-ec83ddbb649a")] - -// 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")] diff --git a/Common/VB6UIComponents/Pruefzaehler.Designer.cs b/Common/VB6UIComponents/Pruefzaehler.Designer.cs deleted file mode 100644 index a8c3d425..00000000 --- a/Common/VB6UIComponents/Pruefzaehler.Designer.cs +++ /dev/null @@ -1,38 +0,0 @@ -namespace VB6UIComponents -{ - partial class Pruefzaehler - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - } - - #endregion - } -} diff --git a/Common/VB6UIComponents/Pruefzaehler.cs b/Common/VB6UIComponents/Pruefzaehler.cs deleted file mode 100644 index 67707b5d..00000000 --- a/Common/VB6UIComponents/Pruefzaehler.cs +++ /dev/null @@ -1,61 +0,0 @@ -namespace VB6UIComponents -{ - using System.Runtime.InteropServices; - using System.Windows.Forms; - - [ComVisible(true)] - [Guid("80D7925C-0BB6-48D2-8674-743E313E76B6")] - public partial class Pruefzaehler: UserControl - { - public Pruefzaehler() => this.InitializeComponent(); - - public void AddMeter(int slotNr, int serialNr, uint address) - { - - } - } - - public partial class Einbauplatz - { - /// - /// byte weil es nur maximal ~12 einbauplätze gibt. - /// - public byte SlotNr { get; set; } - - public long SerialNr { get; set; } - - public bool IsClosed { get; set; } - - /// - /// immer gleich Fabrikationsnummer. - /// - public long PcbId { get; set; } - - public int RF { get; set; } - - public uint Address - => this.IsClosed - ? this.FinalAddress - : this.TempAddress; - - public uint TempAddress { get; set; } - - public uint FinalAddress { get; set; } - - public short MeterSize { get; set; } - - public bool IsRueklaufer { get; set; } - } - - public partial class Einbauplatz - { - private const string LOAD_BY_SERIAL_NR = @" -SELECT [Frequenz] - , [TempAdresse] - , [Adresse] AS [FinalAddress] - , [Fabrikationsnummer] AS [PcbId] - , CAST(CASE WHEN [GeschlossenDatum] IS NULL THEN 1 ELSE 0 END AS BIT) AS [IsClosed] - FROM [eRegister] - WHERE [Seriennummer] = {0} -- BIGINT"; - } -} diff --git a/Common/VB6UIComponents/VB6UIComponents.csproj b/Common/VB6UIComponents/VB6UIComponents.csproj deleted file mode 100644 index bbcade37..00000000 --- a/Common/VB6UIComponents/VB6UIComponents.csproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Debug - AnyCPU - {6F3F5FEC-9F0A-40C2-A4B7-EC83DDBB649A} - Library - VB6UIComponents - VB6UIComponents - v4.8.1 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - UserControl - - - Pruefzaehler.cs - - - - - - \ No newline at end of file