Allow setting of unit ID

Author: aceagles

app.go

@@ -43,11 +43,21 @@ func (a *App) Connect(ip string, port int, unitID int) error {
 		a.SetConnected(false)
 		return err
 	}
+
+	err = client.SetUnitId(uint8(unitID))
+	if err != nil {
+		a.SetConnected(false)
+		return err
+	}
 	a.SetConnected(true)
 	fmt.Println("Connected")
 	return nil
 }
 
+func (a *App) SetUnitId(id uint8) error {
+	return a.client.SetUnitId(id)
+}
+
 func (a *App) Disconnect() {
 	if a.connected {
 		a.client.Close()
@@ -70,11 +80,12 @@ func (a *App) Read(inputType string, address uint16, quantity uint16) ([]modbusD
 		return nil, errors.New("Client is not configured.")
 	}
 	if !a.connected {
-		err := a.client.Open()
-		if err != nil {
-			return nil, err
-		}
-		a.SetConnected(true)
+		// err := a.client.Open()
+		// if err != nil {
+		// 	return nil, err
+		// }
+		// a.SetConnected(true)
+		return nil, errors.New("Disconnected from server.")
 	}
 	var regType modbus.RegType
 	var results []uint16

frontend/package.json.md5

@@ -1 +1 @@
-acd9ead003bbb277dd239c88e008d2d6
+f5c81e946fc2887a31af38e73110e01e

frontend/src/components/ConnectForm.tsx

@@ -1,35 +1,70 @@
 import { Button, NumberInput, TextInput } from "@mantine/core";
-import { Connect, Disconnect } from "../../wailsjs/go/main/App";
+import { SetUnitId, Connect, Disconnect } from "../../wailsjs/go/main/App";
 import { useState } from "react";
 import { notifications } from "@mantine/notifications";
 
 export default function ConnectForm(props: { connected: boolean }) {
   const [IP, setIP] = useState<string>("");
   const [port, setPort] = useState<string | number>(502);
-  const [unitID, setUnitID] = useState<number>(1);
+  const [unitID, setUnitID] = useState<string | number>(1);
   function ConnectModbus() {
     console.log("Connecting to", IP, port, unitID);
     let portNum = port as number;
-    Connect(IP, portNum, unitID)
-      .then(() => notifications.show({
-        title: "Connected",
-        message: ""
-      }))
-      .catch((err) => notifications.show({
-        title: "Failed to Connect",
-        message: err,
-        autoClose: 20000
-      }))
+    let numId = unitID as number;
+    Connect(IP, portNum, numId)
+      .then(() =>
+        notifications.show({
+          title: "Connected",
+          message: "",
+        })
+      )
+      .catch((err) =>
+        notifications.show({
+          title: "Failed to Connect",
+          message: err,
+          autoClose: 20000,
+        })
+      );
   }
   return (
     <>
-      <TextInput label="IP Address" placeholder="192.168.1.100" onChange={(event) => setIP(event.currentTarget.value)} />
-      <NumberInput label="Port" value={502} onChange={setPort} />
-      {/* <NumberInput label="Unit ID" value={1} /> */}
-      {
-        !props.connected ?
-          <Button onClick={ConnectModbus}>Connect</Button> : <Button onClick={Disconnect}>Disconnect</Button>
-      }
+      <TextInput
+        label="IP Address"
+        placeholder="192.168.1.100"
+        onChange={(event) => setIP(event.currentTarget.value)}
+        disabled={props.connected}
+      />
+      <NumberInput
+        label="Port"
+        value={port}
+        onChange={setPort}
+        disabled={props.connected}
+      />
+      <NumberInput
+        label="Unit ID"
+        value={unitID}
+        onChange={(v) => {
+          setUnitID(v);
+          SetUnitId(v as number)
+            .then(() =>
+              notifications.show({
+                title: "Set Unit ID",
+                message: "",
+              })
+            )
+            .catch((err) =>
+              notifications.show({
+                title: "Failed to Set ID",
+                message: err,
+              })
+            );
+        }}
+      />
+      {!props.connected ? (
+        <Button onClick={ConnectModbus}>Connect</Button>
+      ) : (
+        <Button onClick={Disconnect}>Disconnect</Button>
+      )}
     </>
-  )
-}
+  );
+}

frontend/wailsjs/go/main/App.d.ts

@@ -10,4 +10,6 @@ export function Read(arg1:string,arg2:number,arg3:number):Promise<Array<main.mod
 
 export function SetConnected(arg1:boolean):Promise<void>;
 
+export function SetUnitId(arg1:number):Promise<void>;
+
 export function Write(arg1:string,arg2:number,arg3:Array<number>):Promise<void>;

frontend/wailsjs/go/main/App.js

@@ -18,6 +18,10 @@ export function SetConnected(arg1) {
   return window['go']['main']['App']['SetConnected'](arg1);
 }
 
+export function SetUnitId(arg1) {
+  return window['go']['main']['App']['SetUnitId'](arg1);
+}
+
 export function Write(arg1, arg2, arg3) {
   return window['go']['main']['App']['Write'](arg1, arg2, arg3);
 }