simon/led-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename provider, name threads

Browse Source
This commit is contained in:
simon 2019-05-04 12:09:51 +02:00
parent 3d351f423a
commit 99787f74a1
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/BackendProvider/WemosStripUDPServer.py → server/BackendProvider/UDPSocketProvider.py
View File

@ -9,7 +9,7 @@ import struct
class ThreadedUDPServer(threading.Thread): class ThreadedUDPServer(threading.Thread):
def __init__(self, effectController, rgbStripController): def __init__(self, effectController, rgbStripController):
threading.Thread.__init__(self) threading.Thread.__init__(self, name="ThreadedUDPServer")
self.effectController = effectController self.effectController = effectController
self.rgbStripController = rgbStripController self.rgbStripController = rgbStripController
self.daemon = True self.daemon = True
@ -34,7 +34,7 @@ class ThreadedUDPServer(threading.Thread):
# when there is no answer after 2 seconds # when there is no answer after 2 seconds
class UDPClientGuardian(threading.Thread): class UDPClientGuardian(threading.Thread):
def __init__(self): def __init__(self):
threading.Thread.__init__(self) threading.Thread.__init__(self,name="UDPClientGuardian")
self.stopped = False self.stopped = False
def run(self): def run(self):

2
server/BackendProvider/WebSocketServer.py → server/BackendProvider/WebSocketProvider.py
View File

@ -4,7 +4,7 @@ from functools import partial
class ThreadedWebSocketServer(Thread): class ThreadedWebSocketServer(Thread):
def __init__(self,effectController,rgbStripController): def __init__(self,effectController,rgbStripController):
Thread.__init__(self) Thread.__init__(self,name="WebSocketServer")
self.effectController = effectController self.effectController = effectController
self.rgbStripController = rgbStripController self.rgbStripController = rgbStripController
self.daemon = True self.daemon = True

10
server/LEDServer.py
View File

@ -39,13 +39,13 @@ def main():
# or an other frontend / rgbStrip backend provider not using websockets. you could integrate alexa, phillips hue like lamps or whatever you like! # or an other frontend / rgbStrip backend provider not using websockets. you could integrate alexa, phillips hue like lamps or whatever you like!
# but then there must be some autoloading of modules in a folder like the effects for easy installing. //todo :) # but then there must be some autoloading of modules in a folder like the effects for easy installing. //todo :)
print("starting websocket:8001") print("starting websocket:8001")
import BackendProvider.WebSocketServer as WebSocketServer import BackendProvider.WebSocketProvider as WebSocketProvider
webSocketThread = WebSocketServer.ThreadedWebSocketServer( webSocketThread = WebSocketProvider.ThreadedWebSocketServer(
effectController, rgbStripController) effectController, rgbStripController)
print("starting UDPServer:8002") print("starting UPDSocketProvider:8002")
import BackendProvider.WemosStripUDPServer as UPDSocketServer import BackendProvider.UDPSocketProvider as UPDSocketProvider
udpSocketThread = UPDSocketServer.ThreadedUDPServer( udpSocketThread = UPDSocketProvider.ThreadedUDPServer(
effectController, rgbStripController) effectController, rgbStripController)
while running: while running:

6
server/rgbUtils/effectController.py
View File

@ -34,6 +34,7 @@ class effectController:
self.effectsList = self.getEffectsListFromDir() self.effectsList = self.getEffectsListFromDir()
# start the offEffect by default # start the offEffect by default
self.offEffectThreadObject = self.startEffect(offEffect,[]) self.offEffectThreadObject = self.startEffect(offEffect,[])
# - a bit of failover handling, remove dead threads from effectThread array # - a bit of failover handling, remove dead threads from effectThread array
# - move strips without an effect to the offEffect # - move strips without an effect to the offEffect
self.effectGuardian = self.effectGuardian(self) self.effectGuardian = self.effectGuardian(self)
@ -156,9 +157,12 @@ class effectController:
self.effectThreads.remove(effectThread) self.effectThreads.remove(effectThread)
self.noticeControllerChange() self.noticeControllerChange()
# - a bit of failover handling, remove dead threads from effectThread array
# - move strips without an effect to the offEffect
class effectGuardian(threading.Thread): class effectGuardian(threading.Thread):
def __init__(self, effectController): def __init__(self, effectController):
threading.Thread.__init__(self) threading.Thread.__init__(self, name='effectGuardian')
self.effectController = effectController self.effectController = effectController
self.stopped = False self.stopped = False