From 31c725520f86a697e057083e99a64bb59570b84d Mon Sep 17 00:00:00 2001 From: ig Date: Tue, 15 Aug 2023 15:05:26 +0200 Subject: [PATCH] minor edit in AllStates.graphml --- csharp/App/SaliMax/Doc/AllStates.graphml | 126 +++++++++++------- csharp/Lib/Devices/AMPT/AmptDevices.cs | 5 +- .../Devices/Battery48TL/Battery48TlRecords.cs | 2 +- 3 files changed, 78 insertions(+), 55 deletions(-) diff --git a/csharp/App/SaliMax/Doc/AllStates.graphml b/csharp/App/SaliMax/Doc/AllStates.graphml index 23d73c65a..2888ad499 100644 --- a/csharp/App/SaliMax/Doc/AllStates.graphml +++ b/csharp/App/SaliMax/Doc/AllStates.graphml @@ -137,7 +137,7 @@ K3 ✓ - + 5 @@ -154,7 +154,7 @@ K3 ✓ - + 7 @@ -172,7 +172,7 @@ K3 ✓ - + 11 @@ -190,11 +190,11 @@ K3 ✘ - + 15 - K1 ✓ + K1 ✓ K2 ✓ K3 ✓ @@ -207,7 +207,7 @@ K3 ✓ - + 21 @@ -224,7 +224,7 @@ K3 ✓ - + 17 @@ -242,7 +242,7 @@ K3 ✘ - + 25 @@ -260,7 +260,7 @@ K3 ✘ - + 27 @@ -278,7 +278,7 @@ K3 ✘ - + 31 @@ -414,7 +414,7 @@ K3 ✓ - + 16 @@ -448,7 +448,7 @@ K3 ✓ - + 18 @@ -465,7 +465,7 @@ K3 ✘ - + 2 @@ -482,7 +482,7 @@ K3 ✘ - + 10 @@ -499,7 +499,7 @@ K3 ✘ - + 12 @@ -516,7 +516,7 @@ K3 ✓ - + 14 @@ -533,7 +533,7 @@ K3 ✓ - + 26 @@ -550,7 +550,7 @@ K3 ✘ - + 30 @@ -582,8 +582,8 @@ Inverters - switch to -grid tie + switch to +grid tie @@ -641,10 +641,13 @@ Inverters - + + + + - open K2 + open K2 @@ -656,7 +659,7 @@ Inverters - open K2 + open K2 @@ -665,11 +668,14 @@ Inverters - + + + + - turn off -inverter + turn off +inverter @@ -681,7 +687,7 @@ inverter - turn off + turn off inverters @@ -694,7 +700,7 @@ inverters - turn off + turn off inverters @@ -707,7 +713,7 @@ inverters - turn off + turn off inverters @@ -717,11 +723,14 @@ inverters - + + + + - turn off -inverters + turn off +inverters @@ -743,8 +752,8 @@ inverters - turn off -Inverters + turn off +Inverters @@ -817,7 +826,7 @@ Inverters - turn off + turn off inverters @@ -827,10 +836,13 @@ inverters - + + + + - open K2 + open K2 @@ -839,10 +851,13 @@ inverters - + + + + - open K2 + open K2 @@ -854,7 +869,7 @@ inverters - K3 opens + K3 opens @@ -866,7 +881,7 @@ inverters - open K2 + open K2 @@ -878,7 +893,7 @@ inverters - turn off + turn off inverters @@ -891,7 +906,7 @@ inverters - turn off + turn off inverters @@ -914,7 +929,7 @@ inverters - + K1 opens @@ -925,11 +940,14 @@ inverters - + + + + - turn off -inverters + turn off +inverters @@ -938,10 +956,13 @@ inverters - + + + + - K3's open + K3's open @@ -949,10 +970,13 @@ inverters - + + + + - K3's open + K3's open diff --git a/csharp/Lib/Devices/AMPT/AmptDevices.cs b/csharp/Lib/Devices/AMPT/AmptDevices.cs index 4e8b47256..69235615f 100644 --- a/csharp/Lib/Devices/AMPT/AmptDevices.cs +++ b/csharp/Lib/Devices/AMPT/AmptDevices.cs @@ -19,11 +19,10 @@ public class AmptDevices { } - public AmptDevices(ModbusClient modbusClient) { _CommunicationUnit = new ModbusDevice(modbusClient); - _StringOptimizers = StringOptimizers(modbusClient); + _StringOptimizers = StringOptimizers(modbusClient); } public AmptStatus Read() @@ -36,7 +35,7 @@ public class AmptDevices } catch (Exception e) { - Console.WriteLine( "Failed to read Ampt data \n"+ e.Message ); + Console.WriteLine("Failed to read Ampt data \n" + e.Message); // TODO: log } diff --git a/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs b/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs index 06b6ac12e..8d13298c1 100644 --- a/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs +++ b/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs @@ -19,7 +19,7 @@ public class Battery48TlRecords HeatingCurrent = records.Any() ? records.Sum(b => b.HeatingCurrent) : 0; Dc = empty - ? DcBus.FromVoltageCurrent(0, 0) + ? DcBus.Null : DcBus.FromVoltageCurrent ( records.Average(r => r.Dc.Voltage),