black
and isort
everything
This commit is contained in:
parent
bb2ce5c8f4
commit
4481177ec6
7 changed files with 32 additions and 24 deletions
|
@ -8,6 +8,7 @@ from sacn import sACNsender
|
|||
|
||||
LOG = logging.getLogger('DMXQueue')
|
||||
|
||||
|
||||
class DMXQueue:
|
||||
def __init__(self, args, queue, lights):
|
||||
self.args = args
|
||||
|
@ -27,7 +28,7 @@ class DMXQueue:
|
|||
if not self.args.sacn_multicast:
|
||||
self.sacn[1].destination = self.args.sacn_target
|
||||
|
||||
self.dmx_data = 512*[0]
|
||||
self.dmx_data = 512 * [0]
|
||||
for i in range(1, 513):
|
||||
self._dmx(i, 0)
|
||||
|
||||
|
@ -41,12 +42,12 @@ class DMXQueue:
|
|||
self.sacn.stop()
|
||||
|
||||
def _dmx(self, addr, data):
|
||||
self.dmx_data[addr-1] = data
|
||||
self.dmx_data[addr - 1] = data
|
||||
self.sacn[1].dmx_data = tuple(self.dmx_data)
|
||||
|
||||
def _bulk(self, start_addr, values):
|
||||
for idx, value in enumerate(values):
|
||||
self._dmx(start_addr+idx, value)
|
||||
self._dmx(start_addr + idx, value)
|
||||
|
||||
def _update_all(self, intensity, red, green, blue, white=0):
|
||||
for light in self.lights:
|
||||
|
@ -97,7 +98,7 @@ class DMXQueue:
|
|||
elif level == 'info':
|
||||
for i in range(2):
|
||||
for intensity_multiplier in forward + reverse:
|
||||
self._update_all(intensity_multiplier*15, 0, 50, 255)
|
||||
self._update_all(intensity_multiplier * 15, 0, 50, 255)
|
||||
sleep(0.03)
|
||||
self.queue.task_done()
|
||||
except Empty:
|
||||
|
|
|
@ -2,6 +2,7 @@ import logging
|
|||
|
||||
LOG = logging.getLogger('DMX')
|
||||
|
||||
|
||||
class BaseDMXLight:
|
||||
def __init__(self, address):
|
||||
self.address = address
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
from .common import BaseDMXLight
|
||||
|
||||
|
||||
class IgnitionWALL710(BaseDMXLight):
|
||||
name = "Ignition WAL-L710 PAR"
|
||||
|
||||
|
@ -10,5 +11,5 @@ class IgnitionWALL710(BaseDMXLight):
|
|||
self.green,
|
||||
self.blue,
|
||||
self.white,
|
||||
0, # program
|
||||
0, # program
|
||||
]
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
from .common import BaseDMXLight
|
||||
|
||||
|
||||
class VarytecHeroWashZoom712(BaseDMXLight):
|
||||
name = "Varytec Hero Wash 712 Z RGBW Zoom"
|
||||
|
||||
def _dump(self):
|
||||
return self.address, [
|
||||
128, # pan
|
||||
128, # pan fine
|
||||
128, # tilt
|
||||
128, # tilt fine
|
||||
0, # speed
|
||||
128, # pan
|
||||
128, # pan fine
|
||||
128, # tilt
|
||||
128, # tilt fine
|
||||
0, # speed
|
||||
self.intensity,
|
||||
0, # shutter
|
||||
0, # shutter
|
||||
self.red,
|
||||
self.green,
|
||||
self.blue,
|
||||
self.white,
|
||||
0, # colortemp
|
||||
0, # color macro
|
||||
0, # zoom
|
||||
0, # auto run
|
||||
0, # colortemp
|
||||
0, # color macro
|
||||
0, # zoom
|
||||
0, # auto run
|
||||
]
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
from .common import BaseDMXLight
|
||||
|
||||
|
||||
class WLED(BaseDMXLight):
|
||||
name = "WLED"
|
||||
|
||||
|
|
8
main.py
8
main.py
|
@ -7,11 +7,10 @@ from sys import exit
|
|||
from time import sleep
|
||||
|
||||
from dmx_queue import DMXQueue
|
||||
from mqtt_queue import MQTTQueue
|
||||
|
||||
from lights.wled import WLED
|
||||
from lights.ignition_wal_l710 import IgnitionWALL710
|
||||
from lights.varytec_hero_wash_zoom_712 import VarytecHeroWashZoom712
|
||||
from lights.wled import WLED
|
||||
from mqtt_queue import MQTTQueue
|
||||
|
||||
logging.basicConfig(
|
||||
level=logging.DEBUG,
|
||||
|
@ -20,8 +19,8 @@ logging.basicConfig(
|
|||
|
||||
LOG = logging.getLogger('main')
|
||||
|
||||
def main():
|
||||
|
||||
def main():
|
||||
parser = ArgumentParser()
|
||||
|
||||
# rainbow is output if we have no effects
|
||||
|
@ -124,5 +123,6 @@ def main():
|
|||
|
||||
LOG.info('Bye!')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -8,6 +8,7 @@ from sacn import sACNsender
|
|||
|
||||
LOG = logging.getLogger('MQTTQueue')
|
||||
|
||||
|
||||
class MQTTQueue:
|
||||
def __init__(self, args, queue):
|
||||
self.args = args
|
||||
|
@ -44,10 +45,12 @@ class MQTTQueue:
|
|||
|
||||
text = re.sub(r'\<[a-z\/]+\>', '', data['msg'])
|
||||
|
||||
self.queue.put((
|
||||
data['level'].lower(),
|
||||
data['component'],
|
||||
text,
|
||||
))
|
||||
self.queue.put(
|
||||
(
|
||||
data['level'].lower(),
|
||||
data['component'],
|
||||
text,
|
||||
)
|
||||
)
|
||||
except Exception as e:
|
||||
LOG.exception(msg.payload)
|
||||
|
|
Loading…
Reference in a new issue