From 6229989dd6ec0b56b34959dea27835f5d6878025 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 8 Jul 2019 15:28:13 +0100 Subject: [PATCH] fix --- src/RegisterDatapoint.py | 3 ++- src/initialRegisterFile.py | 2 +- src/registers.pkl | Bin 554 -> 601 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index 0423419..4c1fdbf 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -145,7 +145,8 @@ class DiscreteInputDatapoint(AbstractModbusDatapoint): unit=self.unit) if type(result) in [ExceptionResponse, ModbusIOException]: raise DatapointException(result) - if not self.updateOnly or (result.registers != self.lastValue): + if not self.updateOnly or (result.bits != self.lastValue): + self.lastValue = result.bits # print("{0}: {1!s}".format(self.label, result.bits)) pubQueue.put(MqttProcessor.PublishItem(self.publishTopic, str(result.bits))) diff --git a/src/initialRegisterFile.py b/src/initialRegisterFile.py index df236ea..615679b 100644 --- a/src/initialRegisterFile.py +++ b/src/initialRegisterFile.py @@ -4,7 +4,7 @@ import pickle datapoints = [ - RegisterDatapoint.InputRegisterDatapoint('Temperature', 5, 0x0001, 1, datetime.timedelta(seconds=1.0), True, 'Pub/Temperature'), + RegisterDatapoint.InputRegisterDatapoint('Temperature', 5, 0x0001, 1, datetime.timedelta(seconds=1.0), False, 'Pub/Temperature'), RegisterDatapoint.InputRegisterDatapoint('Humidity', 5, 0x0002, 1, datetime.timedelta(seconds=1.0), True, 'Pub/Humidity'), RegisterDatapoint.DiscreteInputDatapoint('Switches', 4, 0x0000, 1, datetime.timedelta(seconds=1.0), True, 'Pub/Switches'), ] diff --git a/src/registers.pkl b/src/registers.pkl index eafaa890eac716e58689705dac18881ad8d5f451..d1f3bc41a27da495faa5e20656a83c51550c986d 100644 GIT binary patch literal 601 zcmZ{hO;5r=5Qd9_U_n8}?=RE~Ui3%kLDK|HC1x)kw(Z2(q_mxOHiiRZY5}< zUN$>#X6Ah|@9W|dIsMRwXH_ud*OFzHs)XI!B-8v`rpoynElg;!FB*>HKtdWcL{y!M zs;PCNm}*|FEO?v&Es0g5E4!_i&s?Z3YDSD@05LU0)BJ}p${?4lbD(A6+ErO38SavJ zOzyPoiDki8X~HsOY7Ru*G|4E+p(v>3RZ5;LS81+zOe;pP9$~5zrd3ldo62r@l(7bC z56b=`l!ppFWmf4W$AXWtq(@cfb6>THk>)`Sy z{-zGlUTJGW+kLD~(cA-do<-fACIx OI{kq+pFGn6TzmqE5wI8l literal 554 zcmZvZNl(Kt5QWpdq$_3L%dK4CN6-T(QiVbfxo~ij5w?^j8G9_$LnSz&{%af)6%f7H zo~QBi=Qr=Q7j!0(53fQI$SEV1XCfu{G0ipom$7p5fz=h(CPCYAoLq`b3R+^_t5^Y2 z)Sw~8#@f~@VyVvvuo=Z>Be4LtSYk+sx!Cd?ui`nM*!FQJXc)&R(qhmgp@u9^i-rVRXeB@QR_1-dwsZfyw0y~hO`QWLcI9uWQHi`=$FTW{l hba81hwi)783HJOZDB_@S{1