Skip to content

Commit

Permalink
UI changes; version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chysn
Chysn committed Jul 27, 2018
1 parent cb9a51d commit 60f009e
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 31 deletions.
13 changes: 9 additions & 4 deletions software/o_c_REV/HEM_Carpeggio.ino
View file
Expand Up @@ -29,8 +29,10 @@ public:
// simply play current step and advance it. This way, the applet can be used as
// a more conventional arpeggiator as well as a Cartesian one.
if (DetentedIn(0) || DetentedIn(1)) {
int x = ProportionCV(In(0), 3);
int y = ProportionCV(In(1), 3);
int x = ProportionCV(In(0), 4);
int y = ProportionCV(In(1), 4);
if (x > 3) x = 3;
if (y > 3) y = 3;
step = (y * 4) + x;
pitch_out_for_step();
} else {
Expand Down Expand Up @@ -63,7 +65,10 @@ public:

void OnButtonPress() {
// Set a chord imprint if a new chord is picked
if (cursor == 1 && chord != sel_chord) ImprintChord(chord);
if (cursor == 1 && chord != sel_chord) {
cursor = 0; // Don't advance cursor when chord is changed
ImprintChord(chord);
}
if (++cursor > 2) cursor = 0;
ResetCursor();
}
Expand All @@ -72,7 +77,7 @@ public:
if (cursor == 0) sequence[step] = constrain(sequence[step] += direction, 0, 60);
if (cursor == 1) chord = constrain(chord += direction, 0, Nr_of_arp_chords - 1);
if (cursor == 2) transpose = constrain(transpose += direction, -24, 24);
replay = 1;
if (cursor != 1) replay = 1;
}

uint32_t OnDataRequest() {
Expand Down
7 changes: 6 additions & 1 deletion software/o_c_REV/HEM_hMIDIIn.ino
View file
Expand Up @@ -148,6 +148,7 @@ public:

void OnButtonPress() {
if (++cursor > 2) cursor = 0;
ResetCursor();
}

void OnEncoderMove(int direction) {
Expand Down Expand Up @@ -203,6 +204,7 @@ private:
int first_note; // First note received, for awaiting Note Off
const char* fn_name[7];

// Logging
MIDILogEntry log[7];
int log_index;

Expand Down Expand Up @@ -242,7 +244,10 @@ private:
gfxCursor(24, 23 + (cursor * 10), 39);

// Last log entry
if (log_index > 0) log_entry(55, log_index - 1);
if (log_index > 0) {
gfxDottedLine(1, 55, 62, 55, 2);
log_entry(56, log_index - 1);
}
}

void DrawLog() {
Expand Down
137 changes: 112 additions & 25 deletions software/o_c_REV/HEM_hMIDIOut.ino
View file
Expand Up @@ -25,6 +25,8 @@ public:
function = 0;
gated = 0;
transpose = 0;
legato = 1;
log_index = 0;

const char * fn_name_list[] = {"Mod", "Aft", "Bend", "Veloc"};
for (int i = 0; i < 4; i++) fn_name[i] = fn_name_list[i];
Expand All @@ -39,34 +41,47 @@ public:
// lag between when a gate is read and when the CV can be read.
if (read_gate && !gated) StartADCLag();

if (EndOfADCLag()) { // A new note on message should be sent
// Get a new reading when gated
ADC_CHANNEL channel = (ADC_CHANNEL)(hemisphere * 2);
uint32_t pitch = OC::ADC::raw_pitch_value(channel);
quantizer.Process(pitch, 0, 0);
bool note_on = EndOfADCLag(); // If the ADC lag has ended, a note will always be sent
if (note_on || legato_on) {
// Get a new reading when gated, or when checking for legato changes
quantizer.Process(In(0), 0, 0);
uint8_t midi_note = quantizer.NoteNumber() + transpose;
midi_note = constrain(midi_note, 0, 127);

int velocity = 0x64;
if (function == HEM_MIDI_VEL_IN) {
velocity = ProportionCV(In(1), 127);
if (legato_on && midi_note != last_note) {
// Send note off if the note has changed
usbMIDI.sendNoteOff(last_note, 0, last_channel + 1);
UpdateLog(HEM_MIDI_NOTE_OFF, midi_note, 0);
note_on = 1;
}
last_velocity = velocity;

usbMIDI.sendNoteOn(midi_note, velocity, channel + 1);
usbMIDI.send_now();
last_note = midi_note;
last_channel = channel;
last_tick = OC::CORE::ticks;
if (note_on) {
int velocity = 0x64;
if (function == HEM_MIDI_VEL_IN) {
velocity = ProportionCV(In(1), 127);
}
last_velocity = velocity;

usbMIDI.sendNoteOn(midi_note, velocity, channel + 1);
usbMIDI.send_now();
last_note = midi_note;
last_channel = channel;
last_tick = OC::CORE::ticks;
if (legato) legato_on = 1;

UpdateLog(HEM_MIDI_NOTE_ON, midi_note, velocity);
}
}

if (!read_gate && gated) { // A note off message should be sent
usbMIDI.sendNoteOff(last_note, 0, last_channel + 1);
usbMIDI.send_now();
UpdateLog(HEM_MIDI_NOTE_OFF, last_note, 0);
last_tick = OC::CORE::ticks;
}

gated = read_gate;
if (!gated) legato_on = 0;

// Handle other messages
if (function != HEM_MIDI_VEL_IN) {
Expand All @@ -76,15 +91,19 @@ public:

// Modulation wheel
if (function == HEM_MIDI_CC_IN) {
usbMIDI.sendControlChange(1, ProportionCV(this_cv, 127), channel + 1);
int value = ProportionCV(this_cv, 127);
usbMIDI.sendControlChange(1, value, channel + 1);
usbMIDI.send_now();
UpdateLog(HEM_MIDI_CC, value, 0);
last_tick = OC::CORE::ticks;
}

// Aftertouch
if (function == HEM_MIDI_AT_IN) {
usbMIDI.sendAfterTouch(ProportionCV(this_cv, 127), channel + 1);
int value = ProportionCV(this_cv, 127);
usbMIDI.sendAfterTouch(value, channel + 1);
usbMIDI.send_now();
UpdateLog(HEM_MIDI_AFTERTOUCH, value, 0);
last_tick = OC::CORE::ticks;
}

Expand All @@ -94,6 +113,7 @@ public:
bend = constrain(bend, 0, 16383);
usbMIDI.sendPitchBend(bend, channel + 1);
usbMIDI.send_now();
UpdateLog(HEM_MIDI_PITCHBEND, bend - 8192, 0);
last_tick = OC::CORE::ticks;
}
}
Expand All @@ -107,30 +127,33 @@ public:
}

void ScreensaverView() {
DrawMonitor();
DrawSelector();
DrawLog();
}

void OnButtonPress() {
if (++cursor > 2) cursor = 0;
if (++cursor > 3) cursor = 0;
ResetCursor();
}

void OnEncoderMove(int direction) {
if (cursor == 0) channel = constrain(channel += direction, 0, 15);
if (cursor == 1) transpose = constrain(transpose += direction, -24, 24);
if (cursor == 2) function = constrain(function += direction, 0, 3);
if (cursor == 3) legato = direction > 0 ? 1 : 0;
}

uint32_t OnDataRequest() {
uint32_t data = 0;
Pack(data, PackLocation {0,4}, channel);
Pack(data, PackLocation {4,3}, function);
Pack(data, PackLocation {7,1}, legato);
return data;
}

void OnDataReceive(uint32_t data) {
channel = Unpack(data, PackLocation {0,4});
function = Unpack(data, PackLocation {4,3});
legato = Unpack(data, PackLocation {7,1});
}

protected:
Expand All @@ -148,25 +171,45 @@ private:
braids::Quantizer quantizer;

// Icons
const uint8_t midi[8] = {0x3c, 0x42, 0x91, 0x45, 0x45, 0x91, 0x42, 0x3c};
const uint8_t note[8] = {0xc0, 0xe0, 0xe0, 0xe0, 0x7f, 0x02, 0x14, 0x08};
const uint8_t mod[8] = {0x30, 0x08, 0x04, 0x08, 0x10, 0x20, 0x10, 0x0c};
const uint8_t pb[8] = {0x20, 0x70, 0x70, 0x3f, 0x20, 0x14, 0x0c, 0x1c};
const uint8_t at[8] = {0x00, 0x00, 0x20, 0x42, 0xf5, 0x48, 0x20, 0x00};
const uint8_t midi[8] = {0x3c, 0x42, 0x91, 0x45, 0x45, 0x91, 0x42, 0x3c};

// Settings
int channel; // MIDI Out channel
int function; // Function of B/D output
int transpose; // Semitones of transposition
int legato; // New notes are sent when note is changed

// Housekeeping
int cursor; // 0=MIDI channel, 1=Transpose, 2=CV 2 function
int cursor; // 0=MIDI channel, 1=Transpose, 2=CV 2 function, 3=Legato
int last_note; // Last MIDI note number awaiting not off
int last_velocity;
int last_channel; // The last Note On channel, just in case the channel is changed before release
bool gated; // The most recent gate status
bool legato_on; // The note handler may currently respond to legato note changes
int last_tick; // Most recent MIDI message sent
int adc_lag_countdown;
int last_cv; // For checking for changes
const char* fn_name[4];

// Logging
MIDILogEntry log[7];
int log_index;

void UpdateLog(int message, int data1, int data2) {
log[log_index++] = {message, data1, data2};
if (log_index == 7) {
for (int i = 0; i < 6; i++)
{
memcpy(&log[i], &log[i+1], sizeof(log[i+1]));
}
log_index--;
}
}

void DrawMonitor() {
if (OC::CORE::ticks - last_tick < 4000) {
gfxBitmap(46, 1, 8, midi);
Expand All @@ -187,21 +230,65 @@ private:
gfxPrint(1, 35, "i2:");
gfxPrint(24, 35, fn_name[function]);

// Legato
gfxPrint(1, 45, "Legato ");
gfxPrint(legato ? "On" : "Off");

// Cursor
gfxCursor(24, 23 + (cursor * 10), 39);
if (cursor < 3) gfxCursor(24, 23 + (cursor * 10), 39);
else gfxCursor(44, 53, 19);

// Last note log
if (last_velocity) {
gfxBitmap(1, 55, 8, note);
gfxPrint(10, 55, last_note);
gfxPrint(40, 55, last_velocity);
gfxDottedLine(1, 55, 62, 55, 2);
gfxBitmap(1, 56, 8, note);
gfxPrint(10, 56, last_note);
gfxPrint(40, 56, last_velocity);
}
}

void DrawLog() {
if (log_index) {
for (int i = 0; i < log_index; i++)
{
log_entry(15 + (i * 8), i);
}
}
}

bool cv_has_changed(int this_cv, int last_cv) {
int diff = this_cv - last_cv;
return (diff > 50 || diff < -50) ? 1 : 0;
}

void log_entry(int y, int index) {
if (log[index].message == HEM_MIDI_NOTE_ON) {
gfxBitmap(1, y, 8, note);
gfxPrint(10, y, log[index].data1);
gfxPrint(40, y, log[index].data2);
}

if (log[index].message == HEM_MIDI_NOTE_OFF) {
gfxPrint(1, y, "-");
gfxPrint(10, y, log[index].data1);
}

if (log[index].message == HEM_MIDI_CC) {
gfxBitmap(1, y, 8, mod);
gfxPrint(10, y, log[index].data1);
}

if (log[index].message == HEM_MIDI_AFTERTOUCH) {
gfxBitmap(1, y, 8, at);
gfxPrint(10, y, log[index].data1);
}

if (log[index].message == HEM_MIDI_PITCHBEND) {
int data = log[index].data1;
gfxBitmap(1, y, 8, pb);
gfxPrint(10, y, data);
}
}
};


Expand Down
2 changes: 1 addition & 1 deletion software/o_c_REV/OC_version.h
View file
Expand Up @@ -3,6 +3,6 @@
//
// GENERATED FILE, DO NOT EDIT
//
#define OC_VERSION "v1.1 (OC1.3.4)"
#define OC_VERSION "v1.2 (OC1.3.4)"
#endif

0 comments on commit 60f009e

Please sign in to comment.