diff options
Diffstat (limited to 'software/rhmixxx/keypad.c')
| -rw-r--r-- | software/rhmixxx/keypad.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/software/rhmixxx/keypad.c b/software/rhmixxx/keypad.c index f27c711..57a6380 100644 --- a/software/rhmixxx/keypad.c +++ b/software/rhmixxx/keypad.c @@ -28,9 +28,6 @@ #define KEYPAD_PIN PINA #define KEYPAD_PORT PORTA #define KEYPAD_DDR DDRA -#define KEYPAD_NUM_COLS 4 -#define KEYPAD_NUM_ROWS 4 -#define KEYPAD_NUM_KEYS KEYPAD_NUM_COLS * KEYPAD_NUM_ROWS #define KEYPAD_LP_CNT_MAX 200 static struct { @@ -84,7 +81,7 @@ void keypad_led_on(uint8_t led) case 13: case 14: case 15: PORTD |= (1 << (led - 12 + 4)); break; - case 127: PORTC = 0xFF; PORTB |= 0xF0; PORTD |= 0xF0; break; + case KEYPAD_MIDI_NOTE_ALL - KEYPAD_MIDI_NOTE_OFFSET: PORTC = 0xFF; PORTB |= 0xF0; PORTD |= 0xF0; break; } keypad_led_blink(led, 0); } @@ -108,7 +105,7 @@ void keypad_led_off(uint8_t led) case 13: case 14: case 15: PORTD &= ~(1 << (led - 12 + 4)); break; - case 127: PORTC = 0x00; PORTB &= 0x0F; PORTD &= 0x0F; break; + case KEYPAD_MIDI_NOTE_ALL - KEYPAD_MIDI_NOTE_OFFSET: PORTC = 0x00; PORTB &= 0x0F; PORTD &= 0x0F; break; } keypad_led_blink(led, 0); } @@ -132,7 +129,7 @@ void keypad_led_toggle(uint8_t led) case 13: case 14: case 15: PORTD ^= (1 << (led - 12 + 4)); break; - case 127: PORTC ^= 0xFF; PORTB ^= 0xF0; PORTD ^= 0xF0; break; + case KEYPAD_MIDI_NOTE_ALL - KEYPAD_MIDI_NOTE_OFFSET: PORTC ^= 0xFF; PORTB ^= 0xF0; PORTD ^= 0xF0; break; } } @@ -160,7 +157,7 @@ static inline void keypad_key_lowpass(uint8_t key_idx, uint8_t current_state) if(current_state != keypad_state[key_idx].last_sent) { keypad_state[key_idx].last_sent = current_state; - eventqueue_push(key_idx, ((current_state) ? 0 : 1)); + eventqueue_push(KEYPAD_MIDI_NOTE_OFFSET + key_idx, ((current_state) ? 0 : 1)); } } } |