shy/c4ctrl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added support for the sockets in the Wohnzimmer.

Browse source
This commit is contained in:
Shy 2017-12-11 18:46:27 +01:00
parent 8e20df740c
commit ccbe2c8912
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
c4ctrl.py
View file

@ -743,7 +743,9 @@ class Wohnzimmer(C4Room): # {{{1
("Tür", "licht/wohnzimmer/tuer"), ("Tür", "licht/wohnzimmer/tuer"),
("Mitte", "licht/wohnzimmer/mitte"), ("Mitte", "licht/wohnzimmer/mitte"),
("Flur", "licht/wohnzimmer/gang"), ("Flur", "licht/wohnzimmer/gang"),
("Küche", "licht/wohnzimmer/kueche") ("Küche", "licht/wohnzimmer/kueche"),
("Leseleuchte", "socket/wohnzimmer/screen/a"),
("Infoscreen", "socket/wohnzimmer/screen/b")
) )
master = Dmx7("dmx/wohnzimmer/master") master = Dmx7("dmx/wohnzimmer/master")
lights = ( lights = (
@ -908,10 +910,8 @@ class ColorScheme: # {{{1
from random import randint, sample from random import randint, sample
channels = [15] channels = [15, 0]
channels.append(randint(0,15)) channels.append(randint(0,15))
channels.append(randint(0,15) - channels[1])
if channels[2] < 0: channels[2] = 0
color = "" color = ""
for ch in sample(channels, k=3): for ch in sample(channels, k=3):
@ -1326,7 +1326,7 @@ if __name__ == "__main__": # {{{1
BINARY_CODE \ is omitted and stdin is not connected to a TTY.") BINARY_CODE \ is omitted and stdin is not connected to a TTY.")
group_sw.add_argument( group_sw.add_argument(
"-W", nargs='?', dest="w_switch", const="", metavar="BINARY_CODE", "-W", nargs='?', dest="w_switch", const="", metavar="BINARY_CODE",
help="switch lights in Wohnzimmer on/off") help="switch lights and sockets in Wohnzimmer on/off")
group_sw.add_argument( group_sw.add_argument(
"-P", nargs='?', dest="p_switch", const="", metavar="BINARY_CODE", "-P", nargs='?', dest="p_switch", const="", metavar="BINARY_CODE",
help="switch lights in Plenarsaal on/off") help="switch lights in Plenarsaal on/off")