Merge pull request #10 from bbinet/trace-addr

Add modbus address in the debug trace
sunspec · Feb 13, 2017 · 16b9da5 · 16b9da5
2 parents 497d0b1 + 81aa282
commit 16b9da5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/sunspec/core/modbus/client.py b/sunspec/core/modbus/client.py
@@ -154,7 +154,7 @@ def _read(self, slave_id, addr, count, op=FUNC_READ_HOLDING, trace_func=None):
         req += struct.pack('>H', computeCRC(req))
 
         if trace_func:
-            s = '%s:%s ->' % (self.name, str(slave_id))
+            s = '%s:%s[addr=%s] ->' % (self.name, str(slave_id), addr)
             for c in req:
                 s += '%02X' % (ord(c))
             trace_func(s)
@@ -181,7 +181,7 @@ def _read(self, slave_id, addr, count, op=FUNC_READ_HOLDING, trace_func=None):
                 raise ModbusClientTimeout('Response timeout')
 
         if trace_func:
-            s = '%s:%s <--' % (self.name, str(slave_id))
+            s = '%s:%s[addr=%s] <--' % (self.name, str(slave_id), addr)
             for c in resp:
                 s += '%02X' % (ord(c))
             trace_func(s)
@@ -232,7 +232,7 @@ def _write(self, slave_id, addr, data, trace_func=None):
         req += struct.pack('>H', computeCRC(req))
 
         if trace_func:
-            s = '%s:%s ->' % (self.name, str(slave_id))
+            s = '%s:%s[addr=%s] ->' % (self.name, str(slave_id), addr)
             for c in req:
                 s += '%02X' % (ord(c))
             trace_func(s)
@@ -259,7 +259,7 @@ def _write(self, slave_id, addr, data, trace_func=None):
                 raise ModbusClientTimeout('Response timeout')
 
         if trace_func:
-            s = '%s:%s <--' % (self.name, str(slave_id))
+            s = '%s:%s[addr=%s] <--' % (self.name, str(slave_id), addr)
             for c in resp:
                 s += '%02X' % (ord(c))
             trace_func(s)
@@ -393,7 +393,7 @@ def _read(self, addr, count, op=FUNC_READ_HOLDING):
         req = struct.pack('>HHHBBHH', 0, 0, TCP_READ_REQ_LEN, int(self.slave_id), op, int(addr), int(count))
 
         if self.trace_func:
-            s = '%s:%s:%s ->' % (self.ipaddr, str(self.ipport), str(self.slave_id))
+            s = '%s:%s:%s[addr=%s] ->' % (self.ipaddr, str(self.ipport), str(self.slave_id), addr)
             for c in req:
                 s += '%02X' % (ord(c))
             self.trace_func(s)
@@ -423,7 +423,7 @@ def _read(self, addr, count, op=FUNC_READ_HOLDING):
             except_code = ord(resp[TCP_HDR_LEN + 2])
 
         if self.trace_func:
-            s = '%s:%s:%s <--' % (self.ipaddr, str(self.ipport), str(self.slave_id))
+            s = '%s:%s:%s[addr=%s] <--' % (self.ipaddr, str(self.ipport), str(self.slave_id), addr)
             for c in resp:
                 s += '%02X' % (ord(c))
             self.trace_func(s)
@@ -477,7 +477,7 @@ def _write(self, addr, data):
         req += data
 
         if self.trace_func:
-            s = '%s:%s:%s ->' % (self.ipaddr, str(self.ipport), str(self.slave_id))
+            s = '%s:%s:%s[addr=%s] ->' % (self.ipaddr, str(self.ipport), str(self.slave_id), addr)
             for c in req:
                 s += '%02X' % (ord(c))
             self.trace_func(s)
@@ -507,7 +507,7 @@ def _write(self, addr, data):
             except_code = ord(resp[TCP_HDR_LEN + 2])
 
         if self.trace_func:
-            s = '%s:%s:%s <--' % (self.ipaddr, str(self.ipport), str(self.slave_id))
+            s = '%s:%s:%s[addr=%s] <--' % (self.ipaddr, str(self.ipport), str(self.slave_id), addr)
             for c in resp:
                 s += '%02X' % (ord(c))
             self.trace_func(s)