From 080b22646df546ee90674d88855cbe1ba8f43450 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 18 Jul 2019 13:56:55 +0100
Subject: [PATCH] read/write counter

---
 src/CmdServer.py         | 6 +++---
 src/RegisterDatapoint.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CmdServer.py b/src/CmdServer.py
index cd58785..b5b6b13 100644
--- a/src/CmdServer.py
+++ b/src/CmdServer.py
@@ -253,13 +253,13 @@ class CmdInterpreter(cmd.Cmd):
 
     def do_stats(self, arg):
         for i, r in enumerate(self.registers):
-            processCount = readCount + writeCount
+            processCount = r.readCount + r.writeCount
             if processCount == 0:
                 ratio = -1
             else:
                 ratio = float(r.errorCount) / float(processCount)
-            self.__println("#{0:2d}: {1:15s} ({2:2d}, {3:5d}), rc: {4:7d}, wc: {4:7d}, pc: {4:7d}, ec: {5:7d}, q: {6:1.4f}"
-                           .format(i, r.label, r.unit, r.address, r.readCount, r.writeCount
+            self.__println("#{0:2d}: {1:15s} ({2:2d}, {3:5d}), rc: {4:7d}, wc: {5:7d}, pc: {6:7d}, ec: {7:7d}, q: {8:1.4f}"
+                           .format(i, r.label, r.unit, r.address, r.readCount, r.writeCount,
                                    processCount, r.errorCount, ratio))
 
     def help_stats(self):
diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py
index 3925a40..c1d40a3 100644
--- a/src/RegisterDatapoint.py
+++ b/src/RegisterDatapoint.py
@@ -128,11 +128,11 @@ class CoilDatapoint(AbstractModbusDatapoint):
 
     def __str__(self):
         return ("{0}, {1}: unit: {2},  address: {3}, scanRate: {4}, "
-                "enqueued: {5}, lastContact: {6}, errorCount: {7}, processCount: {8}, "
-                "publishTopic: {9}, subscribeTopic: {10}, feedbackTopic: {11}"
+                "enqueued: {5}, lastContact: {6}, errorCount: {7}, readCount: {8}, "
+                "writeCount: {9}, publishTopic: {10}, subscribeTopic: {11}, feedbackTopic: {12}"
                 .format(self.type, self.label, self.unit, self.address,
                         self.scanRate, self.enqueued, self.lastContact,
-                        self.errorCount, self.processCount, 
+                        self.errorCount, self.readCount, self.writeCount, 
                         self.publishTopic, self.subscribeTopic, self.feedbackTopic))
 
     def onMessage(self, value):