From 60afc1ad6f265b4bb622c787e7d89db60b1d106f Mon Sep 17 00:00:00 2001
From: Johannes Walcher <johannes.walcher@stusta.de>
Date: Thu, 6 Jun 2019 16:38:06 +0200
Subject: [PATCH] all those small changes
---
babel/babel.py | 18 ++++++-------
hackerman/hackerman.py | 14 ++++++++++
requirements.txt | 4 +++
rupprecht/rcswitch.py | 8 ++++--
rupprecht/rupprecht.py | 39 +++++++++++++++++++---------
systemd/hauptbahnhof-module@.service | 3 ++-
systemd/hauptbahnhof.target | 3 ++-
7 files changed, 64 insertions(+), 25 deletions(-)
create mode 100644 requirements.txt
diff --git a/babel/babel.py b/babel/babel.py
index 3db7022..b7c7723 100644
--- a/babel/babel.py
+++ b/babel/babel.py
@@ -16,17 +16,17 @@ class Babel:
self.hbf.subscribe('/haspa/power/requestinfo', self.command_requestinfo)
self.hbf.subscribe('/haspa/power/status', self.command_requeststatus)
- self.ledstrip_states = [[0, 0, 0, 0], [0, 0, 0, 0]]
- self.espids = ['a9495a00', 'c14e5a00']
+ self.ledstrip_states = [[0] * 8, [0] * 8]
+ #self.espids = ['a9495a00', 'c14e5a00']
+ # new 4 channel ESPs
+ self.espids = ['f97c7300', 'dfd80b00']
# mapps from (color, id) ==> (self.ledstrip indexes)
self.idxpair = {
- # The first one has cold and warm swapped...
- ('w', 2):(0, 0),
- ('c', 2):(0, 1),
- ('w', 1):(0, 2),
- ('c', 1):(0, 3),
- # This one has cold and warm right
+ ('c', 2):(0, 0),
+ ('w', 2):(0, 1),
+ ('c', 1):(0, 6),
+ ('w', 1):(0, 7),
('c', 3):(1, 0),
('w', 3):(1, 1),
('c', 4):(1, 2),
@@ -55,7 +55,7 @@ class Babel:
## The lamp is managed by rupprecht
if lamp in self.rupprecht_map:
msg[self.rupprecht_map[lamp][0]] = int(value)
- self.rupprecht_map[lamp][1] = int(value)
+ self.rupprecht_map[lamp] = (self.rupprecht_map[lamp][0], int(value))
## The lamp is a led strip and needs to be aggregated
if lamp.startswith('ledstrip'):
diff --git a/hackerman/hackerman.py b/hackerman/hackerman.py
index b623d51..415c38b 100644
--- a/hackerman/hackerman.py
+++ b/hackerman/hackerman.py
@@ -54,12 +54,26 @@ class Hackerman:
async def command_action(self, client, message, _):
""" Handle actions like alarm or party """
del client
+ print(message)
if 'action' in message:
if message['action'] == 'alarm':
+ print("Performing alarm...")
await self.hbf.publish('/haspa/power', {'alarm':1023})
await asyncio.sleep(2)
await self.hbf.publish('/haspa/power', {'alarm':0})
+ elif message['action'] == 'strobo':
+ for i in range(100):
+ await self.hbf.publish('/haspa/power', {
+ 'ledstrip-c': 0
+ })
+ await asyncio.sleep(0.05)
+ await self.hbf.publish('/haspa/power', {
+ 'ledstrip-c': 1023
+ })
+ await asyncio.sleep(0.03)
+
+
elif message['action'] == 'party':
await self.hbf.publish('/haspa/power', {
'alarm':0,
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..37f6209
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+libconf==1.0.1
+paho-mqtt==1.3.1
+pyserial==3.4
+pyserial-asyncio==0.4
diff --git a/rupprecht/rcswitch.py b/rupprecht/rcswitch.py
index 9851d52..44b3512 100644
--- a/rupprecht/rcswitch.py
+++ b/rupprecht/rcswitch.py
@@ -92,10 +92,14 @@ class Quigg1000:
async def __send_msg(self, msg):
if self.rupprecht:
+ print("sending via rupprecht message", msg)
await self.rupprecht.light(msg)
+ await asyncio.sleep(1)
if self.serial:
+ print("sending via raw message", msg)
try:
- self.ser.write(str.encode(msg))
+ self.serial.write(str.encode(msg))
+ await asyncio.sleep(1)
except serial.SerialException:
print('Serial communication failed.')
@@ -113,6 +117,7 @@ def main():
default=False, action='store_true')
args = parser.parse_args()
+ loop=asyncio.get_event_loop()
try:
s = serial.Serial(args.device, 9600)
@@ -121,7 +126,6 @@ def main():
exit()
r = Quigg1000(serial=s, loop=loop, code=args.set_code, subaddr=args.addr)
- loop=asyncio.get_event_loop()
loop.run_until_complete(r.state(args.state, args.debug))
if __name__ == '__main__':
diff --git a/rupprecht/rupprecht.py b/rupprecht/rupprecht.py
index c55709c..bb31da6 100644
--- a/rupprecht/rupprecht.py
+++ b/rupprecht/rupprecht.py
@@ -52,9 +52,9 @@ class Rupprecht:
async def teardown(self):
await self.hbf.teardown()
- async def command_led(self, source, payload, mqttmsg):
- del source, payload
- msg = json.loads(mqttmsg.payload.decode('utf-8'))
+ async def command_led(self, source, msg, mqttmsg):
+ print("having LED command", msg)
+ del source, mqttmsg
for devid, value in msg.items():
try:
if value == 0:
@@ -68,17 +68,16 @@ class Rupprecht:
if msg['open'] and not self.space_is_open:
self.space_is_open = True
await self.hbf.publish('/haspa/status', {'haspa':'open'})
- self.rupprecht.text("Status:Open... StuStaNet.e.V....")
+ await self.rupprecht.text("Status:Open... StuStaNet.e.V....")
elif not msg['open'] and self.space_is_open:
self.space_is_open = False
await self.hbf.publish('/haspa/status', {'haspa':'closed'})
- self.rupprecht.text("Status:Closed... StuStaNet.e.V....")
+ await self.rupprecht.text("Status:Closed... StuStaNet.e.V....")
class RupprechtInterface:
def __init__(self, serial_port, baudrate=115200, loop=None):
self.loop = loop or asyncio.get_event_loop()
-
self.button_callbacks = [];
coro = serial_asyncio.open_serial_connection(loop=self.loop, url=serial_port,
@@ -106,17 +105,31 @@ class RupprechtInterface:
async def receive_messages(self):
while True:
- line = await self.reader.readline()
- line = line.strip()
+ try:
+ print("Waiting for input:")
+ line = await self.reader.readline()
+ except serial.SerialException:
+ print("SerialException, will terminate")
+ self.loop.cancel()
+ return
+ print("Received: ", line)
+ line = line.decode('ascii').strip()
if str.startswith(line, "BUTTON"):
+ print("Button message")
await self.button_queue.put(line[len("BUTTON"):])
else:
+ print("Into data queue")
await self.data_queue.put(line)
+ print("done")
async def handlecallbacks(self):
- await self.send_raw("CONFIG ECHO OFF")
# filter out the last echo
- await self.data_queue.get()
+ #await self.data_queue.get()
+ #print("Waiting for message")
+ #while "READY" != self.data_queue.get():
+ # pass
+ #await self.send_raw("CONFIG ECHO OFF", expect_response=False)
+ print("Rupprecht finally there")
while True:
button_msg = await self.button_queue.get()
@@ -128,7 +141,7 @@ class RupprechtInterface:
for callback in self.button_callbacks:
try:
- callback(buttons)
+ await callback(buttons)
except Exception as e:
print("Exception while executing callback for", button_msg , e)
@@ -141,8 +154,10 @@ class RupprechtInterface:
This will wait, until the preceding message has been processed.
"""
-
+ print("Sending RUPPRECHT message: ", msg)
self.writer.write(msg.encode('ascii'))
+ if msg[-1] != "\n":
+ self.writer.write(b"\n")
await self.writer.drain()
if expect_response:
return await self.data_queue.get()
diff --git a/systemd/hauptbahnhof-module@.service b/systemd/hauptbahnhof-module@.service
index 7eeeb83..98f491e 100644
--- a/systemd/hauptbahnhof-module@.service
+++ b/systemd/hauptbahnhof-module@.service
@@ -1,6 +1,7 @@
[Unit]
Description=Hauptbahnhof %i-Module
-After=network.target
+After=network-online.target
+Requires=mosquitto.service
Before=hauptbahnhof.service
[Service]
diff --git a/systemd/hauptbahnhof.target b/systemd/hauptbahnhof.target
index 4422514..f598395 100644
--- a/systemd/hauptbahnhof.target
+++ b/systemd/hauptbahnhof.target
@@ -1,5 +1,6 @@
[Unit]
Description=Hauptbahnhof Hackerspace Control System
+Wants=mosquitto.service
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
--
GitLab