Merge branch 'main' of https://git.whblueocean.cn/communication-protocol/modbus into cfy-feat-dev

Reviewed-on: #4

client.go

@@ -773,6 +773,62 @@ func (mc *ModbusClient) WriteRegister(addr uint16, value uint16) (err error) {
 	return
 }
 
+// Writes a single 16-bit register (function code 06).
+func (mc *ModbusClient) WriteRegisterWithRes(addr uint16, value uint16) (bytes []byte, err error) {
+	var req *pdu
+	var res *pdu
+
+	mc.lock.Lock()
+	defer mc.lock.Unlock()
+
+	// create and fill in the request object
+	req = &pdu{
+		unitId:       mc.unitId,
+		functionCode: fcWriteSingleRegister,
+	}
+
+	// register address
+	req.payload = uint16ToBytes(BIG_ENDIAN, addr)
+	// register value
+	req.payload = append(req.payload, uint16ToBytes(mc.endianness, value)...)
+
+	// run the request across the transport and wait for a response
+	res, err = mc.executeRequest(req)
+	if err != nil {
+		return
+	}
+
+	// validate the response code
+	switch {
+	case res.functionCode == req.functionCode:
+		// expect 4 bytes (2 byte of address + 2 bytes of value)
+		if len(res.payload) != 4 ||
+			// bytes 1-2 should be the register address
+			bytesToUint16(BIG_ENDIAN, res.payload[0:2]) != addr ||
+			// bytes 3-4 should be the value
+			bytesToUint16(mc.endianness, res.payload[2:4]) != value {
+			err = ErrProtocolError
+			return
+		}
+
+		bytes = req.payload[1:]
+
+	case res.functionCode == (req.functionCode | 0x80):
+		if len(res.payload) != 1 {
+			err = ErrProtocolError
+			return
+		}
+
+		err = mapExceptionCodeToError(res.payload[0])
+
+	default:
+		err = ErrProtocolError
+		mc.logger.Warningf("unexpected response code (%v)", res.functionCode)
+	}
+
+	return
+}
+
 // Writes multiple 16-bit registers (function code 16).
 func (mc *ModbusClient) WriteRegisters(addr uint16, values []uint16) (err error) {
 	var payload []byte
@@ -1138,12 +1194,6 @@ func (mc *ModbusClient) readRegistersWithFunctionCode(addr uint16, quantity uint
 		return
 	}
 
-	if functionCode == 0 {
-		err = ErrUnexpectedParameters
-		mc.logger.Errorf("unexpected register type (%v)", functionCode)
-		return
-	}
-
 	req.functionCode = functionCode
 
 	if quantity == 0 {
@@ -1152,7 +1202,8 @@ func (mc *ModbusClient) readRegistersWithFunctionCode(addr uint16, quantity uint
 		return
 	}
 
-	if quantity > 1024 {
+	// 16 * 16 * 40
+	if quantity > 10240 {
 		err = ErrUnexpectedParameters
 		mc.logger.Error("quantity of registers exceeds 1024")
 		return
@@ -1176,21 +1227,53 @@ func (mc *ModbusClient) readRegistersWithFunctionCode(addr uint16, quantity uint
 	}
 
 	// validate the response code
+	// switch {
+	// case res.functionCode == req.functionCode:
+	// 	// make sure the payload length is what we expect
+	// 	// (1 byte of length + 2 bytes per register)
+	// 	if len(res.payload) != 1+2*int(quantity) {
+	// 		err = ErrProtocolError
+	// 		return
+	// 	}
+
+	// 	// validate the byte count field
+	// 	// (2 bytes per register * number of registers)
+	// 	if uint(res.payload[0]) != 2*uint(quantity) {
+	// 		err = ErrProtocolError
+	// 		return
+	// 	}
+
+	// 	// remove the byte count field from the returned slice
+	// 	bytes = res.payload[1:]
+
+	// case res.functionCode == (req.functionCode | 0x80):
+	// 	if len(res.payload) != 1 {
+	// 		err = ErrProtocolError
+	// 		return
+	// 	}
+
+	// 	err = mapExceptionCodeToError(res.payload[0])
+
+	// default:
+	// 	err = ErrProtocolError
+	// 	mc.logger.Warningf("unexpected response code (%v)", res.functionCode)
+	// }
+
 	switch {
 	case res.functionCode == req.functionCode:
 		// make sure the payload length is what we expect
 		// (1 byte of length + 2 bytes per register)
-		if len(res.payload) != 1+2*int(quantity) {
+		// if len(res.payload) != 1+2*int(quantity) {
-			err = ErrProtocolError
+		// 	err = ErrProtocolError
-			return
+		// 	return
-		}
+		// }
 
 		// validate the byte count field
 		// (2 bytes per register * number of registers)
-		if uint(res.payload[0]) != 2*uint(quantity) {
+		// if uint(res.payload[0]) != 2*uint(quantity) {
-			err = ErrProtocolError
+		// 	err = ErrProtocolError
-			return
+		// 	return
-		}
+		// }
 
 		// remove the byte count field from the returned slice
 		bytes = res.payload[1:]

modbus.go

@@ -41,7 +41,7 @@ const (
 	fcWriteFileRecord uint8 = 0x15
 
 	// customize
-	fcCustomize uint8 = 0x29
+	fcCustomize uint8 = 0x41
 
 	// exception codes
 	exIllegalFunction         uint8 = 0x01

rtu_transport.go

@@ -21,10 +21,10 @@ type rtuTransport struct {
 }
 
 type rtuLink interface {
-	Close()		(error)
+	Close() error
 	Read([]byte) (int, error)
 	Write([]byte) (int, error)
-	SetDeadline(time.Time)	(error)
+	SetDeadline(time.Time) error
 }
 
 // Returns a new RTU transport.
@@ -140,7 +140,7 @@ func (rt *rtuTransport) readRTUFrame() (res *pdu, err error) {
 	var bytesNeeded int
 	var crc crc
 
-	rxbuf		= make([]byte, maxRTUFrameLength)
+	rxbuf = make([]byte, 10243)
 
 	// read the serial ADU header: unit id (1 byte), function code (1 byte) and
 	// PDU length/exception code (1 byte)
@@ -163,12 +163,12 @@ func (rt *rtuTransport) readRTUFrame() (res *pdu, err error) {
 	bytesNeeded += 2
 
 	// never read more than the max allowed frame length
-	if byteCount + bytesNeeded > maxRTUFrameLength {
+	if byteCount+bytesNeeded > maxRTUFrameLength {
 		err = ErrProtocolError
 		return
 	}
 
-	byteCount, err	= io.ReadFull(rt.link, rxbuf[3:3 + bytesNeeded])
+	byteCount, err = io.ReadFull(rt.link, rxbuf[3:3+bytesNeeded])
 	if err != nil && err != io.ErrUnexpectedEOF {
 		return
 	}
@@ -180,10 +180,10 @@ func (rt *rtuTransport) readRTUFrame() (res *pdu, err error) {
 
 	// compute the CRC on the entire frame, excluding the CRC
 	crc.init()
-	crc.add(rxbuf[0:3 + bytesNeeded - 2])
+	crc.add(rxbuf[0 : 3+bytesNeeded-2])
 
 	// compare CRC values
-	if !crc.isEqual(rxbuf[3 + bytesNeeded - 2], rxbuf[3 + bytesNeeded - 1]) {
+	if !crc.isEqual(rxbuf[3+bytesNeeded-2], rxbuf[3+bytesNeeded-1]) {
 		err = ErrBadCRC
 		return
 	}
@@ -192,7 +192,7 @@ func (rt *rtuTransport) readRTUFrame() (res *pdu, err error) {
 		unitId:       rxbuf[0],
 		functionCode: rxbuf[1],
 		// pass the byte count + trailing data as payload, withtout the CRC
-		payload:	rxbuf[2:3 + bytesNeeded  - 2],
+		payload: rxbuf[2 : 3+bytesNeeded-2],
 	}
 
 	return
@@ -222,12 +222,16 @@ func expectedResponseLenth(responseCode uint8, responseLength uint8) (byteCount
 	case fcReadHoldingRegisters,
 		fcReadInputRegisters,
 		fcReadCoils,
-	     fcReadDiscreteInputs:            byteCount = int(responseLength)
+		fcReadDiscreteInputs,
+		0x41:
+		byteCount = int(responseLength)
 	case fcWriteSingleRegister,
 		fcWriteMultipleRegisters,
 		fcWriteSingleCoil,
-	     fcWriteMultipleCoils:            byteCount = 3
+		fcWriteMultipleCoils:
-	case fcMaskWriteRegister:             byteCount = 5
+		byteCount = 3
+	case fcMaskWriteRegister:
+		byteCount = 5
 	case fcReadHoldingRegisters | 0x80,
 		fcReadInputRegisters | 0x80,
 		fcReadCoils | 0x80,
@@ -236,8 +240,11 @@ func expectedResponseLenth(responseCode uint8, responseLength uint8) (byteCount
 		fcWriteMultipleRegisters | 0x80,
 		fcWriteSingleCoil | 0x80,
 		fcWriteMultipleCoils | 0x80,
-	     fcMaskWriteRegister | 0x80:      byteCount = 0
+		fcMaskWriteRegister | 0x80,
-	default: err = ErrProtocolError
+		0x41 | 0x80:
+		byteCount = 0
+	default:
+		err = ErrProtocolError
 	}
 
 	return