Merge pull request #8 from andig/connect

feat(handler): Implement SlaveId and Connector APIs

Author: gq0

asciiclient.go

@@ -46,6 +46,11 @@ type asciiPackager struct {
 	SlaveID byte
 }
 
+// SetSlave sets modbus slave id for the next client operations
+func (mb *asciiPackager) SetSlave(slaveId byte) {
+	mb.SlaveId = slaveId
+}
+
 // Encode encodes PDU in a ASCII frame:
 //  Start           : 1 char
 //  Address         : 2 chars

client.go

@@ -13,6 +13,7 @@ import (
 type ClientHandler interface {
 	Packager
 	Transporter
+	Connector
 }
 
 type client struct {

modbus.go

@@ -100,6 +100,7 @@ type ProtocolDataUnit struct {
 
 // Packager specifies the communication layer.
 type Packager interface {
+	SetSlave(slaveId byte)
 	Encode(pdu *ProtocolDataUnit) (adu []byte, err error)
 	Decode(adu []byte) (pdu *ProtocolDataUnit, err error)
 	Verify(aduRequest []byte, aduResponse []byte) (err error)
@@ -109,3 +110,8 @@ type Packager interface {
 type Transporter interface {
 	Send(aduRequest []byte) (aduResponse []byte, err error)
 }
+
+type Connector interface {
+	Connect() error
+	Close() error
+}

rtuclient.go

@@ -44,6 +44,11 @@ type rtuPackager struct {
 	SlaveID byte
 }
 
+// SetSlave sets modbus slave id for the next client operations
+func (mb *rtuPackager) SetSlave(slaveId byte) {
+	mb.SlaveId = slaveId
+}
+
 // Encode encodes PDU in a RTU frame:
 //  Slave Address   : 1 byte
 //  Function        : 1 byte
@@ -120,7 +125,7 @@ func (mb *rtuSerialTransporter) Send(aduRequest []byte) (aduResponse []byte, err
 	mb.serialPort.startCloseTimer()
 
 	// Send the request
-	mb.serialPort.logf("modbus: sending %q\n", aduRequest)
+	mb.serialPort.logf("modbus: sending % x\n", aduRequest)
 	if _, err = mb.port.Write(aduRequest); err != nil {
 		return
 	}

tcpclient.go

@@ -63,6 +63,11 @@ type tcpPackager struct {
 	SlaveID byte
 }
 
+// SetSlave sets modbus slave id for the next client operations
+func (mb *tcpPackager) SetSlave(slaveId byte) {
+	mb.SlaveId = slaveId
+}
+
 // Encode adds modbus application protocol header:
 //  Transaction identifier: 2 bytes
 //  Protocol identifier: 2 bytes