From 4e271a01a9e9de17297b9ae3ce0564b79f7b689a Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 10 Nov 2024 09:20:31 +0100
Subject: [PATCH 1/2] succbone: Update panel drawings

- Add MODBUS components
- Add network topology overview which shows addresses
---
 succbone/panel.pdf | 4 ++--
 succbone/panel.qet | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/succbone/panel.pdf b/succbone/panel.pdf
index c75a5f4..760faff 100644
--- a/succbone/panel.pdf
+++ b/succbone/panel.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8b3a666784b148f4dfa0f041b4a07f681caf1868fa5c82699a2e79812413cd2
-size 95642
+oid sha256:58e1901fa9cf4c5cb3ca66f12d32ce8b0db18dcb86eba82873f2228414af8230
+size 127233
diff --git a/succbone/panel.qet b/succbone/panel.qet
index 1ad1078..57efe0c 100644
--- a/succbone/panel.qet
+++ b/succbone/panel.qet
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a1b0683fe97a9c2d839c0f3adc81ac637349966f8ad8057f720bbbf2261177
-size 4113489
+oid sha256:78ee01bc132e36e7eb32cb76a0c4bcff57c5099690e5f6766d267f9797256994
+size 4439192

From 26d297dcd3f3446b2cb8556e04b8bd1a769d15fb Mon Sep 17 00:00:00 2001
From: hmelder <service@hugomelder.com>
Date: Fri, 15 Nov 2024 23:49:26 +0100
Subject: [PATCH 2/2] succd: Do not exit prematurely if modbus connections
 fails

---
 succbone/succd/main.go   | 16 ++++++++++++++--
 succbone/succd/modbus.go | 23 -----------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/succbone/succd/main.go b/succbone/succd/main.go
index 52a10db..bb8aed7 100644
--- a/succbone/succd/main.go
+++ b/succbone/succd/main.go
@@ -6,7 +6,9 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"time"
 
+	"github.com/simonvetter/modbus"
 	"k8s.io/klog"
 )
 
@@ -55,9 +57,19 @@ func main() {
 		}
 		d.adcPirani = adc
 
-		err = d.modbusConnect()
+		// Setup modbus client
+		d.modbusClient, err = modbus.NewClient(&modbus.ClientConfiguration{
+			URL:     "tcp://10.250.241.20:8887",
+			Timeout: 1 * time.Second,
+		})
 		if err != nil {
-			klog.Exitf("Failed to connect to modbus %v", err)
+			klog.Exitf("Failed to setup modbus client %v", err)
+		}
+
+		// Connect to modbus client
+		err = d.modbusClient.Open()
+		if err != nil {
+			klog.Warningf("Failed to connect to modbus TCP %v", err)
 		}
 	}
 
diff --git a/succbone/succd/modbus.go b/succbone/succd/modbus.go
index 4aebd03..2db5a6b 100644
--- a/succbone/succd/modbus.go
+++ b/succbone/succd/modbus.go
@@ -12,29 +12,6 @@ func modbusValuesToFloat(v uint16) float32 {
 	return float32(v) / 10.0
 }
 
-func (d *daemon) modbusConnect() error {
-	var err error
-
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	// Setup modbus client
-	d.modbusClient, err = modbus.NewClient(&modbus.ClientConfiguration{
-		URL:     "tcp://10.250.241.20:8887",
-		Timeout: 1 * time.Second,
-	})
-	if err != nil {
-		return err
-	}
-	// Connect to modbus client
-	err = d.modbusClient.Open()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (d *daemon) modbusRestart() error {
 	d.modbusClient.Close()
 	return d.modbusClient.Open()