diff options
| author | Christian Pointner <equinox@helsinki.at> | 2014-06-02 14:19:52 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2014-06-02 14:19:52 (GMT) |
| commit | f6619f221a79604c5b7cbf37731a02453d185681 (patch) | |
| tree | 9a099f9ad7b2b6db175cf18e58d2ea3c5de20c3c /software/rhmixxx/rhmixxx.c | |
| parent | 78068e9588cdbd7d99c4334685d5b6664444d8bd (diff) | |
code cleanups
Diffstat (limited to 'software/rhmixxx/rhmixxx.c')
| -rw-r--r-- | software/rhmixxx/rhmixxx.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/software/rhmixxx/rhmixxx.c b/software/rhmixxx/rhmixxx.c index d5ac080..f94b67b 100644 --- a/software/rhmixxx/rhmixxx.c +++ b/software/rhmixxx/rhmixxx.c @@ -83,24 +83,23 @@ static void process_incoming_midi(void) uint8_t cmd = ReceivedMIDIEvent.Data1 & 0xF0;
uint8_t note = ReceivedMIDIEvent.Data2;
uint8_t value = ReceivedMIDIEvent.Data3 & 0x7F;
- if(note < 16 || note == 0x7F) { // KEYPAD
+ if((note >= KEYPAD_MIDI_NOTE_OFFSET && note < KEYPAD_MIDI_NOTE_OFFSET + KEYPAD_NUM_KEYS) || // KEYPAD
+ note == KEYPAD_MIDI_NOTE_ALL) {
if(cmd == MIDI_COMMAND_NOTE_ON) {
- if(value <= 2) {
- switch(value) {
- case 0: keypad_led_off(note); break;
- case 1: keypad_led_on(note); break;
- case 2: keypad_led_toggle(note); break;
- }
- } else if(value <= 0x7F) {
- keypad_led_blink(note, value);
+ switch(value) {
+ case 0: keypad_led_off(note - KEYPAD_MIDI_NOTE_OFFSET); break;
+ case 1: keypad_led_on(note - KEYPAD_MIDI_NOTE_OFFSET); break;
+ case 2: keypad_led_toggle(note - KEYPAD_MIDI_NOTE_OFFSET); break;
+ default: keypad_led_blink(note, value); break;
}
}
- } else if(note >= 64 && note <= 68) { // GPIO
+ } else if((note >= GPIO_MIDI_NOTE_OFFSET && note < GPIO_MIDI_NOTE_OFFSET + GPIO_NUM_OUTPUTS) || // GPIO
+ note == GPIO_MIDI_NOTE_ALL_OUTPUTS) {
if(cmd == MIDI_COMMAND_NOTE_ON) {
switch(value) {
- case 0: gpio_out_off(note - 64); break;
- case 1: gpio_out_on(note - 64); break;
- case 2: gpio_out_toggle(note - 64); break;
+ case 0: gpio_out_off(note - GPIO_MIDI_NOTE_OFFSET); break;
+ case 1: gpio_out_on(note - GPIO_MIDI_NOTE_OFFSET); break;
+ case 2: gpio_out_toggle(note - GPIO_MIDI_NOTE_OFFSET); break;
}
}
}
|