diff --git a/MEMLNaut-NISPS.ino b/MEMLNaut-NISPS.ino index 3b7c537..ffe01f8 100644 --- a/MEMLNaut-NISPS.ino +++ b/MEMLNaut-NISPS.ino @@ -27,8 +27,8 @@ //hook up the memlnaut mode // #define MEMLNAUT_MODE_TYPE MEMLNautModeSoundAnalysisMIDI -// #define MEMLNAUT_MODE_TYPE MEMLNautModeXIASRI -#define MEMLNAUT_MODE_TYPE MEMLNautModeChannelStrip +#define MEMLNAUT_MODE_TYPE MEMLNautModeXIASRI +// #define MEMLNAUT_MODE_TYPE MEMLNautModeChannelStrip // #define MEMLNAUT_MODE_TYPE MEMLNautModePAFSynth MEMLNAUT_MODE_TYPE AUDIO_MEM MEMLNautModeHub; @@ -86,6 +86,9 @@ void setup() { uint32_t seed = get_rosc_entropy_seed(32); srand(seed); + midi_interf = std::make_shared(); + // Serial.println("MIDI setup complete."); + Serial.begin(115200); // while (!Serial) {} Serial.println("Serial initialised."); @@ -101,8 +104,6 @@ void setup() { WRITE_VOLATILE(interface_ready, true); Serial.println("Bound interface to MEMLNaut."); - midi_interf = std::make_shared(); - Serial.println("MIDI setup complete."); if (midi_interf) { currentMode->setupMIDI(midi_interf); } diff --git a/modes/MEMLNautModePAFSynth.hpp b/modes/MEMLNautModePAFSynth.hpp index c0f6606..5235538 100644 --- a/modes/MEMLNautModePAFSynth.hpp +++ b/modes/MEMLNautModePAFSynth.hpp @@ -12,7 +12,7 @@ class MEMLNautModePAFSynth { public: - constexpr static size_t kN_InputParams = 3; // joystick x, y, rotate + constexpr static size_t kN_InputParams = 4; // joystick x, y, rotate inline static PAFSynthAudioApp<> audioAppPAFSynth; std::array::nVoiceSpaces> voiceSpaceList; @@ -22,7 +22,7 @@ public: void setupInterface() { interface.setup(kN_InputParams, PAFSynthAudioApp<>::kN_Params); - interface.bindInterface(InterfaceRL::INPUT_MODES::JOYSTICK); + interface.bindInterface(InterfaceRL::INPUT_MODES::JOYSTICK, true); interfacePtr = make_non_owning(interface); }