RTU/TCP modbus share same client.

Author: ylliu

api.go

@@ -47,6 +47,5 @@ type Client interface {
 	// of register in a remote device and returns FIFO value register.
 	ReadFIFOQueue(address uint16) (results []byte, err error)
 	Close() error
-	SetSlaveId(slaveid byte)
-
+	SetSlaveID(slaveid byte)
 }

asciiclient.go

@@ -46,6 +46,10 @@ type asciiPackager struct {
 	SlaveId byte
 }
 
+func (mb *asciiPackager) SetSlaveId(slaveid byte) {
+	mb.SlaveId = slaveid
+}
+
 // Encode encodes PDU in a ASCII frame:
 //  Start           : 1 char
 //  Address         : 2 chars
@@ -216,6 +220,14 @@ func writeHex(buf *bytes.Buffer, value []byte) (err error) {
 	return
 }
 
+// Close closes current connection.
+func (mb *asciiSerialTransporter) Close() error {
+	mb.mu.Lock()
+	defer mb.mu.Unlock()
+
+	return mb.close()
+}
+
 // readHex decodes hexa string to byte, e.g. "8C" => 0x8C.
 func readHex(data []byte) (value byte, err error) {
 	var dst [1]byte

client.go

@@ -432,6 +432,16 @@ func (mb *client) ReadFIFOQueue(address uint16) (results []byte, err error) {
 	return
 }
 
+//SetSlaveId ---
+func (mb *client) SetSlaveID(slaveid byte) {
+	mb.packager.SetSlaveId(slaveid)
+}
+
+// Close closes current connection.
+func (mb *client) Close() error {
+	return mb.transporter.Close()
+}
+
 // Helpers
 
 // send sends request and checks possible exception in the response.

modbus.go

@@ -85,6 +85,7 @@ type Packager interface {
 	Encode(pdu *ProtocolDataUnit) (adu []byte, err error)
 	Decode(adu []byte) (pdu *ProtocolDataUnit, err error)
 	Verify(aduRequest []byte, aduResponse []byte) (err error)
+	SetSlaveId(slaveid byte)
 }
 
 // Transporter specifies the transport layer.

rtuclient.go

@@ -44,7 +44,7 @@ type rtuPackager struct {
 	SlaveId byte
 }
 
-func (mb *rtuPackager) SetSlaveId(slaveid byte){
+func (mb *rtuPackager) SetSlaveId(slaveid byte) {
 	mb.SlaveId = slaveid
 }
 
@@ -169,6 +169,14 @@ func (mb *rtuSerialTransporter) Send(aduRequest []byte) (aduResponse []byte, err
 	return
 }
 
+// Close closes current connection.
+func (mb *rtuSerialTransporter) Close() error {
+	mb.mu.Lock()
+	defer mb.mu.Unlock()
+
+	return mb.close()
+}
+
 // calculateDelay roughly calculates time needed for the next frame.
 // See MODBUS over Serial Line - Specification and Implementation Guide (page 13).
 func (mb *rtuSerialTransporter) calculateDelay(chars int) time.Duration {