equal
deleted
inserted
replaced
7 |
7 |
8 import logging; log = logging.getLogger('dmx') |
8 import logging; log = logging.getLogger('dmx') |
9 |
9 |
10 import optparse |
10 import optparse |
11 |
11 |
12 def dmx_heads (options) : |
12 def dmx_universe (options, dmx) : |
13 from qmsk.dmx import heads |
13 from qmsk.dmx import heads |
14 |
14 |
15 return { |
15 return heads.Universe(dmx, { |
16 'ledpar': heads.Stairville_LEDPar56(1), |
16 'ledpar': heads.Stairville_LEDPar56(1), |
17 'par1': heads.Dimmer(5), |
17 'par1': heads.Dimmer(5), |
18 'par2': heads.Dimmer(6), |
18 'par2': heads.Dimmer(6), |
19 'ledbar_roof': heads.AmericanDJ_MegaTri60_Mode2(10), |
19 'ledbar_roof': heads.AmericanDJ_MegaTri60_Mode2(10), |
20 'ledbar_floor': heads.AmericanDJ_MegaTri60_Mode2(20), |
20 'ledbar_floor': heads.AmericanDJ_MegaTri60_Mode2(20), |
21 } |
21 }) |
22 |
22 |
23 def main (argv) : |
23 def main (argv) : |
24 """ |
24 """ |
25 DMX web control. |
25 DMX web control. |
26 """ |
26 """ |
40 if options.dmx_serial : |
40 if options.dmx_serial : |
41 dmx = qmsk.dmx.DMX.open(options.dmx_serial) |
41 dmx = qmsk.dmx.DMX.open(options.dmx_serial) |
42 #dmx.zero() |
42 #dmx.zero() |
43 else : |
43 else : |
44 dmx = None |
44 dmx = None |
|
45 |
|
46 universe = dmx_universe(options, dmx) |
45 |
47 |
46 # app |
48 # app |
47 app = qmsk.dmx.web.DMXWebApplication(dmx, dmx_heads(options)) |
49 app = qmsk.dmx.web.DMXWebApplication(universe) |
48 |
50 |
49 pvl.web.args.main(options, app) |
51 pvl.web.args.main(options, app) |
50 |
52 |
51 if __name__ == '__main__': |
53 if __name__ == '__main__': |
52 pvl.args.main(main) |
54 pvl.args.main(main) |