Skip to content

* register_write_message.py: Observe skip_encode option when encoding a single register request. #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 29, 2017
Merged

* register_write_message.py: Observe skip_encode option when encoding a single register request. #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8445699
* register_write_message.py: Observe skip_encode option when encoding
bje- Mar 24, 2017
ca4a6ed
Remove trailing semicolons. This isn't C. :-)
bje- May 27, 2017
83c6c96
* sync.py (ModbusTcpClient.connect): `address' variable is unused.
bje- Oct 21, 2016
fd5bf58
Fix typo: controll -> control.
bje- Oct 21, 2016
d464bf6
* test/test_register_write_messages.py: Test skip_encode when writing
bje- May 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pymodbus/client/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ def connect(self):
'''
if self.socket: return True
try:
address = (self.host, self.port)
self.socket = socket.create_connection((self.host, self.port),
timeout=self.timeout, source_address=self.source_address)
except socket.error as msg:
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/datastore/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#---------------------------------------------------------------------------#
# Logging
#---------------------------------------------------------------------------#
import logging;
import logging
_logger = logging.getLogger(__name__)


Expand Down
2 changes: 1 addition & 1 deletion pymodbus/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ def summary(self):


#---------------------------------------------------------------------------#
# Main server controll block
# Main server control block
#---------------------------------------------------------------------------#
class ModbusControlBlock(Singleton):
'''
Expand Down
9 changes: 6 additions & 3 deletions pymodbus/register_write_message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ def encode(self):

:returns: The encoded packet
'''
packet = struct.pack('>H', self.address)
if self.skip_encode:
return self.value
return struct.pack('>HH', self.address, self.value)
packet += self.value
else:
packet += struct.pack('>H', self.value)
Copy link
Contributor

@dhoomakethu dhoomakethu May 29, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line would throw TypeError: cannot concatenate 'str' and 'int' objects on python2 and TypeError: can't concat bytes to int on python 3.

Sorry , I used the wrong example. The code works perfectly. Updating the test code just in case .
The sample code to test this feature is below

from pymodbus.client.sync import ModbusTcpClient as ModbusClient
client = ModbusClient('127.0.0.1', port=5020)
client.connect()
address = 0x00
#client.write_register(address, 25, unit=1, skip_encode=True)
builder = BinaryPayloadBuilder(endian=Endian.Big)
builder.add_16bit_uint(0x1234)
payload = builder.build()
result  = client.write_register(address, payload[0], unit=1, skip_encode=True)
result  = client.read_holding_registers(address, 1,  unit=1)
assert result.registers == [0x1234]

return packet

def decode(self, data):
''' Decode a write single register packet packet request
Expand Down Expand Up @@ -73,7 +76,7 @@ def __str__(self):

:returns: A string representation of the instance
'''
return "WriteRegisterRequest %d => %d" % (self.address, self.value)
return "WriteRegisterRequest %d" % self.address


class WriteSingleRegisterResponse(ModbusResponse):
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def execute(self, request):
if _logger.isEnabledFor(logging.DEBUG):
_logger.debug("recv: " + " ".join([hex(byte2int(x)) for x in result]))
self.client.framer.processIncomingPacket(result, self.addTransaction)
break;
break
except socket.error as msg:
self.client.close()
_logger.debug("Transaction failed. (%s) " % msg)
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def computeCRC(data):
'''
crc = 0xffff
for a in data:
idx = __crc16_table[(crc ^ byte2int(a)) & 0xff];
idx = __crc16_table[(crc ^ byte2int(a)) & 0xff]
crc = ((crc >> 8) & 0xff) ^ idx
swapped = ((crc << 8) & 0xff00) | ((crc >> 8) & 0x00ff)
return swapped
Expand Down
8 changes: 8 additions & 0 deletions test/test_register_write_messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from pymodbus.exceptions import ParameterException
from pymodbus.pdu import ModbusExceptions
from pymodbus.compat import iteritems, iterkeys
from pymodbus.payload import BinaryPayloadBuilder
from pymodbus.payload import Endian

from .modbus_mocks import MockContext

Expand All @@ -28,11 +30,17 @@ def setUp(self):
'''
self.value = 0xabcd
self.values = [0xa, 0xb, 0xc]
builder = BinaryPayloadBuilder(endian=Endian.Big)
builder.add_16bit_uint(0x1234)
self.payload = builder.build()
self.write = {
WriteSingleRegisterRequest(1, self.value) : b'\x00\x01\xab\xcd',
WriteSingleRegisterResponse(1, self.value) : b'\x00\x01\xab\xcd',
WriteMultipleRegistersRequest(1, self.values) : b'\x00\x01\x00\x03\x06\x00\n\x00\x0b\x00\x0c',
WriteMultipleRegistersResponse(1, 5) : b'\x00\x01\x00\x05',

WriteSingleRegisterRequest(1, self.payload[0], skip_encode=True): b'\x00\x01\x12\x34',
WriteMultipleRegistersRequest(1, self.payload, skip_encode=True): b'\x00\x01\x00\x01\x02\x12\x34',
}

def tearDown(self):
Expand Down