diff --git a/modbus/client-serial-modbus.py b/modbus/client-serial-modbus.py index b6ac4d4..e55c0a7 100644 --- a/modbus/client-serial-modbus.py +++ b/modbus/client-serial-modbus.py @@ -71,15 +71,14 @@ def run_sync_client(udp_addr, udp_port_rx, udp_port_tx, serial_port, serial_baud rc = rq.isError() elif message['code'] == 'read_holding': data = message['data'] - print('client_serial_modbus.py: data', data) - rq = client.read_holding_registers(data[0], data[1:], unit=unit_num) + rq = client.read_holding_registers(data[0], data[1], unit=unit_num) rc = rq.isError() if not rc: tx_data = json_encoder.encode({'code': 'response', 'data': rq.registers}) - sock.sendto(bytes(tx_data), (udp_addr, udp_port_tx)) + sock.sendto(bytes(tx_data, 'utf-8'), (udp_addr, udp_port_tx)) elif message['code'] == 'read_input': data = message['data'] - rq = client.read_input_registers(data[0], data[1:], unit=unit_num) + rq = client.read_input_registers(data[0], data[1], unit=unit_num) rc = rq.isError() if not rc: tx_data = json_encoder.encode({'code': 'response', 'data': rq.registers}) diff --git a/scripts/sch3.gd b/scripts/sch3.gd index 55eedb9..4330cba 100644 --- a/scripts/sch3.gd +++ b/scripts/sch3.gd @@ -1,6 +1,5 @@ extends Node - func _ready(): var unit_key = repsettings.get_unit_key('уарэп-щ3') var unit = repnetwork.units[unit_key]