From 5a9a6d67f088f3e8c0d76cffadc60f037064f8d8 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 13 Jul 2019 21:39:54 +0100 Subject: [PATCH] fix load registers --- src/RegisterDatapoint.py | 7 +++++-- src/registers.pkl | Bin 2254 -> 2263 bytes 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index a930ed4..80cddc4 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -3,6 +3,7 @@ from pymodbus.pdu import ExceptionResponse from pymodbus.exceptions import ModbusIOException import MqttProcessor import logging +import pickle class DatapointException(Exception): pass @@ -142,7 +143,7 @@ def loadRegisterList(registerList): with open(registerList, 'rb') as f: datapoints = pickle.load(f) - RegisterDatapoint.checkRegisterList(datapoints, reset=True) + checkRegisterList(datapoints) newDatapoints = [] for dp in datapoints: @@ -152,11 +153,13 @@ def loadRegisterList(registerList): newDatapoints.append(ndp) logging.getLogger('loadRegisterList').debug("Datapoint loaded: {0!s}".format(ndp)) - RegisterDatapoint.checkRegisterList(newDatapoints, reset=True) + checkRegisterList(newDatapoints, reset=True) with open(registerList, 'wb') as f: pickle.dump(newDatapoints, f) + return newDatapoints + def checkRegisterList(registers, reset=False): for r in registers: diff --git a/src/registers.pkl b/src/registers.pkl index 7fd27429646843acf6055e932f1b776249077b21..111ad46f9fe76e3b562b788fa7c5a6d55f9f10f1 100644 GIT binary patch literal 2263 zcmaKt%TpXx6vl@D0eT=IMj;pz(Zpnkh8RHOD-Q)DFwkHJNhgZ29~W**Pj`R)fQ;HE zQO7Vo`^6p%Y5JU$KA*YvA390J83B}G)EyW^lsuMj3%=~O~SrnuGmt{ z-Ns!C_6x4au|nKkY!~Sap>n2&xVd9a)nX+|taI6y@j zh;eU0?VxQX&C!y52kZN0(-jH#(Z)kD4j0t^1ixg3Av0xnQgck3`Ij}{Az9pCO^Yqm z$EoH424%H3B~X~*`sPJC0oO0%0a=*vT{pyo^?VBbt+5@Ult*JcR1g+C&1Y1tV`-S9 zl^Bk1Dinlm(+V`*Cfh^R^bFVuD=V$xm*Gc%Hfm zFua6QkuFXuE!~7gee-CH(`h2FTyjl43NXTx3XaAYEAWH-5I@F`^5cAj4^{bzVvbX) z$N0$&PI`~mJ<5@7XLXZshQgnS@nk^&UlYEbNv8M?=q5*pJniZzX-ep3w^GnvLLX&fMpN!K>1 z)oLo6Ze$@f7h}FrN^X#PF_TgvJrW&}^$RW)bCI5%-MNND>0S|yp5;hDW5;nlK<;EUajDog4cK#mpBa_ZT6QIjrWKio{UPCnK0>` zCJXPCIgJQTgMs%|c|RZEi^W}>csb$mD^-3~5GCpBkw&C%GiSGNA_*o@vKY&olr%)U zJCFQI@biY=OOPz+JLo`A0ws@aca_?OnLklG}Go#OLk?&YTM{MbsPucW{s zJ8heGE|8tv_IBz@?zVRRua6{nWC$_*CPVqo-+x9>L8u@iL&-?vX(w)e4%Vo?b7~L0 zT4v1DHDfhB;dNPb|2nk_Qy5L=AWXj(*X7K$Xc*?7M!CVYnD%cdcr&xSD>=c%+3D|U ze#Iv#h;*u}rL#2GTXMsR)@5Vrro`6UF>W;5%AfrkH!HZM;2r8F;efBpd@I=q-rY*} zo`Om<*-V{`Z-+60_cM&!F*cepy1xGv)e1gP@ZnAvqxfhm#>WaiX~vLu#u&w?8OEI$ ppEY50cmDYkKCj>l1z+xjF@~?UVtlROn`VspoiWDnZKSi|e*q*&#SZ`g literal 2254 zcmaKt+jHAQ6vmxfoybYkP)O1OC2hI5Kogn-S}x_55YjkNQ#DP*C6tx4@ruZjKUqp@ zK+poFG1qc`;XmMiVVL2C7iO4&86J4!kq3sOmF<|=t)J}Go^yWRr*GF+yVjA)ni|jB zrGWdhEMP^?b_3;{TMUENWptdlhRz6GS-m%vN)>(E^X;IF?p%kyj}{y+pXWY$%=nA# z=9NXcpkN=>r6cra^)zkUupOFKLf<+Rxlmv(iwiT2!lh(IK|fUvMA)CzyQ$Lmya0oZ zT^jwYk2pXZha%jT71Z{i$pSjlf+(;tiW+t42FiDi62UBGY%`2aHpz|&=N1$LBK85n@=XMG2bN{ za9347kW^^g^n7cMnStk*aknbv*T&*VE~P7t&a<`|;GPI$HM7eF&oaUij*8gLV-b!^ zsrQPE7!aiJzJ@Jo=r}b31^3hD2O?y%Qqg58;)EKT^q^Gbc;+S^Ql&i`o?l?3z{kU? zIFw6;1{1?OVnhsy(Q3RP4vV8Cf0!WKM+7HDT0Wk&OQz2QF1Iy;g>eZ#5#bRDf2s~Y z*)nIG=8V#udC#%P!Z@OoRDK?9kaQAnS5iW7g9i9pc5uTM|);GH=qDv&a^1WfnDHA;|pG#QPRJs2M!Ko zl&v2zU%@#I3o_i?MaV-6cdja5eCXN%7IQr^g3PjfPC;IxInt`oaO{#;@rt$yRUah0 z<a9IN_%>So86(U@Pmq_CD8O=i&1)TJrSR4>VX-1j{{VR|`^ zv4}6OS0cQc6?9jL9+4L0@%qxQ9ZZn5VooH!WiqEbGJjveYZYA9@VdxV1vw;^a-Bkz za$^(b!-8$a*B%ojSX@xWrK(sJYeJXe8;=bkXScat+aC@ECQ(`uc%5=0rrgL@YajkU zR(i+%y~qDVz5=1aPFTB%HPys=aoY|kw