From 6c3b093ed9d96cb93d7e79b673ba323ae41c5139 Mon Sep 17 00:00:00 2001
From: johannes walcher <johannes.walcher@stusta.de>
Date: Thu, 26 Jul 2018 18:48:29 +0200
Subject: [PATCH] python i hate you for runtime types
---
hackerman/hackerman.py | 5 +++--
rupprecht/rupprecht.py | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hackerman/hackerman.py b/hackerman/hackerman.py
index 17f3c9f..1747da0 100644
--- a/hackerman/hackerman.py
+++ b/hackerman/hackerman.py
@@ -22,15 +22,16 @@ class Hackerman:
"""
React to a status change of the hackerspace - switch the lights, ...
"""
+ del client
try:
if 'haspa' in message:
- if message['haspa'] == 'open':
+ if message['haspa'] in ['open', 'offen', 'auf']:
await self.hbf.publish('/haspa/power', {
'table':1023,
'fan':1023,
'ledstrip':400,
})
- elif message['haspa'] == 'closed':
+ elif message['haspa'] in ['close', 'zu', 'closed']:
await self.hbf.publish('/haspa/power', {
'table':0,
'fan':0,
diff --git a/rupprecht/rupprecht.py b/rupprecht/rupprecht.py
index 8ab1209..9fd94fc 100644
--- a/rupprecht/rupprecht.py
+++ b/rupprecht/rupprecht.py
@@ -49,7 +49,9 @@ class Rupprecht:
async def teardown(self):
await self.hbf.teardown()
- async def command_led(self, source, payload, msg):
+ async def command_led(self, source, payload, mqttmsg):
+ del source, payload
+ msg = json.loads(mqttmsg.payload.decode('utf-8'))
for devid, value in msg.items():
try:
if value == 0:
@@ -62,10 +64,10 @@ class Rupprecht:
async def button_message(self, msg):
if msg['open'] and not self.space_is_open:
self.space_is_open = True
- await self.hbf.publish('/haspa/status', 'open')
+ await self.hbf.publish('/haspa/status', json.dumps({'haspa':'open'}))
elif not msg['open'] and self.space_is_open:
self.space_is_open = False
- await self.hbf.publish('/haspa/status', 'closed')
+ await self.hbf.publish('/haspa/status', json.dumps({'haspa':'closed'}))
class RupprechtInterface:
class SerialProtocol(asyncio.Protocol):
--
GitLab