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

Implemented fluffyd configuration by payload

Browse source
This commit is contained in:
Shy 2017-03-24 12:04:00 +01:00
parent c645988ef3
commit eeda46650f
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
c4ctrl.py
View file

@ -232,18 +232,22 @@ class C4Room:
return self.c4.push(cmd) return self.c4.push(cmd)
def set_colorscheme(self, colorscheme, magic=False): def set_colorscheme(self, colorscheme, magic):
"""Apply colorscheme to the LED Cans in this room.""" """Apply colorscheme to the LED Cans in this room."""
cmd = [] cmd = []
for light in self.lights: for light in self.lights:
if colorscheme.color_for(light.topic): if colorscheme.color_for(light.topic):
if magic: # Send color to ghost, but skip masters if magic != None: # Send color to ghost, but skip masters
if light.is_master: continue if light.is_master: continue
mode_id, error = Fluffy().mode_id(magic)
if error:
print("Warning: unknown mode \"{}\". Using default.".format(magic))
light.set_color(colorscheme.color_for(light.topic)) light.set_color(colorscheme.color_for(light.topic))
cmd.append({ cmd.append({
"topic" : "ghosts" + light.topic[light.topic.find('/'):], "topic" : "ghosts" + light.topic[light.topic.find('/'):],
"payload" : light.payload "payload" : light.payload + int(mode_id).to_bytes(1, "little")
}) })
else: else:
light.set_color(colorscheme.color_for(light.topic)) light.set_color(colorscheme.color_for(light.topic))
@ -332,7 +336,7 @@ class Keller(C4Room):
("Vorne", "licht/keller/vorne") ("Vorne", "licht/keller/vorne")
) )
master = "" master = ""
lights = tuple() lights = ()
class Kitchenlight: class Kitchenlight:
@ -751,6 +755,26 @@ class ColorScheme:
print("Wrote preset \"{}\"".format(name)) print("Wrote preset \"{}\"".format(name))
class Fluffy:
"""Fluffyd functions."""
modes = {
"fade" : 1,
"wave" : 4
}
def mode_id(self, name):
if name.isdecimal():
if int(name) in self.modes.values():
return (int(name), False)
else:
if name.lower() in self.modes.keys():
return (self.modes[name.lower()], False)
# Fallback
return (1, True)
class RemotePresets: class RemotePresets:
"""Remote preset control.""" """Remote preset control."""
@ -958,8 +982,8 @@ if __name__ == "__main__":
"-f", "--fnordcenter", type=str, dest="f_color", metavar="PRESET", "-f", "--fnordcenter", type=str, dest="f_color", metavar="PRESET",
help="apply local colorscheme PRESET to Fnordcenter") help="apply local colorscheme PRESET to Fnordcenter")
group_cl.add_argument( group_cl.add_argument(
"-m", "--magic", action="store_true", default=False, "-m", "--magic", type=str, metavar="MODE",
help="EXPERIMENTAL: blend into preset (needs a running instance of fluffyd on the network)") help="EXPERIMENTAL: blend into preset (needs a running instance of fluffyd on the network). MODE is either \"fade\" or \"wave\".")
group_cl.add_argument( group_cl.add_argument(
"-l", "--list-presets", action="store_true", "-l", "--list-presets", action="store_true",
help="list locally available presets") help="list locally available presets")