Merge branch 'master' into deploy
This commit is contained in:
commit
ceb0f3dc46
|
@ -41,17 +41,24 @@ def on_message(client, userdata, msg):
|
|||
text = payload
|
||||
|
||||
#flipdot.send_marquee(text, speed)
|
||||
if flipthread is not None:
|
||||
if flipthread is not None and flipthread.isAlive():
|
||||
flipdot.stopAnimation()
|
||||
while flipthread.isAlive():
|
||||
flipdot.stopAnimation() #try to stop animation
|
||||
time.sleep(0.1)
|
||||
flipthread.join() #wait for thread to finish
|
||||
|
||||
flipthread=Thread(target=flipdot.send_marquee, args=(text,speed))
|
||||
flipthread.start()
|
||||
|
||||
if msg.topic == "raum2/flipdot/text/set":
|
||||
payload = msg.payload.decode("utf-8")
|
||||
|
||||
if flipthread is not None:
|
||||
if flipthread is not None and flipthread.isAlive():
|
||||
flipdot.stopAnimation()
|
||||
while flipthread.isAlive():
|
||||
flipdot.stopAnimation() #try to stop animation
|
||||
time.sleep(0.1)
|
||||
flipthread.join()
|
||||
|
||||
if len(payload)>0 and payload[0]=='~':
|
||||
|
|
Loading…
Reference in New Issue