Skip to content

Commit

Permalink
Merge pull request #4 from phasewalker18/DEV_OtherDevices
Browse files Browse the repository at this point in the history
Dev other devices
  • Loading branch information
phunkyg authored Sep 18, 2018
2 parents 09ab77c + 4330d75 commit ed82bc9
Show file tree
Hide file tree
Showing 3 changed files with 242 additions and 294 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,4 @@ All other intellectual property rights remain with the original owners.

* **2mmi** - *Initial Idea, inspiration and saviour of us all


10 changes: 9 additions & 1 deletion control24common.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
'%(threadName)s\t%(funcName)s\t%(lineno)d\t%(message)s'
}

COMMANDS = {
'ack': 0xA0,
'online': 0xE2
}

CHANNELS = 24
FADER_RANGE = 2**10
FADER_STEP = 1 / float(FADER_RANGE)
Expand Down Expand Up @@ -139,7 +144,10 @@ def __init__(self):

def __str__(self):
"""return a nice list"""
return '\n'.join(['{} {}'.format(key, data.get('name') or '') for key, data in self.networks.iteritems()])
return '\n'.join(['{} {}'.format(
key,
data.get('name') or '')
for key, data in self.networks.iteritems()])

def get_default(self):
"""return the name and first ip of whichever adapter
Expand Down
Loading

0 comments on commit ed82bc9

Please sign in to comment.