From 43e628502c170e26f5b83381dc23167bcc3a8f67 Mon Sep 17 00:00:00 2001
From: ig <ig ig@devnullmail.com>
Date: Tue, 13 Jun 2023 11:26:48 +0200
Subject: [PATCH] Introduce Lib for Adam6360D

---
 csharp/Lib/Devices/Adam6360D/Adam6360D.csproj |  11 ++++------
 .../Lib/Devices/Adam6360D/Adam6360DDevice.cs  |   3 ++-
 .../Devices/Adam6360D/Adam6360DRegisters.cs   |   6 ++++--
 ...ADAM-6360D-A1_DS(080321)20210804101056.pdf | Bin
 csharp/Lib/Devices/Adam6360D/Program.cs       |  20 ++++++++++++++++++
 5 files changed, 30 insertions(+), 10 deletions(-)
 rename csharp/Lib/Devices/{Adam6060 => Adam6360D}/Doc/ADAM-6360D-A1_DS(080321)20210804101056.pdf (100%)
 create mode 100644 csharp/Lib/Devices/Adam6360D/Program.cs

diff --git a/csharp/Lib/Devices/Adam6360D/Adam6360D.csproj b/csharp/Lib/Devices/Adam6360D/Adam6360D.csproj
index f4fcbcbb6..0b06d7c44 100644
--- a/csharp/Lib/Devices/Adam6360D/Adam6360D.csproj
+++ b/csharp/Lib/Devices/Adam6360D/Adam6360D.csproj
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../InnovEnergy.lib.props" />
-
-  <PropertyGroup>
-    <AssemblyName>InnovEnergy.Lib.Devices.Adam6060</AssemblyName>
-    <RootNamespace>InnovEnergy.Lib.Devices.Adam6060</RootNamespace>
-    <!-- <OutputType>Exe</OutputType> -->
-  </PropertyGroup>
+<!--  <Import Project="../../InnovEnergy.Lib.props" />-->
+  
+  <Import Project="../../../App/InnovEnergy.App.props" />
 
   <ItemGroup>
     <ProjectReference Include="../../Protocols/Modbus/Modbus.csproj" />
+    <ProjectReference Include="../../Units/Units.csproj" />
   </ItemGroup>
   
 </Project>
diff --git a/csharp/Lib/Devices/Adam6360D/Adam6360DDevice.cs b/csharp/Lib/Devices/Adam6360D/Adam6360DDevice.cs
index d2b754de4..7a91d9e87 100644
--- a/csharp/Lib/Devices/Adam6360D/Adam6360DDevice.cs
+++ b/csharp/Lib/Devices/Adam6360D/Adam6360DDevice.cs
@@ -2,7 +2,7 @@ using InnovEnergy.Lib.Protocols.Modbus.Channels;
 using InnovEnergy.Lib.Protocols.Modbus.Clients;
 using InnovEnergy.Lib.Protocols.Modbus.Slaves;
 
-namespace InnovEnergy.Lib.Devices.Adam6060;
+namespace InnovEnergy.Lib.Devices.Adam6360D;
 
 public class Adam6360DDevice : ModbusDevice<Adam6360DRegisters>
 {
@@ -12,6 +12,7 @@ public class Adam6360DDevice : ModbusDevice<Adam6360DRegisters>
     {
     }
 
+    
     public Adam6360DDevice(Channel channel, Byte slaveId) : base(new ModbusTcpClient(channel, slaveId))
     {
     }
diff --git a/csharp/Lib/Devices/Adam6360D/Adam6360DRegisters.cs b/csharp/Lib/Devices/Adam6360D/Adam6360DRegisters.cs
index 8a146ee5d..9717e5b48 100644
--- a/csharp/Lib/Devices/Adam6360D/Adam6360DRegisters.cs
+++ b/csharp/Lib/Devices/Adam6360D/Adam6360DRegisters.cs
@@ -1,10 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using InnovEnergy.Lib.Protocols.Modbus.Reflection.Attributes;
 
-namespace InnovEnergy.Lib.Devices.Adam6060;
+namespace InnovEnergy.Lib.Devices.Adam6360D;
 
 [SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Local")]
 [SuppressMessage("ReSharper", "UnusedMember.Global")]
+[AddressOffset(-1)]
 public class Adam6360DRegisters 
 {
     [DiscreteInput(1)]  public Boolean DigitalInput0  { get; private set; }  
@@ -19,7 +20,8 @@ public class Adam6360DRegisters
     [DiscreteInput(10)] public Boolean DigitalInput9  { get; private set; }  
     [DiscreteInput(11)] public Boolean DigitalInput10 { get; private set; }  
     [DiscreteInput(12)] public Boolean DigitalInput11 { get; private set; }  
-    [DiscreteInput(13)] public Boolean DigitalInput12 { get; private set; }  
+    [DiscreteInput(13)] public Boolean DigitalInput12 { get; private set; }
+    [DiscreteInput(14)] public Boolean DigitalInput13 { get; private set; }  
     
     [Coil(33)]          public Boolean Relay0 { get; set; }    
     [Coil(34)]          public Boolean Relay1 { get; set; }    
diff --git a/csharp/Lib/Devices/Adam6060/Doc/ADAM-6360D-A1_DS(080321)20210804101056.pdf b/csharp/Lib/Devices/Adam6360D/Doc/ADAM-6360D-A1_DS(080321)20210804101056.pdf
similarity index 100%
rename from csharp/Lib/Devices/Adam6060/Doc/ADAM-6360D-A1_DS(080321)20210804101056.pdf
rename to csharp/Lib/Devices/Adam6360D/Doc/ADAM-6360D-A1_DS(080321)20210804101056.pdf
diff --git a/csharp/Lib/Devices/Adam6360D/Program.cs b/csharp/Lib/Devices/Adam6360D/Program.cs
new file mode 100644
index 000000000..f0b3681da
--- /dev/null
+++ b/csharp/Lib/Devices/Adam6360D/Program.cs
@@ -0,0 +1,20 @@
+using InnovEnergy.Lib.Units;
+using InnovEnergy.Lib.Utils;
+
+namespace InnovEnergy.Lib.Devices.Adam6360D;
+
+public static class Program
+{
+    public static Task Main(String[] args)
+    {
+        var d = new Adam6360DDevice("localhost", 2, 5006);
+
+        while (true)
+        {
+            var x = d.Read();
+            x.ToCsv().WriteLine();
+        }
+    
+
+    }
+}
\ No newline at end of file