Skip to content
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

Framer option #23

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Framer option #23

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
091a1ab
My ideal HomeAssistant integration
Jan 1, 2023
da5349a
Update modbus2mqtt.py
dudasekk Apr 2, 2023
78a8334
Merge pull request #1 from dudasekk/dudasekk-patch-1
dudasekk Apr 2, 2023
b371e8e
Merge pull request #2 from skinkie/ideal_homeassistant_integration
dudasekk Apr 2, 2023
548a505
Revert "My ideal HomeAssistant integration"
dudasekk Apr 2, 2023
aa3ef65
Merge pull request #3 from dudasekk/revert-2-ideal_homeassistant_inte…
dudasekk Apr 2, 2023
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
15 changes: 13 additions & 2 deletions modbus2mqtt/modbus2mqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,7 @@ def main():
parser.add_argument('--rtu-parity', default='even', choices=['even','odd','none'], help='Parity for serial port. Defaults to even')
parser.add_argument('--tcp', help='Act as a Modbus TCP master, connecting to host TCP')
parser.add_argument('--tcp-port', default='502', type=int, help='Port for MODBUS TCP. Defaults to 502')
parser.add_argument('--framer', default='rtu', choices=['ascii','binary','rtu','socket'], help='Frame format. Default is rtu')
parser.add_argument('--set-modbus-timeout',default='1',type=float, help='Response time-out for MODBUS devices')
parser.add_argument('--config', required=True, help='Configuration file. Required!')
parser.add_argument('--verbosity', default='3', type=int, help='Verbose level, 0=silent, 1=errors only, 2=connections, 3=mb writes, 4=all')
Expand Down Expand Up @@ -790,17 +791,27 @@ def main():

#Setup MODBUS Master
global master
if args.framer:
if args.framer == "ascii":
framer = ModbusAsciiFramer;
if args.framer == "binary":
framer = ModbusBinaryFramer;
if args.framer == "rtu":
framer = ModbusRtuFramer;
if args.framer == "socket":
framer = ModbusSocketFramer;

if args.rtu:
if args.rtu_parity == "none":
parity = "N"
if args.rtu_parity == "odd":
parity = "O"
if args.rtu_parity == "even":
parity = "E"
master = SerialModbusClient(method="rtu", port=args.rtu, stopbits = 1, bytesize = 8, parity = parity, baudrate = int(args.rtu_baud), timeout=args.set_modbus_timeout)
master = SerialModbusClient(method="rtu", port=args.rtu, framer=framer, stopbits = 1, bytesize = 8, parity = parity, baudrate = int(args.rtu_baud), timeout=args.set_modbus_timeout)

elif args.tcp:
master = TCPModbusClient(args.tcp, args.tcp_port,client_id="modbus2mqtt", clean_session=False)
master = TCPModbusClient(args.tcp, args.tcp_port, framer=framer, client_id="modbus2mqtt", clean_session=False)
else:
print("You must specify a modbus access method, either --rtu or --tcp")
sys.exit(1)
Expand Down