comparison bin/dmxserver @ 333:44189a37a876

change dmxserver to use enttec opendmx
author drewp@bigasterisk.com
date Mon, 02 Apr 2007 14:33:38 +0000
parents f41004d5a507
children 9d1f323fb3d3
comparison
equal deleted inserted replaced
332:d4aff817a304 333:44189a37a876
26 from twisted.internet import reactor 26 from twisted.internet import reactor
27 from twisted.web import xmlrpc, server 27 from twisted.web import xmlrpc, server
28 import sys,time,os 28 import sys,time,os
29 from optparse import OptionParser 29 from optparse import OptionParser
30 import run_local 30 import run_local
31 from light9.io import ParportDMX 31 from light9.io import ParportDMX, UsbDMX
32
32 from light9.updatefreq import Updatefreq 33 from light9.updatefreq import Updatefreq
33 from light9 import networking 34 from light9 import networking
34 35
35 class XMLRPCServe(xmlrpc.XMLRPC): 36 class XMLRPCServe(xmlrpc.XMLRPC):
36 def __init__(self,options): 37 def __init__(self,options):
49 50
50 # desired seconds between sendlevels() calls 51 # desired seconds between sendlevels() calls
51 self.calldelay=1/options.updates_per_sec 52 self.calldelay=1/options.updates_per_sec
52 53
53 print "starting parport connection" 54 print "starting parport connection"
54 self.parportdmx=ParportDMX() 55 self.parportdmx=UsbDMX() #ParportDMX()
55 if os.environ.get('DMXDUMMY',0): 56 if os.environ.get('DMXDUMMY',0):
56 self.parportdmx.godummy() 57 self.parportdmx.godummy()
57 else: 58 else:
58 self.parportdmx.golive() 59 self.parportdmx.golive()
59 60
111 112
112 if time.time()>self.laststatsprint+2: 113 if time.time()>self.laststatsprint+2:
113 self.laststatsprint=time.time() 114 self.laststatsprint=time.time()
114 self.printstats() 115 self.printstats()
115 116
116 if self.clientschanged or time.time()>self.lastupdate+1: 117 # used to be a fixed 1 in here, for the max delay between
118 # calls, instead of calldelay
119 if self.clientschanged or time.time() > self.lastupdate + self.calldelay:
117 self.lastupdate=time.time() 120 self.lastupdate=time.time()
118 self.sendlevels_dmx() 121 self.sendlevels_dmx()
119 122
120 self.clientschanged=0 # clear the flag 123 self.clientschanged=0 # clear the flag
121 124