From 2fc6fe0830ec896efe51aaaa52ad7208716e1dfb Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Tue, 16 Jul 2019 13:16:35 +0100
Subject: [PATCH] fix in CmdServer and change file name in config to .json

---
 src/CmdServer.py   |   2 +-
 src/Config.py      |   2 +-
 src/registers.json |   2 +-
 src/registers.pkl  | Bin 1823 -> 1683 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CmdServer.py b/src/CmdServer.py
index 17cbd02..a96fe93 100644
--- a/src/CmdServer.py
+++ b/src/CmdServer.py
@@ -309,7 +309,7 @@ class CmdInterpreter(cmd.Cmd):
         self.__println("DO NOT FORGET TO SAVE AFTERWARDS!")
 
     def do_save(self, arg):
-        RegisterDatapoint.saveRegisterFile(self.registers, self.config.registerFile)
+        RegisterDatapoint.saveRegisterList(self.registers, self.config.registerFile)
 
     def help_save(self):
         self.__println("Usage: save")
diff --git a/src/Config.py b/src/Config.py
index f1258c0..767974d 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -9,7 +9,7 @@ class Config(object):
         self.mqttPassword = ''
         self.cmdAddress = '127.0.0.1'
         self.cmdPort = 9999
-        self.registerFile = 'registers.pkl'
+        self.registerFile = 'registers.json'
         self.serialPort = '/dev/ttyAMA0'
         self.serialBaudRate = 9600
         self.interCommDelay = 0.025
diff --git a/src/registers.json b/src/registers.json
index 44ae397..17d623e 100644
--- a/src/registers.json
+++ b/src/registers.json
@@ -29,7 +29,7 @@
             "count": 1,
             "label": "Switches",
             "publishTopic": "Pub/Switches",
-            "scanRate": 60.0,
+            "scanRate": 0.25,
             "unit": 4,
             "updateOnly": false
         },
diff --git a/src/registers.pkl b/src/registers.pkl
index 4e159cb8896577ce5aa18b5ade71ef027a027308..881be921cbc6461e4fffe4ad805b43b65cc60c34 100644
GIT binary patch
literal 1683
zcmZ{k%X8aQ6vpKwCaE7u8VaGIKzO@6S{fSyG(6gbl18ywZbBj+q3Cg&D{v%#($%zC
zXa*LZj(7b7x`PEX{4=m%!GaYlwq3AehI3`vR+HE>vZZU?bAI1B-#tH!??J0MjPHAq
z<l&knt#;t~vUJ^V$MX0x3g>^sSc37IIiYD<?0XUudeNMshsd#fW=W2s<I<1x4tPm@
zxx6K<5+2hveMQ&qVUl6WEYb!ih<%AudLiB34!t1s<RMD5pn}W8Hb>c<rdv<ZEQT2+
zDrSWi+hO4FC|XUURGXUxvqY;r41=(@Hm&cbk-3kU$K1tCH_h9!Y~I4GS*F*w`9Yh9
zmW)G=)9FgfisWkGOUsd%8!8z{!sDx@$-gIO&Rm`<{CXE>I(UNNNpq5dS*{xr5#~w3
zDSB3+cC1#+@zfs9>i=3j?$~a5k=PE}o`VH*hF-iG+ZXdBPp4Aiwn}=#Zyn-XH@1bU
z{WA%ktqCf*C>nxFC#YJYEGnX^Yhs$NnXZ^kRj<bfo~!EloR||m=5l$tP=0t9iyb`A
z@Pe4v#{`kR*!-(tiG>tSkqmaeBvjrL+_C0GPRJ!sT{1KcUM9j<61=JiCqz-Go@*QT
ze;cQ^*BH(ZiPN^aS(wGNzj#elo5jMTDz@%;(h)qu>jM>3`9}G_Kk-HfZ!%mU6`E3U
zvDVE#Jf~%_|E*D4)`OPo`THk${Sv8JN>I<MDJTaw7~Uo+W4+>=v(!P+i!$`+J0#{@
zUreetifyWzXY*d?myN7Zsabh=3GY54vHG)t_d0l=;j)--ZagqgQ<^(;LOA2(=f1O6
z46{mq+~(Z1E$91Q><^4w2?p^$Bo8S~A0_zsn5HWXSBIK}!av)`7e`r_u$pJBSN`}1
zYaM*TaE(|uABYu0oW!t%Pcw$~1lNx-Y%u6Y7#2n{)UlaoXjFdx3C#`+h8x6SjAW>T
zJf7C!vjprI!xqE#5r)xqXyEfaL%sTojhzm58BAihIg+7)FEWNN6MU6tC@Ft^&9Fxd
z+2KCfU*AxJy5s%Bk~T<<pdB7YUf|<ao~tqKKg72kSPV9CT^Vwz5vY!Qf18tGxe0h4
zi;nR<+-BI%ur!)EL@=B=%jxXg%7qeSZ#4w7(6@Hsi8*7KJ{@t_t`1UvCl-v@<`@14
Du(<A`

literal 1823
zcmai!%XSo16o#vlbh=Xwbb=8Lhz1pHynrOp2*e9?#6Xb-Phu!95$bZtDXCP|Uzdd$
z)ItZfT>TD=oH_9sd<tidoH@fMVAnP2BrQGYUUmBHeZK$Sf1RI4Hz9Ql#<#2><o>c2
zYMyI3p?t&fqVV7{YUh5zNQ}{r+LR<IFf@m0A;*|u(obk@b2<GoxgBaU>WZW+DblYP
zXJ}*v+(E=6Zlc*&Wop2E-}Sq0<b;?|M${H9*;){GT_@Cx5b|!@sy|v?x$#e<-Cmq(
zJ`Qjs!BK`|YJ*BO)AV@|psm!@F?x<1E5xKySC7zx=eq{|nIASqi|P51m-fBw*gH7h
z&j>x=a(ye@!3)$RtBZ8o3dFkWSq7%nHdWn;^b6~J+vC0#Mn1=jYMoY%OvVW+o1mvu
z#)f7`94~F+W#y@s5rsP*$BcT6Hdv{{vwq<`PG&u9P3JaFWk&2h;gv`isr9F0yxI|C
zJ<;ro2}KgJ$lYkQ7Hh5le!^=BW*N?iwlX3}xR|0n$NPe`i0MpCioOzUTV^WpbwRX(
z_}*CkyQYa5aZ;ShOsICe8R>_FW7!G}pNBjP$!=zFmI&X9@iq~PYW5w5bNg{=c<tu+
zZ+IucyA1CUu0*(Fggbf=ckPiC8iEISzr;P?=@%a^ax=|>Xf|^d7YZF!=?91ESaEIB
za<&eM`9)GP7h`@v$pXWNg%b5BP4EHdrmh(e^Jsk3tENHnCdcnT#bSbw87_(T>dhym
zK6Q#JA5p?M<Mb|+A-UY!H>515+`ot`q<Vy8PEwu7fp=50ltn3sbQ*}I^PJ?9ULn8g
z@hQb8mGoJR&j%!3Ww=%jXHY<UJUWYRf@Ov;NWiU1fEb24hwC}2SQ7gY=I~{KuoC0O
z0K!cMWe7s^uL!pitTOZnq4#`*dE6d~Fb~Rp=E7Go*Z{&B!}<_}M)zNQonV9EE+O1`
zKEeXjp$H53ra<^M#&;z`ExjSXXV}aUYGQB@Gxa}r@I!)o4EG7)YKgGCJBak!OkeB`
z?gy6ZKqG?Mu*m57aMJs-+;0?AW(;0Z$tl$XhONVmIZ^-p4~PU7!;gEZt_-Jo_<vOP
zL8|S7%8B8YR8mUiF`%N#uJP;FD($|I)38)FNjZ=trhEDMf{x1W*R?&41@y+Gw|3#k
Ly}Jk_ou7XO;AIxx