This commit is contained in:
2020-08-11 09:04:00 -05:00
parent de3490d49a
commit 3008541fce
17 changed files with 3061 additions and 2289 deletions

View File

@@ -8,7 +8,7 @@
"file4": "Tags.py"
},
"deviceName": "plcfreshwater",
"releaseVersion": "11",
"releaseVersion": "12",
"driverFileName": "plcfreshwater.py",
"driverId": "0100"
}

View File

@@ -53,7 +53,7 @@ class start(threading.Thread, deviceBase):
mqtt=mqtt, Nodes=Nodes)
self.daemon = True
self.version = "11"
self.version = "12"
self.finished = threading.Event()
self.force_send = False
self.public_ip_address = ""
@@ -276,11 +276,11 @@ class start(threading.Thread, deviceBase):
#if a comms error use the stored values else use the latested values
if val == None:
PERSIST['Previous Months'] = PERSIST['Current Months']
PERSIST['Current Month'] = 0
PERSIST['Current Months'] = 0
PERSIST['Monthly Holding'] = PERSIST['Lifetime']
else:
PERSIST['Previous Months'] = val - PERSIST['Monthly Holding']
PERSIST['Current Month'] = 0
PERSIST['Current Months'] = 0
PERSIST['Monthly Holding'] = val
PERSIST['Month'] = month
self.sendtodbDev(1, 'total_fm_month_gal', PERSIST['Current Months'], 0, 'plcfreshwater')