black code formatting
This commit is contained in:
1 parent
928ff2bf5d
commit
432d46d0f1
11 files changed
+257
-242
No files matched your search
@@ -5,7 +5,7 @@
|
||||
import struct
|
||||
import crcmod.predefined
|
||||
|
||||
modbus_crc = crcmod.predefined.mkCrcFun('modbus')
|
||||
modbus_crc = crcmod.predefined.mkCrcFun("modbus")
|
||||
|
||||
|
||||
class DeviceCommand:
|
||||
@@ -16,7 +16,7 @@ class DeviceCommand:
|
||||
self.cmd[0] = 1 # MODBUS address
|
||||
self.cmd[1] = function_code
|
||||
self.cmd[2:-2] = data
|
||||
struct.pack_into('<H', self.cmd, -2, modbus_crc(self.cmd[:-2]))
|
||||
struct.pack_into("<H", self.cmd, -2, modbus_crc(self.cmd[:-2]))
|
||||
|
||||
def response_size(self) -> int:
|
||||
"""Returns the expected response size in bytes"""
|
||||
@@ -39,7 +39,7 @@ class DeviceCommand:
|
||||
return False
|
||||
|
||||
crc = modbus_crc(response[0:-2])
|
||||
crc_bytes = crc.to_bytes(2, byteorder='little')
|
||||
crc_bytes = crc.to_bytes(2, byteorder="little")
|
||||
return response[-2:] == crc_bytes
|
||||
|
||||
def parse_response(self, response: bytes):
|
||||
@@ -52,7 +52,7 @@ class ReadHoldingRegisters(DeviceCommand):
|
||||
self.starting_address = starting_address
|
||||
self.quantity = quantity
|
||||
|
||||
super().__init__(3, struct.pack('!HH', starting_address, quantity))
|
||||
super().__init__(3, struct.pack("!HH", starting_address, quantity))
|
||||
|
||||
def response_size(self):
|
||||
# 3 byte header
|
||||
@@ -64,9 +64,7 @@ class ReadHoldingRegisters(DeviceCommand):
|
||||
return bytes(response[3:-2])
|
||||
|
||||
def __repr__(self):
|
||||
return (
|
||||
f'ReadHoldingRegisters(starting_address={self.starting_address}, quantity={self.quantity})'
|
||||
)
|
||||
return f"ReadHoldingRegisters(starting_address={self.starting_address}, quantity={self.quantity})"
|
||||
|
||||
|
||||
class WriteSingleRegister(DeviceCommand):
|
||||
@@ -74,7 +72,7 @@ class WriteSingleRegister(DeviceCommand):
|
||||
self.address = address
|
||||
self.value = value
|
||||
|
||||
super().__init__(6, struct.pack('!HH', address, value))
|
||||
super().__init__(6, struct.pack("!HH", address, value))
|
||||
|
||||
def response_size(self):
|
||||
return 8
|
||||
@@ -83,22 +81,20 @@ class WriteSingleRegister(DeviceCommand):
|
||||
return bytes(response[4:6])
|
||||
|
||||
def __repr__(self):
|
||||
return (
|
||||
f'WriteSingleRegister(address={self.address}, value={self.value:#04x})'
|
||||
)
|
||||
return f"WriteSingleRegister(address={self.address}, value={self.value:#04x})"
|
||||
|
||||
|
||||
class WriteMultipleRegisters(DeviceCommand):
|
||||
def __init__(self, starting_address: int, data: bytes):
|
||||
if len(data) % 2 != 0:
|
||||
raise ValueError('data size must be multiple of 2')
|
||||
raise ValueError("data size must be multiple of 2")
|
||||
|
||||
self.starting_address = starting_address
|
||||
self.data = data
|
||||
|
||||
body = bytearray(len(data) + 5)
|
||||
half_len = len(data) >> 1
|
||||
struct.pack_into('!HHB', body, 0, starting_address, half_len, len(data))
|
||||
struct.pack_into("!HHB", body, 0, starting_address, half_len, len(data))
|
||||
body[5:] = data
|
||||
super().__init__(16, body)
|
||||
|
||||
@@ -106,6 +102,4 @@ class WriteMultipleRegisters(DeviceCommand):
|
||||
return 8
|
||||
|
||||
def __repr__(self):
|
||||
return (
|
||||
f'WriteMultipleRegisters(starting_address={self.starting_address}, data={self.data})'
|
||||
)
|
||||
return f"WriteMultipleRegisters(starting_address={self.starting_address}, data={self.data})"
|
||||
Reference in new issue
Block a user