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

XOR operator and '-' options added to switches

Browse source
This commit is contained in:
Shy 2017-04-18 12:40:59 +02:00
parent e6e7493879
commit 5c5a404ba5
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
c4ctrl.py
View file

@ -553,9 +553,12 @@ class C4Room:
if userinput == "": return if userinput == "": return
# Let's support some geeky binary operations! # Let's support some geeky binary operations!
mode = 'n' # n = normal, a = AND, o = OR. mode = 'n' # n = normal, a = AND, o = OR, x = XOR.
if not userinput.isdecimal(): if not userinput.isdecimal():
if userinput[0] == '&' and userinput[1:].strip().isdecimal(): if userinput == '-':
print(self.get_switch_state())
return
elif userinput[0] == '&' and userinput[1:].strip().isdecimal():
# AND operator, applied later after doing some more validation. # AND operator, applied later after doing some more validation.
userinput = userinput[1:].strip() userinput = userinput[1:].strip()
mode = 'a' mode = 'a'
@ -565,6 +568,11 @@ class C4Room:
userinput = userinput[1:].strip() userinput = userinput[1:].strip()
mode = 'o' mode = 'o'
elif userinput[0] == '^' and userinput[1:].strip().isdecimal():
# XOR operator, applied later after doing some more validation.
userinput = userinput[1:].strip()
mode = 'x'
elif (userinput[:2] == ">>" or userinput[:2] == "<<") \ elif (userinput[:2] == ">>" or userinput[:2] == "<<") \
and (userinput[2:].strip() == "" or userinput[2:].strip().isdecimal()): and (userinput[2:].strip() == "" or userinput[2:].strip().isdecimal()):
# Left or right shift # Left or right shift
@ -621,6 +629,10 @@ class C4Room:
switch_state = self.get_switch_state() switch_state = self.get_switch_state()
userinput = "".join(map(lambda x, y: str(int(x) | int(y)), userinput = "".join(map(lambda x, y: str(int(x) | int(y)),
userinput, switch_state)) userinput, switch_state))
elif mode == 'x': # XOR operator.
switch_state = self.get_switch_state()
userinput = "".join(map(lambda x, y: str(int(x) ^ int(y)),
userinput, switch_state))
command=[] command=[]
for i in range(len(self.switches)): for i in range(len(self.switches)):
@ -1226,7 +1238,7 @@ if __name__ == "__main__":
# Ambient control # Ambient control
group_cl = parser.add_argument_group(title="ambient color control", group_cl = parser.add_argument_group(title="ambient color control",
description="PRESET may be either a preset name (which may be \ description="PRESET may be either a preset name (which may be \
abbreviated), '#' followed by a color value in hex notation (eg. \ abbreviated), '#' followed by a color value in hex notation (e.g. \
\"#ff0066\") or '-' to read from stdin.") \"#ff0066\") or '-' to read from stdin.")
group_cl.add_argument( group_cl.add_argument(
"-w", "--wohnzimmer", type=str, dest="w_color", metavar="PRESET", "-w", "--wohnzimmer", type=str, dest="w_color", metavar="PRESET",
@ -1250,9 +1262,11 @@ if __name__ == "__main__":
# Switch control # Switch control
group_sw = parser.add_argument_group(title="light switch control", group_sw = parser.add_argument_group(title="light switch control",
description="BINARY_CODE is a string of 0s or 1s for every light in a \ description="BINARY_CODE is a string of 0s or 1s for every light in a \
room. May be given as decimal. May be prepended by '&' or '|' as AND \ room. May be given as decimal. May be prepended by '&', '|' or '^' as \
or OR operators. Will show usage information and ask for input if \ AND, OR and XOR operators. Current switch states will be printed to \
omitted.") stdout if BINARY_CODE is '-'. Will show usage information and ask for \
input if BINARY_CODE is omitted. Will read from stdin if 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 in Wohnzimmer on/off")