diff --git a/csharp/App/Backend/DataTypes/Installation.cs b/csharp/App/Backend/DataTypes/Installation.cs index 492558c54..067da8cba 100644 --- a/csharp/App/Backend/DataTypes/Installation.cs +++ b/csharp/App/Backend/DataTypes/Installation.cs @@ -15,10 +15,10 @@ public class Installation : TreeNode public Double Lat { get; set; } public Double Long { get; set; } - public String S3Region { get; set; } = ""; - public String S3Provider { get; set; } = ""; - public String S3WriteKey { get; set; } = ""; - public String S3Key { get; set; } = ""; - public String S3WriteSecret { get; set; } = ""; - public String S3Secret { get; set; } = ""; -} \ No newline at end of file + public String S3Region { get; set; } = ""; + public String S3Provider { get; set; } = ""; + public String S3WriteKey { get; set; } = ""; + public String S3Key { get; set; } = ""; + public String S3WriteSecret { get; set; } = ""; + public String S3Secret { get; set; } = ""; +} \ No newline at end of file diff --git a/csharp/App/SaliMax/src/Topology.cs b/csharp/App/SaliMax/src/Topology.cs index ce1b957f2..9891fe573 100644 --- a/csharp/App/SaliMax/src/Topology.cs +++ b/csharp/App/SaliMax/src/Topology.cs @@ -260,9 +260,9 @@ public static class Topology .Apply(TextBlock.AlignLeft) .TitleBox("AC/DC"); - var gridFlow = Flow.Horizontal(h); + var dcFlow = Flow.Horizontal(h); - return TextBlock.AlignCenterVertical(inverterBox, gridFlow); + return TextBlock.AlignCenterVertical(inverterBox, dcFlow); } @@ -397,7 +397,7 @@ public static class Topology return TextBlock.AlignLeft("no battery").Box(); var voltage = bat.Dc.Voltage.ToDisplayString(); - var soc = bat.Devices.Any() ? bat.Devices.Average(b => b.Soc).Percent().ToDisplayString() : "0"; + var soc = bat.Devices.Any() ? bat.Devices.Average(b => b.Soc).Percent().ToDisplayString() : "0"; // TODO var current = bat.Dc.Current.ToDisplayString(); var busCurrent = bat.Devices.Any() ? bat.Devices.Sum(b => b.BusCurrent).A().ToDisplayString() : "0"; var temp = bat.Temperature.ToDisplayString(); diff --git a/csharp/App/VrmGrabber/Controller.cs b/csharp/App/VrmGrabber/Controller.cs index 955e16563..461f9a1d6 100644 --- a/csharp/App/VrmGrabber/Controller.cs +++ b/csharp/App/VrmGrabber/Controller.cs @@ -1,12 +1,8 @@ using CliWrap; -using CliWrap.Buffered; using HandlebarsDotNet; using InnovEnergy.App.VrmGrabber.Database; -using InnovEnergy.App.VrmGrabber.DataTypes; using InnovEnergy.Lib.Utils; -using InnovEnergy.Lib.Victron.VictronVRM; using Microsoft.AspNetCore.Mvc; -using FILE=System.IO.File; using VrmInstallation = InnovEnergy.Lib.Victron.VictronVRM.Installation; namespace InnovEnergy.App.VrmGrabber; diff --git a/csharp/App/VrmGrabber/DataTypes/Installation.cs b/csharp/App/VrmGrabber/DataTypes/Installation.cs index ff2bd2d24..58e68a4d5 100644 --- a/csharp/App/VrmGrabber/DataTypes/Installation.cs +++ b/csharp/App/VrmGrabber/DataTypes/Installation.cs @@ -1,4 +1,3 @@ -using InnovEnergy.Lib.Victron.VictronVRM; using SQLite; namespace InnovEnergy.App.VrmGrabber.DataTypes; diff --git a/csharp/App/VrmGrabber/Database/Create.cs b/csharp/App/VrmGrabber/Database/Create.cs index 9283b6a70..b8d7dc25f 100644 --- a/csharp/App/VrmGrabber/Database/Create.cs +++ b/csharp/App/VrmGrabber/Database/Create.cs @@ -1,6 +1,5 @@ using InnovEnergy.App.VrmGrabber.DataTypes; - namespace InnovEnergy.App.VrmGrabber.Database; diff --git a/csharp/App/VrmGrabber/Database/Db.cs b/csharp/App/VrmGrabber/Database/Db.cs index 1b05edd54..79599c9dc 100644 --- a/csharp/App/VrmGrabber/Database/Db.cs +++ b/csharp/App/VrmGrabber/Database/Db.cs @@ -7,7 +7,6 @@ using CliWrap.Buffered; using InnovEnergy.App.RemoteSupportConsole; using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Victron.VictronVRM; -using Newtonsoft.Json; using SQLite; using static System.Text.Json.JsonSerializer; using static InnovEnergy.App.VrmGrabber.Database.Systemd; diff --git a/csharp/App/VrmGrabber/Database/Delete.cs b/csharp/App/VrmGrabber/Database/Delete.cs index 3dd008e4e..2bcd06a6a 100644 --- a/csharp/App/VrmGrabber/Database/Delete.cs +++ b/csharp/App/VrmGrabber/Database/Delete.cs @@ -1,6 +1,5 @@ using InnovEnergy.App.VrmGrabber.DataTypes; - namespace InnovEnergy.App.VrmGrabber.Database; diff --git a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs index 45a2318d2..2b51c68f3 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs @@ -71,8 +71,8 @@ public static class TypeToSignature private static Signature? ParseTerminalSignature(Type type) { return Signature - .Terminals - .FirstOrDefault(s => s.Type.IsAssignableFrom(type)); + .Terminals + .FirstOrDefault(s => s.Type.IsAssignableFrom(type)); } private static IReadOnlyList GetStructElements(Type type) diff --git a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs index 28245496c..c35e9b396 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs @@ -16,7 +16,7 @@ public class ArraySignature : ContainerTypeSignature var list = (IList) Activator.CreateInstance(listType)!; var length = reader.ReadInt32(); - var end = reader.BytesRead + length; + var end = reader.BytesRead + length; while (reader.BytesRead < end) { //reader.AlignForComposite(); // NOT ALIGNED! diff --git a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs index 12bb15f46..938e0470f 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs @@ -2,7 +2,4 @@ namespace InnovEnergy.Lib.Protocols.DBus.Protocol.DataTypes.Signatures.Specializ public abstract class BasicTypeSignature : Signature { - - - } \ No newline at end of file diff --git a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs index fa05142d0..b9201c145 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs @@ -10,4 +10,4 @@ public class Int64Signature : FixedTypeSignature public override Type Type => typeof(Int64); public override String ToString() => "x"; -} \ No newline at end of file +} diff --git a/csharp/Lib/Protocols/DBus/Protocol/Message.cs b/csharp/Lib/Protocols/DBus/Protocol/Message.cs index 62e58912e..8461b614e 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/Message.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/Message.cs @@ -176,11 +176,11 @@ public readonly struct Message var raw = reader.ReadSegment((Int32)payloadLength); - var br = new DBusBufferReader(raw, reader.SwapEndian); - if (signature.IsEmpty) return (raw.ToArray(), true); // no signature, but data available. should probably not happen. + var br = new DBusBufferReader(raw, reader.SwapEndian); + // try // { return (signature.Read(br), false); diff --git a/csharp/Lib/Protocols/DBus/Protocol/Replies.cs b/csharp/Lib/Protocols/DBus/Protocol/Replies.cs index 0165f121c..11c487439 100644 --- a/csharp/Lib/Protocols/DBus/Protocol/Replies.cs +++ b/csharp/Lib/Protocols/DBus/Protocol/Replies.cs @@ -5,7 +5,7 @@ using InnovEnergy.Lib.Protocols.DBus.Protocol.Header; namespace InnovEnergy.Lib.Protocols.DBus.Protocol; -using HeaderType = ValueTuple>; +using HeaderType = ValueTuple>; public static class Replies { @@ -53,11 +53,11 @@ public static class Replies HeaderType header = ( - (Byte)Env.Endianness, - (Byte)MessageType.MethodReturn, - (Byte)HeaderFlags.NoReplyExpected, + (Byte) Env.Endianness, + (Byte) MessageType.MethodReturn, + (Byte) HeaderFlags.NoReplyExpected, Message.ProtocolVersion, - (UInt32)signature.MeasureSize(payload), + (UInt32) signature.MeasureSize(payload), SerialSource.Next(), fields );