Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for id core BEAM. #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for id core BEAM. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ce5ffc
Add support for id core BEAM.
pparent76 Jul 25, 2017
e17dffb
Remove debug commands.
pparent76 Jul 25, 2017
1020ae0
Correction on last commit
pparent76 Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion blackstarid/blackstarid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ class BlackstarIDAmp(object):
amp_models = {
0x0001: 'id-tvp',
0x0010: 'id-core',
32: 'id-beam',
}

controls = {
Expand Down Expand Up @@ -294,7 +295,7 @@ class BlackstarIDAmp(object):
control_ids = dict([(val, key) for key, val in controls.items()])

control_limits = {
'voice': [0, 5],
'voice': [0, 11],
'gain': [0, 127],
'volume': [0, 127],
'bass': [0, 127],
Expand Down
30 changes: 30 additions & 0 deletions outsider/outsider.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,36 @@
<string>OD2</string>
</property>
</item>
<item>
<property name="text">
<string>Acoustic Guitar 1</string>
</property>
</item>
<item>
<property name="text">
<string>Acoustic Guitar 2</string>
</property>
</item>
<item>
<property name="text">
<string>Acoustic Simulation 1</string>
</property>
</item>
<item>
<property name="text">
<string>Acoustic Simulation 2</string>
</property>
</item>
<item>
<property name="text">
<string>Bass 1</string>
</property>
</item>
<item>
<property name="text">
<string>Bass 2</string>
</property>
</item>
</widget>
</item>
</layout>
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
packages=find_packages(exclude=['data', 'docs', 'tests*']),
install_requires=[
'PyUSB',
'PyQt5',
],

# List additional groups of dependencies here (e.g. development
Expand Down