diff options
| author | tmk <nobody@nowhere> | 2012-06-30 14:56:24 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-06-30 14:56:24 +0900 |
| commit | fca518f90dfc7f72132ff7950b000cfbd5709807 (patch) | |
| tree | 1c61e7b91f1f4986232a1fdca421b3346f8a9431 /keyboard/hhkb/matrix.c | |
| parent | 76033dcd892a115240c5a990e5643cd53acbca87 (diff) | |
| parent | 2769f09d11a4c45362f2e6137f2469d057d8757e (diff) | |
Merge branch 'lufa'
Diffstat (limited to 'keyboard/hhkb/matrix.c')
| -rw-r--r-- | keyboard/hhkb/matrix.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/keyboard/hhkb/matrix.c b/keyboard/hhkb/matrix.c index 350066b904..79d2d98731 100644 --- a/keyboard/hhkb/matrix.c +++ b/keyboard/hhkb/matrix.c @@ -68,8 +68,8 @@ static bool matrix_has_ghost_in_row(uint8_t row); // key: on: 0/off: 1 // prev: unknown: output previous key state(negated)? -#ifdef HOST_PJRC -// Ports for Teensy +#if defined(__AVR_AT90USB1286__) +// Ports for Teensy++ // row: PB0-2 // col: PB3-5,6 // key: PE6(pull-uped) @@ -90,7 +90,8 @@ static bool matrix_has_ghost_in_row(uint8_t row); #define KEY_PREV_OFF() (PORTE &= ~(1<<7)) #define KEY_POWER_ON() #define KEY_POWER_OFF() -#else + +#elif defined(__AVR_ATmega328P__) // Ports for V-USB // key: PB0(pull-uped) // prev: PB1 @@ -126,6 +127,9 @@ static bool matrix_has_ghost_in_row(uint8_t row); DDRC &= ~0x0F; \ PORTC &= ~0x0F; \ } while (0) + +#else +# error "define code for matrix scan" #endif |