From c51250a380cc06590e9db5944f8789072c78c78a Mon Sep 17 00:00:00 2001
From: atef <sarraj@innov.energy>
Date: Tue, 12 Sep 2023 19:31:39 +0200
Subject: [PATCH] One try catch instead of two for DcDcDeviceRecord Read()

---
 .../Devices/Battery48TL/Battery48TlRecords.cs  | 18 +++++++++---------
 .../TruConvertDc/TruConvertDcDcDevices.cs      | 16 +++-------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs b/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs
index 445a78452..84129e61e 100644
--- a/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs
+++ b/csharp/Lib/Devices/Battery48TL/Battery48TlRecords.cs
@@ -6,15 +6,15 @@ namespace InnovEnergy.Lib.Devices.Battery48TL;
 
 public class Battery48TlRecords
 {
-    public required DcBus                 Dc                    { get; init; }
-    public required Boolean               Eoc                   { get; init; }
-    public required IReadOnlyList<String> Warnings              { get; init; } 
-    public required IReadOnlyList<String> Alarms                { get; init; } 
-    public required Percent               Soc                   { get; init; }
-    public required Percent               CurrentMinSoc         { get; init; }
-    public required Temperature           Temperature           { get; init; }
-    public required DcPower               HeatingPower          { get; init; }
-    public required UInt16                TimeSinceToc          { get; init; }
+    public required DcBus                 Dc                         { get; init; }
+    public required Boolean               Eoc                        { get; init; }
+    public required IReadOnlyList<String> Warnings                   { get; init; } 
+    public required IReadOnlyList<String> Alarms                     { get; init; } 
+    public required Percent               Soc                        { get; init; }
+    public required Percent               CurrentMinSoc              { get; init; }
+    public required Temperature           Temperature                { get; init; }
+    public required DcPower               HeatingPower               { get; init; }
+    public required UInt16                TimeSinceToc               { get; init; }
     public required Boolean               CalibrationChargeRequested { get; init; }
 
     public required IReadOnlyList<Battery48TlRecord> Devices { get; init; }
diff --git a/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDcDevices.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDcDevices.cs
index edd7a8bdf..742578db9 100644
--- a/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDcDevices.cs
+++ b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDcDevices.cs
@@ -35,22 +35,12 @@ public class TruConvertDcDcDevices
 
     public DcDcDevicesRecord Read()
     {
-        SystemControlRegisters? scStatus;
         
         try
         {
-            scStatus = _SystemControl.Read();
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine(e);
-            return DcDcDevicesRecord.Null;
-        }
+            var scStatus = _SystemControl.Read();
+            var n = scStatus.NumberOfConnectedSlaves;
 
-        var n = scStatus.NumberOfConnectedSlaves;
-        
-        try
-        {
             var dcDcRecords = _DcDcs
                               .Take(n)
                               .Select(dcdc => dcdc.Read())
@@ -61,7 +51,7 @@ public class TruConvertDcDcDevices
         catch 
         {
             "Failed to read DCDC data".WriteLine();
-            return new DcDcDevicesRecord(scStatus, Array.Empty<DcDcRecord>());
+            return new DcDcDevicesRecord(null, Array.Empty<DcDcRecord>());
         }
     }