wn/RelayBoxWebApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add measurementValues list in app, not yet in webpage

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2016-07-06 22:36:47 +02:00
parent b7c31e0e14
commit e81c4cde61
1 changed files with 84 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
LaundryServer.py
View File

@ -9,7 +9,13 @@ from twisted.web.static import File
import paho.mqtt.client as mqtt
import json
logfile = '/opt/logs/laundry.log'
LOGFILE_pre = '/tmp/'
APP_LOGFILE = LOGFILE_pre + 'laundry.log'
SERVER_LOGFILE = LOGFILE_pre + 'laundryServer.log'
TOPIC_RELAYBOX_STATE = "IoT/Status/RelayBox"
TOPIC_PARSEDDATA_pre = "IoT/ParsedData"
TOPIC_PARSEDDATA = TOPIC_PARSEDDATA_pre + "/#"
switchMapping = {
'oven': { 'index': 1, 'label': 'Herd' },
@ -20,11 +26,21 @@ switchMapping = {
'light2flr': { 'index': 5, 'label': 'Licht OG' },
}
loadedSwitchStates = ['x0', 'x1', 'x2', 'x3', 'x4', 'x5', 'x6', 'x7']
measurementValues = {}
def log(m):
t = strftime("%d %b %Y %H:%M:%S", gmtime())
with open(APP_LOGFILE, 'a') as f:
f.write("%s %s\n" % (t, m))
def on_message(client, userdata, msg):
topic = msg.topic
if (topic == TOPIC_RELAYBOX_STATE):
j = json.loads(msg.payload)
ss = j['data']['switchStates']
for s in ss:
@ -34,14 +50,58 @@ def on_message(client, userdata, msg):
loadedSwitchStates[s['index']] = 'an'
else:
loadedSwitchStates[s['index']] = 'unbekannt'
elif (topic.startswith(TOPIC_PARSEDDATA_pre)):
j = json.loads(msg.payload)
data = j['data']
metadata = j['metadata']
if ('category' in metadata):
category = metadata['category']
else:
if (('device' in metadata) and ('Slave' in metadata) and
(metadata['device'] == 'ModbusHub') and (metadata['Slave'] == 'Thermometer')):
category = 'FreezeThermometer'
if (category in ['OnePhaseElectric_Finder', 'ThreePhaseElectric_Finder']):
measurementValues[metadata['name']] = [
{'label': 'Leistung', 'value': data['power']},
{'label': 'Verbrauch', 'value': data['energy']},
{'label': 'Strom', 'value': data['current']},
]
elif (category == 'Watermeter_Hyd'):
measurementValues[metadata['name']] = [
{'label': 'Durchfluss', 'value': data['flow']},
{'label': 'Verbrauch', 'value': data['volume']},
{'label': 'Temperatur', 'value': data['temperature']},
]
elif (category == 'OS'):
measurementValues[metadata['name']] = [
{'label': '1min', 'value': data['loadavg'][0]},
{'label': '5min', 'value': data['loadavg'][1]},
{'label': '15min', 'value': data['loadavg'][2]},
{'label': 'Uptime', 'value': data['uptime']},
]
elif (category == 'Thermometer_Hottis'):
measurementValues[metadata['name']] = [
{'label': 'Temperatur Aussen', 'value': data['temperature2']},
{'label': 'Temperatur Haus', 'value': data['temperature4']},
{'label': 'Temperatur Innen', 'value': data['temperature3']},
{'label': 'Uptime', 'value': data['operatingTime']},
]
elif (category == 'FreezeThermometer'):
measurementValues[metadata['name']] = [
{'label': 'Temperatur Gefrierschrank', 'value': data['t2']},
{'label': 'Temperatur Kuehlschrank', 'value': data['t1']},
]
else:
log('unexpected category')
class MyResource(Resource):
def log(self, m):
t = strftime("%d %b %Y %H:%M:%S", gmtime())
with open(logfile, 'a') as f:
f.write("%s %s\n" % (t, m))
log(m)
def send_message(self, target, switchState):
try:
@ -107,11 +167,18 @@ class SwitchMapping(MyResource):
def render_GET(self, request):
return json.dumps(switchMapping,indent=2, separators=(',', ': '))
class MeasurementValues(MyResource):
isLeaf = False
def render_GET(self, request):
return json.dumps(measurementValues,indent=2, separators=(',', ': '))
mqttClient = mqtt.Client()
mqttClient.on_message = on_message
mqttClient.connect("mqttbroker", 1883, 60)
mqttClient.subscribe("IoT/Status/RelayBox")
mqttClient.subscribe(TOPIC_RELAYBOX_STATE)
mqttClient.subscribe(TOPIC_PARSEDDATA)
mqttClient.loop_start()
root = Resource()
@ -120,8 +187,9 @@ root.putChild("Hello", HelloWorld())
root.putChild("switchCommand", SwitchCommand())
root.putChild("switchStatus", SwitchStatus())
root.putChild("switchMapping", SwitchMapping())
root.putChild("measurementValues", MeasurementValues())
factory = Site(root, logPath='/opt/logs/laundryServer.log')
factory = Site(root, logPath=SERVER_LOGFILE)
reactor.listenTCP(8080, factory)
reactor.run()