From da677e9c6f8f36c07356a8dc731b8ce478232647 Mon Sep 17 00:00:00 2001
From: Josh Deprez <DrJosh9000@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:00:07 +1100
Subject: [PATCH] tweaks

---
 main.go    |  2 +-
 sungrow.go | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.go b/main.go
index 392b0fc..2fa9b2a 100644
--- a/main.go
+++ b/main.go
@@ -74,7 +74,7 @@ func statusHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func readRegs(client modbus.Client, start, qty uint16) {
-	data, err := client.ReadInputRegisters(5000, 50)
+	data, err := client.ReadInputRegisters(start, qty)
 	if err != nil {
 		die("Couldn't read input registers %d-%d: %v", start+1, start+qty, err)
 	}
diff --git a/sungrow.go b/sungrow.go
index e02f6f9..7f0f060 100644
--- a/sungrow.go
+++ b/sungrow.go
@@ -44,7 +44,7 @@ type sungrowConn struct {
 	block cipher.Block
 	fifo  *bytes.Buffer
 
-	mu   sync.Mutex
+	mu   sync.RWMutex
 	txid uint16
 }
 
@@ -54,8 +54,8 @@ func (c *sungrowConn) Write(msg []byte) (int, error) {
 	}
 
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.txid = binary.BigEndian.Uint16(msg[:2])
-	c.mu.Unlock()
 
 	c.fifo.Truncate(0)
 
@@ -83,6 +83,8 @@ func (c *sungrowConn) Read(out []byte) (int, error) {
 	}
 
 	if c.fifo.Len() > 0 {
+		c.mu.RLock()
+		defer c.mu.RUnlock()
 		return c.fifo.Read(out)
 	}
 	// 4-byte header describes how much to read
@@ -101,9 +103,9 @@ func (c *sungrowConn) Read(out []byte) (int, error) {
 	for cp := pkt; len(cp) > 0; cp = cp[bs:] {
 		c.block.Decrypt(cp, cp)
 	}
-	c.mu.Lock()
+	c.mu.RLock()
+	defer c.mu.RUnlock()
 	binary.BigEndian.PutUint16(pkt, c.txid)
-	c.mu.Unlock()
 	c.fifo.Write(pkt[:pktlen])
 	return c.fifo.Read(out)
 }