Skip to content

Commit

Permalink
MIDIIn now automatically handles sustain pedal
Browse files Browse the repository at this point in the history
  • Loading branch information
@beau-seidon @djphazer
beau-seidon authored and djphazer committed Jan 11, 2025
1 parent 6fb9c76 commit 42d831c
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 15 deletions.
79 changes: 65 additions & 14 deletions software/src/HSIOFrame.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ typedef struct IOFrame {
uint16_t semitone_mask[ADC_CHANNEL_LAST]; // which notes are currently on

// MIDI input stuff handled by MIDIIn applet
std::vector<MIDINoteData> note_buffer[16]; // note buffer for polyphonic input. one for each midi channel
std::vector<MIDINoteData> note_buffer[16]; // note buffer for polyphonic input. one for each MIDI channel
int outputs[DAC_CHANNEL_LAST]; // translated CV values
bool trigout_q[DAC_CHANNEL_LAST];
int last_midi_channel = 0; // for MIDI In activity monitor
uint16_t sustain_latch; // each bit is a MIDI channel's sustain state

void RemoveNoteData(std::vector<MIDINoteData> &buffer, int note) {
buffer.erase(
Expand All @@ -86,10 +87,15 @@ typedef struct IOFrame {
if (note_buffer[c].size() == 0) note_buffer[c].shrink_to_fit(); // free up memory when MIDI is not used
}

void NoteStackClear() {
for (int c = 0; c < 16; ++c) {
note_buffer[c].clear();
note_buffer[c].shrink_to_fit();
void ClearNoteStack(int ch = -1) {
if (ch > 0) {
note_buffer[ch].clear();
note_buffer[ch].shrink_to_fit();
} else { // clear on all channels if no args passed
for (int c = 0; c < 16; ++c) {
note_buffer[c].clear();
note_buffer[c].shrink_to_fit();
}
}
}

Expand Down Expand Up @@ -129,6 +135,22 @@ typedef struct IOFrame {
return buffer.at(buffer.size()-n).vel;
}

void ClearSustainLatch(int m_ch = -1) {
if (m_ch > 0) sustain_latch &= ~(1 << m_ch);
else { // clear on all channels if no args passed
for (int c = 0; c < 16; ++c)
sustain_latch &= ~(1 << c);
}
}

void SetSustainLatch(int m_ch) {
sustain_latch |= (1 << m_ch);
}

bool CheckSustainLatch(int m_ch) {
return sustain_latch & (1 << m_ch);
}

// Clock/Start/Stop are handled by ClockSetup applet
bool clock_run = 0;
bool clock_q;
Expand Down Expand Up @@ -224,7 +246,12 @@ typedef struct IOFrame {
stop_q = 1;
clock_run = false;
// a way to reset stuck notes
NoteStackClear();
ClearNoteStack();
ClearSustainLatch();
// for (int c = 0; c < 4; ++c) {
// outputs[c] = 0;
// trigout_q[c] = 0;
// }
return;
break;

Expand Down Expand Up @@ -276,11 +303,12 @@ typedef struct IOFrame {
case HEM_MIDI_NOTE_POLY3_OUT:
if (note_buffer[m_ch].size() > 2)
outputs[ch] = MIDIQuantizer::CV(GetNote(note_buffer[m_ch], 3));
else
else {
if (note_buffer[m_ch].size() == 2) // distribute notes evenly when only 2 are played
outputs[ch] = MIDIQuantizer::CV(GetNoteLast(note_buffer[m_ch]));
else
outputs[ch] = MIDIQuantizer::CV(GetNoteFirst(note_buffer[m_ch]));
}
break;

case HEM_MIDI_NOTE_POLY4_OUT:
Expand Down Expand Up @@ -341,63 +369,69 @@ typedef struct IOFrame {
if (note_buffer[m_ch].size() > 0) { // don't update output when last note is released
switch(function[ch]) { // note # output functions
case HEM_MIDI_NOTE_OUT:
if (CheckSustainLatch(m_ch)) break;
outputs[ch] = MIDIQuantizer::CV(GetNoteLast(note_buffer[m_ch]));
break;

case HEM_MIDI_NOTE_POLY2_OUT:
if (CheckSustainLatch(m_ch)) break;
if (note_buffer[m_ch].size() < 2)
outputs[ch] = MIDIQuantizer::CV(GetNoteLast(note_buffer[m_ch]));
else
outputs[ch] = MIDIQuantizer::CV(GetNote(note_buffer[m_ch], 2));
break;

case HEM_MIDI_NOTE_POLY3_OUT:
if (CheckSustainLatch(m_ch)) break;
if (note_buffer[m_ch].size() < 3) {
if (note_buffer[m_ch].size() == 2) // distribute notes evenly when only 2 are played
outputs[ch] = MIDIQuantizer::CV(GetNoteLast(note_buffer[m_ch]));
else
outputs[ch] = MIDIQuantizer::CV(GetNoteFirst(note_buffer[m_ch]));
} else {
} else
outputs[ch] = MIDIQuantizer::CV(GetNote(note_buffer[m_ch], 3));
}
break;

case HEM_MIDI_NOTE_POLY4_OUT:
if (CheckSustainLatch(m_ch)) break;
if (note_buffer[m_ch].size() < 4)
outputs[ch] = MIDIQuantizer::CV(GetNoteFirst(note_buffer[m_ch]));
else
outputs[ch] = MIDIQuantizer::CV(GetNote(note_buffer[m_ch], 4));
break;

case HEM_MIDI_NOTE_MIN_OUT:
if (CheckSustainLatch(m_ch)) break;
outputs[ch] = MIDIQuantizer::CV(GetNoteMin(note_buffer[m_ch]));
break;

case HEM_MIDI_NOTE_MAX_OUT:
if (CheckSustainLatch(m_ch)) break;
outputs[ch] = MIDIQuantizer::CV(GetNoteMax(note_buffer[m_ch]));
break;

case HEM_MIDI_NOTE_PEDAL_OUT:
if (CheckSustainLatch(m_ch)) break;
outputs[ch] = MIDIQuantizer::CV(GetNoteFirst(note_buffer[m_ch]));
break;

case HEM_MIDI_NOTE_INV_OUT:
if (CheckSustainLatch(m_ch)) break;
outputs[ch] = MIDIQuantizer::CV(GetNoteLastInv(note_buffer[m_ch]));
break;
}
}

// turn gate off only when all notes are off
if (!(note_buffer[m_ch].size() > 0)) {
if (function[ch] == HEM_MIDI_TRIG_ALWAYS_OUT) trigout_q[ch] = 1;

// turn gate off only when all notes are off, and sustain pedal up
if (!(note_buffer[m_ch].size() > 0) && !CheckSustainLatch(m_ch)) {
if (function[ch] == HEM_MIDI_GATE_OUT) {
outputs[ch] = 0;
}
if (function[ch] == HEM_MIDI_GATE_INV_OUT) {
outputs[ch] = PULSE_VOLTAGE * (12 << 7);
}
} else {
if (function[ch] == HEM_MIDI_TRIG_ALWAYS_OUT)
trigout_q[ch] = 1;
}

switch (function[ch]) {
Expand All @@ -419,6 +453,23 @@ typedef struct IOFrame {
break;

case usbMIDI.ControlChange: // Modulation wheel or other CC
// handle sustain pedal
if (data1 == 64) {
if (data2 > 63) {
if (!CheckSustainLatch(m_ch)) SetSustainLatch(m_ch);
} else {
ClearSustainLatch(m_ch);
if (!(note_buffer[m_ch].size() > 0)) {
if (function[ch] == HEM_MIDI_GATE_OUT) {
outputs[ch] = 0;
}
if (function[ch] == HEM_MIDI_GATE_INV_OUT) {
outputs[ch] = PULSE_VOLTAGE * (12 << 7);
}
}
}
}

if (function[ch] == HEM_MIDI_CC_OUT) {
if (function_cc[ch] < 0) function_cc[ch] = data1;

Expand Down
2 changes: 1 addition & 1 deletion software/src/applets/hMIDIIn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class hMIDIIn : public HemisphereApplet {

frame.MIDIState.log_index = 0;
frame.MIDIState.clock_count = 0;
frame.MIDIState.NoteStackClear();
frame.MIDIState.ClearNoteStack();
}

void Controller() {
Expand Down

0 comments on commit 42d831c

Please sign in to comment.