diff options
| author | Olivier <olivier@gid0.org> | 2016-11-27 23:23:21 +0100 |
|---|---|---|
| committer | Olivier <olivier@gid0.org> | 2016-11-27 23:23:21 +0100 |
| commit | d6d0b7eadaa568853b21d74057db306a33b7a847 (patch) | |
| tree | e935179ed0db152f94d31ef187c01a40f0fb42d6 /quantum/config_common.h | |
| parent | 73d2a470eed73a1ba28520343bd1cfc81498d183 (diff) | |
| parent | 1585fc4b616cb28b8d4a418cd31c8ce0dd64f731 (diff) | |
| download | firmware-d6d0b7eadaa568853b21d74057db306a33b7a847.tar.gz firmware-d6d0b7eadaa568853b21d74057db306a33b7a847.tar.bz2 firmware-d6d0b7eadaa568853b21d74057db306a33b7a847.zip | |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/config_common.h')
| -rw-r--r-- | quantum/config_common.h | 59 |
1 files changed, 11 insertions, 48 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h index 09a4fe701..4d3939dae 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -45,6 +45,15 @@ #define F5 0xF5 #define F6 0xF6 #define F7 0xF7 +#define A0 0x00 +#define A1 0x01 +#define A2 0x02 +#define A3 0x03 +#define A4 0x04 +#define A5 0x05 +#define A6 0x06 +#define A7 0x07 + /* USART configuration */ #ifdef BLUETOOTH_ENABLE @@ -67,53 +76,7 @@ } while(0) # else # error "USART configuration is needed." +# endif #endif -// I'm fairly sure these aren't needed, but oh well - Jack - -/* - * PS/2 Interrupt configuration - */ -#ifdef PS2_USE_INT -/* uses INT1 for clock line(ATMega32U4) */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 1 - -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 0 - -#define PS2_INT_INIT() do { \ - EICRA |= ((1<<ISC11) | \ - (0<<ISC10)); \ -} while (0) -#define PS2_INT_ON() do { \ - EIMSK |= (1<<INT1); \ -} while (0) -#define PS2_INT_OFF() do { \ - EIMSK &= ~(1<<INT1); \ -} while (0) -#define PS2_INT_VECT INT1_vect -#endif - -/* - * PS/2 Busywait configuration - */ -#ifdef PS2_USE_BUSYWAIT -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 1 - -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 0 -#endif - -#endif - -#endif +#endif
\ No newline at end of file |