From d2e3e527d56afe51f003e35ff1f2ad50869cdb69 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 28 Sep 2018 22:03:04 -0400 Subject: [PATCH] consolodate options, add 646 --- quantum/config_common.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/quantum/config_common.h b/quantum/config_common.h index 6d7e9e2d09..a124ba3fb5 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -30,19 +30,19 @@ // If you want to add more to this list, reference the PINx definitions in these header // files: https://github.com/vancegroup-mirrors/avr-libc/tree/master/avr-libc/include/avr - #if defined(__AVR_ATmega32U4__) + #if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__) #define ADDRESS_BASE 0x00 #define PINB_ADDRESS 0x3 #define PINC_ADDRESS 0x6 #define PIND_ADDRESS 0x9 #define PINE_ADDRESS 0xC #define PINF_ADDRESS 0xF - #elif defined(__AVR_ATmega32U2__) + #elif defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) #define ADDRESS_BASE 0x00 #define PINB_ADDRESS 0x3 #define PINC_ADDRESS 0x6 #define PIND_ADDRESS 0x9 - #elif defined(__AVR_AT90USB1286__) + #elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) #define ADDRESS_BASE 0x00 #define PINA_ADDRESS 0x0 #define PINB_ADDRESS 0x3 @@ -56,18 +56,6 @@ #define PINC_ADDRESS 0x3 #define PINB_ADDRESS 0x6 #define PINA_ADDRESS 0x9 - #elif defined(__AVR_ATmega16U2__) - #define ADDRESS_BASE 0x00 - #define PINB_ADDRESS 0x3 - #define PINC_ADDRESS 0x6 - #define PIND_ADDRESS 0x9 - #elif defined(__AVR_ATmega16U4__) - #define ADDRESS_BASE 0x00 - #define PINB_ADDRESS 0x3 - #define PINC_ADDRESS 0x6 - #define PIND_ADDRESS 0x9 - #define PINE_ADDRESS 0xC - #define PINF_ADDRESS 0xF #else #error "Pins are not defined" #endif