changeset 876:e263c4bd73f9

pass dmx choice into dmxserver Ignore-this: 182e13858be1aa68fc956e345dbbf8ed
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 07 Jun 2013 07:13:24 +0000
parents 2b2ad8e7cb9f
children b703f6264bb6
files bin/dmxserver light9/io/__init__.py
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/dmxserver	Fri Jun 07 06:40:07 2013 +0000
+++ b/bin/dmxserver	Fri Jun 07 07:13:24 2013 +0000
@@ -52,7 +52,7 @@
         self.calldelay=1/options.updates_per_sec 
 
         print "starting parport connection"
-        self.parportdmx=UsbDMX() #ParportDMX()
+        self.parportdmx = UsbDMX(port=options.dmx_device)
         if os.environ.get('DMXDUMMY',0):
             self.parportdmx.godummy()
         else:
@@ -204,6 +204,8 @@
                         'of the usual reduced output'))
 parser.add_option("-r","--updates-per-sec",type='float',default=20,
                   help=('dmx output frequency'))
+parser.add_option("-d","--dmx-device", default='/dev/dmx0',
+                  help='dmx device name')
 parser.add_option("-n", "--dummy", action="store_true",
                   help="dummy mode, same as DMXDUMMY=1 env variable")
 (options,songfiles)=parser.parse_args()
--- a/light9/io/__init__.py	Fri Jun 07 06:40:07 2013 +0000
+++ b/light9/io/__init__.py	Fri Jun 07 07:13:24 2013 +0000
@@ -55,9 +55,10 @@
             self.parport.outbyte(levels[p-1]*255 / 100)
 
 class UsbDMX(BaseIO):
-    def __init__(self, dimmers=72):
+    def __init__(self, dimmers=72, port='/dev/dmx0'):
         BaseIO.__init__(self)
         self.__name__ = "UsbDMX"
+        self.port = port
         self.out = None
         self.dimmers = dimmers
 
@@ -65,7 +66,7 @@
         if self.out is None:
             sys.path.append("dmx_usb_module")
             from dmx import Dmx
-            self.out = Dmx('/dev/dmx0')
+            self.out = Dmx(self.port)
         return self.out