|
11 | 11 | import logging |
12 | 12 | import textwrap |
13 | 13 |
|
| 14 | +from pymodbus import pymodbus_apply_logging_config |
14 | 15 | from pymodbus.factory import ClientDecoder, ServerDecoder |
15 | 16 | from pymodbus.transaction import ( |
16 | 17 | ModbusAsciiFramer, |
@@ -80,15 +81,10 @@ def decode(self, message): |
80 | 81 | print(f"{decoder.decoder.__class__.__name__}") |
81 | 82 | print("-" * 80) |
82 | 83 | try: |
83 | | - decoder.addToFrame(message) |
84 | | - if decoder.checkFrame(): |
85 | | - slave = decoder._header.get( # pylint: disable=protected-access |
86 | | - "uid", 0x00 |
87 | | - ) |
88 | | - decoder.advanceFrame() |
89 | | - decoder.processIncomingPacket(message, self.report, slave) |
90 | | - else: |
91 | | - self.check_errors(decoder, message) |
| 84 | + slave = decoder._header.get( # pylint: disable=protected-access |
| 85 | + "uid", 0x00 |
| 86 | + ) |
| 87 | + decoder.processIncomingPacket(message, self.report, slave) |
92 | 88 | except Exception: # pylint: disable=broad-except |
93 | 89 | self.check_errors(decoder, message) |
94 | 90 |
|
@@ -144,6 +140,7 @@ def report(self, message): |
144 | 140 | def parse_messages(cmdline=None): |
145 | 141 | """Do a helper method to generate the messages to parse.""" |
146 | 142 | args = get_commandline(cmdline=cmdline) |
| 143 | + pymodbus_apply_logging_config(args.log.upper()) |
147 | 144 | _logger.setLevel(args.log.upper()) |
148 | 145 | if not args.message: |
149 | 146 | _logger.error("Missing --message.") |
|
0 commit comments