Merge branch 'main' of https://git.rouggy.com/rouggy/ShackMaster

2026-01-09 23:55:14 +01:00
parent ac99f291a7 4ab192418e
commit bceac40518
16 changed files with 1514 additions and 0 deletions
--- a/internal/devices/webswitch/webswitch.go
+++ b/internal/devices/webswitch/webswitch.go
@@ -142,8 +142,12 @@ func (c *Client) GetStatus() (*Status, error) {

 	// Parse response format: "1,1\n2,1\n3,1\n4,1\n5,0\n"
 	status := &Status{
+<<<<<<< HEAD
 		Relays:    make([]RelayState, 0, 5),
 		Connected: true,
+=======
+		Relays: make([]RelayState, 0, 5),
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	}

 	lines := strings.Split(strings.TrimSpace(string(body)), "\n")