diff --git a/README.md b/README.md index 1ec7ff6..c8dc16f 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,5 @@ To do so add a custom patch (or use a currently defined one, but chances are pat * TODO: Pagehandler: make a note handler * TODO: Color management, get colors associated to all statuses * TODO: General decorators @armtake +* TODO: Do a cleaner page printl +* TODO: Do all page tests diff --git a/mapping/__init__.py b/mapping/__init__.py index 21ed510..3df6f08 100644 --- a/mapping/__init__.py +++ b/mapping/__init__.py @@ -1 +1 @@ -__all__ = ["mapping","GrandMA2"] #Never import * as every parse is supposed to be named MessageParse +__all__ = ["mapping","GrandMA2","midipagehandler"] #Never import * as every parse is supposed to be named MessageParse diff --git a/mapping/midipagehandler.py b/mapping/midiPageHandler.py similarity index 98% rename from mapping/midipagehandler.py rename to mapping/midiPageHandler.py index 2fb43c4..08f38f1 100644 --- a/mapping/midipagehandler.py +++ b/mapping/midiPageHandler.py @@ -1,3 +1,4 @@ +#!/bin/python3 ########################### # IMPORTS @@ -84,6 +85,7 @@ class midiPageHandler(object): self._maxpages=pages self._maxN=0 self._makeNotes(table) + self.initValues() #################### # Manage attributes @@ -288,10 +290,10 @@ class AkaiAPCMini(midiPageHandler): "A specific implementation of the page handler" def __init__(self): - super(AkaiAPCMini,self).__init__([[i+(7-j)*8 for i in range(8)] for j in range(8)]) + super(AkaiAPCMini,self).__init__([[i+(7-j)*8 for i in range(8)] for j in range(8)]+[[i for i in range(64,72)],[i for i in range(82,90)]]) # Add the two control lines self.initValues() - self._updateSize() + self.colors={"black":0,"green":1,"blinking_green":2,"red":3,"blinking_red":4,"yellow":5,"blinking_yellow":6} self.addPossibleValues(("Inactive","Active","Selected","Live")) _INACTIVE,_ACTIVE,_LIVE,_SELECTED=self.statusId("Inactive"),self.statusId("Active"),self.statusId("Selected"),self.statusId("Live") @@ -349,5 +351,5 @@ if __name__ == '__main__': ak.prettyPrint(ak._changedbasevalues) print(ak.statusId(("Active","Selected","Live"))) - ak. + # ak. # light=lightHandler(ak.listStatus(),{}) diff --git a/mapping/panapulse.py b/mapping/panapulse.py index 97f76e5..f91f636 100644 --- a/mapping/panapulse.py +++ b/mapping/panapulse.py @@ -1,3 +1,4 @@ +#!/bin/python3 from mapping.base import BasicMessageParse,BasicActions,MatchError,BasicMidiInterface import mido from mapping.midi import MessageParse @@ -35,8 +36,10 @@ _COLORS={"black":0,"green":1,"blinking_green":2,"red":3,"blinking_red":4,"yellow # GLOBAL CONTROL ### +# try: from mapping import midiPageHandler - +# except: +# from handler=midiPageHandler.AkaiAPCMini() class pulseLink(object): """Link between lights, messages and states @@ -50,13 +53,16 @@ class pulseLink(object): def _onload(self): "Send a reset colors" import time,sys - + # handler.prettyPrint(handler._activebasevalues) #vars.output=self.outputs[vars.interface_nb] def pagepress(trigger,val,note,*params): "A key was pressed on the pagebuttons area" try: - print(handler._noteToPos[note]) + pos=handler._noteToPos[note] + #,handler._posToNote[pos[0],pos[1]] + dprint("Received {} (note:{})".format(pos,note) + except TypeError as e: eprint("[Error] : Unassigned pagebutton {} - Note {:2} ({:3})".format(trigger,note,val)) eprint(e) diff --git a/patch/panapulse.ini b/patch/panapulse.ini index 3cb336d..4ec4598 100644 --- a/patch/panapulse.ini +++ b/patch/panapulse.ini @@ -1,6 +1,8 @@ [interface] - input=APC MINI 2 - output1=APC MINI 3 + input=APC MINI:APC MINI MIDI 1 + #APC MINI 2 + output1=APC MINI:APC MINI MIDI 1 + #APC MINI 3 inputchanel = 1 outputchannel1 = 1 #outputchannel2 = 1