Skip to content

Commit c5ffc3a

Browse files
authored
Merge pull request #24 from not-matt/Dev
Merge updates from development. Colour control, audio input selection, multiple board control
2 parents bf922e8 + 4b8b017 commit c5ffc3a

File tree

8 files changed

+1362
-708
lines changed

8 files changed

+1362
-708
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ Temporary Items
5151
*.pyc
5252
*.pdf
5353
settings.ini
54+
*.ini

python/lib/bin.png

1.5 KB
Loading

python/lib/config.py

Lines changed: 257 additions & 149 deletions
Large diffs are not rendered by default.

python/lib/devices.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,4 +286,10 @@ def __init__(self, pixels, brightness=31):
286286
def show(self, pixels):
287287
bgr = [2,1,0]
288288
self.led_data[0:,1:4] = pixels[bgr].T.clip(0,255)
289-
self.strip.show()
289+
self.strip.show()
290+
291+
class Stripless(LEDController):
292+
def __init__(self):
293+
pass
294+
def show(self, pixels):
295+
pass

python/lib/edit.png

963 Bytes
Loading

python/lib/gui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def hideGraphs(self):
3030
def hideOpts(self):
3131
print("Bleh")
3232

33-
def config.settings["configuration"]["configDialogue"](self):
33+
def configDialogue(self):
3434
self.d = QDialog(None, Qt.WindowSystemMenuHint | Qt.WindowCloseButtonHint)
3535
b1 = QPushButton("ok",self.d)
3636
b1.move(50,50)
@@ -46,7 +46,7 @@ def initUI(self):
4646
# ======================================================= Set up toolbar
4747
#toolbar_hideGraphs.setShortcut('Ctrl+H')
4848
toolbar_hideGraphs = QAction('GUI Properties', self)
49-
toolbar_hideGraphs.triggered.connect(self.config.settings["configuration"]["configDialogue"])
49+
toolbar_hideGraphs.triggered.connect(configDialogue)
5050
toolbar_hideOpts = QAction('Hide Opts', self)
5151
toolbar_hideOpts.triggered.connect(self.hideOpts)
5252

python/lib/microphone.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

python/main.py

Lines changed: 1095 additions & 511 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)