@@ -8,24 +8,70 @@ import os, sys, imp, subprocess, curses, curses.ascii, curses.wrapper datapath = None data = None dbodata = {} +binddata = {} chandata = {} activename = '' +dmxcommands = {'get' : 'k8062 [channel]', + 'set' : 'k8062 [channel] [value]'} # ----- Function Definitions ----- # +def printhelp(): + print("Usage: pydmx (help | [model] [startchannel])") + print("The model and startchannel are optional, if not specified use the new command.") + print("PyDMX also accepts commands from stdin, just make sure you end with an exit command to avoid an error message.\n") + print("Internal commands:") + print(" new [name] [model] [startchannel] - initialise a new named device.") + print(" names - list all devices.") + print(" change [name] - change to a different named device.") + print(" rename [old] [new] - change the name of a device. If the active device is renamed, a change command must immediately follow.") + print(" bind [name] [chan] [name] [chan] - always have the two channel values equal.") + print(" unbind [name] [chan] [name] [chan] - undo a bind command.") + print(" reload - reload cached DMX values for the current device from dmxd.") + print(" curses - start the ncurses interface.") + print(" list (arg) - list all commands for the current device provided by the data file. If arg is specified, restrict to that category.") + print(" dbo - toggle dead black out.") + print(" dmxgetcmd [command] - set the DMX get command (default: k8062 [channel]).") + print(" dmxsetcmd [command] - set the DMX set command (default: k8062 [channel] [value]).") + print(" dmxcommands - print the current DMX commands.") + print(" help - display this text") + print(" exit - close pydmx\n") + print("Curses UI:") + print(" Up - increment the value of the current channel.") + print(" Down - decrement the value of the current channel.") + print(" Left - change to the previous channel.") + print(" Right - change to the next channel.") + print(" Page Up - increment the value of the current channel by 10.") + print(" Page Down - decrement the value of the current channel by 10.") + print(" n - change to the next discrete region for that channel.") + print(" p - change to the previous discrete region for that channel.") + print(" t - change the value of the channel to 255.") + print(" b - change the value of the channel to 0.") + print(" h - toggle hold mode. Any changes made in hold more are applied when hold mode is disabled.") + print(" d - equivalent of dbo command.") + print(" r - equivalent of reload command.") + print(" q - close the interface.\n") + print("PyDMX requires that dmxd be running as root, and that k8062 be executable and in your $PATH.") + print("PyDMX is developed and maintained by Barrucadu (Michael Walker).") + def dmxcmd(channel, value=None, name=None, holding=False): global activename global chandata - + global bindddata + global dmxcommands + if name == None: name = activename argvector = [] if value == None: - argvector = ["k8062", str(channel)] + argvector = dmxcommands['get'].replace('[channel]', str(channel)).split() else: chandata[name][channel][0] = int(value) - channel += chandata[name]['info']['startchan'] - argvector = ["k8062", str(channel), str(value)] + argvector = dmxcommands['set'].replace('[channel]', str(channel)).replace('[value]', str(value)).split() + + if name in binddata.keys(): + for binded in binddata[(name, channel)]: + dmxcmd(binded[1], value, binded[0], holding) if not holding: process = subprocess.Popen(argvector, stdout=subprocess.PIPE) @@ -64,7 +110,7 @@ def dbo(): global chandata global dbodata - if not dbodata = {}: + if not dbodata == {}: for channel in dbodata.keys(): dmxcmd(channel, dbodata[channel]) dbodata = {} @@ -209,7 +255,6 @@ def updateui(stdscr, active, holding): highest = chan stdscr.addstr(highest[1]) - def cursesui(stdscr): global chandata @@ -316,10 +361,12 @@ def listcmds(arg): print(" " + cmd[0], cmd[1].rjust(len(cmd[1]) + spacing)) print() -def parsecmd(command, arg, arg2, arg3): +def parsecmd(command, args): global data global chandata global activename + global binddata + global dmxcommands funbreak = False @@ -338,66 +385,64 @@ def parsecmd(command, arg, arg2, arg3): print(" Start:", chandata[name]['info']['startchan']) elif command == "new": - if arg == "" or arg2 == "" or arg3 == "": + if len(args) < 3 or args[0] == "" or args[1] == "" or args[2] == "": print("Usage: new [name] [model] [startchannel]") else: - nameinit(arg, arg2, arg3) + nameinit(args[0], args[1], args[2]) elif command == "change": - if not arg == "" and arg in chandata.keys(): - activename = arg - else: + if len(args) < 1 or args[0] == "" or not args[0] in chandata.keys(): print("Usage: change [name]") + else: + activename = args[0] elif command == "reload": loaddmx(activename) elif command == "rename": - if arg in chandata.keys() and not (arg2 in chandata.keys() or arg2 == ""): - chandata.update({arg2 : chandata[arg]}) - chandata.pop(arg) - else: + if len(args) < 2 or not args[0] in chandata.keys() or not args[1] in chandata.keys() or args[1] == "": print("Usage: rename [old] [new]") + else: + chandata.update({args[1] : chandata[args[0]]}) + chandata.pop(args[0]) elif command == "dbo": dbo() + elif command == "bind": + if (args[0], args[1]) in binddata.keys(): + binddata[(args[0], args[1])].append((args[2], args[3])) + else: + binddata.update({(args[0], args[1]) : [(args[2], args[3])]}) + + if (args[2], args[3]) in binddata.keys(): + binddata[(args[2], args[3])].append((args[0], args[1])) + else: + binddata.update({(args[2], args[3]) : [(args[0], args[1])]}) + + elif command == "unbind": + if (args[0], args[1]) in binddata.keys(): + binddata[(args[0], args[1])].remove((args[2], args[3])) + + if (args[2], args[3]) in binddata.keys(): + binddata[(args[2], args[3])].remove((args[0], args[1])) + + elif command == "dmxsetcmd": + dmxcommands['set'] = ' '.join(args) + + elif command == "dmxgetcmd": + dmxcommands['get'] = ' '.join(args) + + elif command == "dmxcommands": + print("Get:", dmxcommands['get']) + print("Set:", dmxcommands['set']) + elif command == "help": - print("Usage: pydmx (help | [model] [startchannel])") - print("The model and startchannel are optional, if not specified use the new command.") - print("PyDMX also accepts commands from stdin, just make sure you end with an exit command to avoid an error message.\n") - print("Internal commands:") - print(" new [name] [model] [startchannel] - initialise a new named device.") - print(" names - list all devices.") - print(" change [name] - change to a different named device.") - print(" rename [old] [new] - change the name of a device. If the active device is renamed, a change command must immediately follow.") - print(" reload - reload cached DMX values for the current device from dmxd.") - print(" curses - start the ncurses interface.") - print(" list (arg) - list all commands for the current device provided by the data file. If arg is specified, restrict to that category.") - print(" dbo - Toggle dead black out.") - print(" help - display this text") - print(" exit - close pydmx\n") - print("Curses UI:") - print(" Up - Increment the value of the current channel.") - print(" Down - Decrement the value of the current channel.") - print(" Left - Change to the previous channel.") - print(" Right - Change to the next channel.") - print(" Page Up - Increment the value of the current channel by 10.") - print(" Page Down - Decrement the value of the current channel by 10.") - print(" n - Change to the next discrete region for that channel.") - print(" p - Change to the previous discrete region for that channel.") - print(" t - Change the value of the channel to 255.") - print(" b - Change the value of the channel to 0.") - print(" h - Toggle hold mode. Any changes made in hold more are applied when hold mode is disabled.") - print(" d - Equivalent of dbo command.") - print(" r - Equivalent of reload command.") - print(" q - Close the interface.\n") - print("PyDMX requires that dmxd be running as root, and that k8062 be executable and in your $PATH.") - print("PyDMX is developed and maintained by Barrucadu (Michael Walker).") + printhelp() else: try: - cmd = data.dmx[command][arg] + cmd = data.dmx[command][args[0]] except KeyError: print("Command not found") funbreak = True @@ -405,7 +450,7 @@ def parsecmd(command, arg, arg2, arg3): if not funbreak: value = 0 try: - value = int(arg2) + value = int(args[1]) except ValueError: value = cmd[0] @@ -414,26 +459,16 @@ def parsecmd(command, arg, arg2, arg3): def parsepromptline(line): bar = line.split() command = "" - arg = "" - arg2 = "" - arg3 = "" + args = [] funbreak = False try: command = bar[0] - - if len(bar) > 1: - arg = bar[1] - - if len(bar) > 2: - arg2 = bar[2] - - if len(bar) > 3: - arg3 = bar[3] + args = bar[1:] except IndexError: funbreak = True - return command, arg, arg2, arg3, funbreak + return command, args, funbreak def enterprompt(): @@ -444,9 +479,9 @@ def enterprompt(): if foo == "exit": return False else: - command, arg, arg2, arg3, funbreak = parsepromptline(foo) + command, args, funbreak = parsepromptline(foo) if not funbreak: - parsecmd(command, arg, arg2, arg3) + parsecmd(command, args) return True # ----- Main ----- # @@ -455,7 +490,7 @@ if datapath == "": datapath = os.getenv("HOME") + "/.local/share" if "help" in sys.argv or "-h" in sys.argv or "--help" in sys.argv: - parsecmd("help", None, None, None) + printhelp() sys.exit(0) else: if len(sys.argv) > 2: bin/pydmx de50a726f9450b534b22def8c55db003d5fa9319 Barrucadu mike@barrucadu.co.uk http://github.com/Barrucadu/home/commit/184a95d47a1c7f7ef8ae262a56448ece9228f4d5 184a95d47a1c7f7ef8ae262a56448ece9228f4d5 2009-11-08T03:26:48-08:00 2009-11-08T03:26:48-08:00 Bind/unbind of channels, and the ability to change the commands used to get/set DMX values. Thus, pydmx should now work with all Linux-compatible DMX interfaces. 0082c76557468d94eef82fac9cd1b4d827432a47 Barrucadu mike@barrucadu.co.uk