diff options
| author | Joel Challis <git@zvecr.com> | 2020-04-29 00:17:54 +0100 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-06-12 17:00:27 +0900 |
| commit | d26a9a7a2272b00a83d8ca6e6cf9044315babb5e (patch) | |
| tree | 0d5b87225320cf62976715bd7ed99d71cdf2fa95 | |
| parent | f945c3d4745a2fd9bfa933fc87ec66668cb1456e (diff) | |
Allow some usbconfig.h overrides at the keyboard level (#8647)
| -rw-r--r-- | quantum/template/ps2avrgb/usbconfig.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/quantum/template/ps2avrgb/usbconfig.h b/quantum/template/ps2avrgb/usbconfig.h index cedffc3ed7..a1092a904b 100644 --- a/quantum/template/ps2avrgb/usbconfig.h +++ b/quantum/template/ps2avrgb/usbconfig.h @@ -14,15 +14,21 @@ section at the end of this file). /* ---------------------------- Hardware Config ---------------------------- */ -#define USB_CFG_IOPORTNAME D +#ifndef USB_CFG_IOPORTNAME +#define USB_CFG_IOPORTNAME D +#endif /* This is the port where the USB bus is connected. When you configure it to * "B", the registers PORTB, PINB and DDRB will be used. */ -#define USB_CFG_DMINUS_BIT 3 +#ifndef USB_CFG_DMINUS_BIT +#define USB_CFG_DMINUS_BIT 3 +#endif /* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. * This may be any bit in the port. */ -#define USB_CFG_DPLUS_BIT 2 +#ifndef USB_CFG_DPLUS_BIT +#define USB_CFG_DPLUS_BIT 2 +#endif /* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. * This may be any bit in the port. Please note that D+ must also be connected * to interrupt pin INT0! [You can also use other interrupts, see section @@ -141,7 +147,9 @@ section at the end of this file). /* This macro (if defined) is executed when a USB SET_ADDRESS request was * received. */ -#define USB_COUNT_SOF 1 +#ifndef USB_COUNT_SOF +#define USB_COUNT_SOF 1 +#endif /* define this macro to 1 if you need the global variable "usbSofCount" which * counts SOF packets. This feature requires that the hardware interrupt is * connected to D- instead of D+. @@ -311,10 +319,18 @@ section at the end of this file). /* Set INT1 for D- falling edge to count SOF */ /* #define USB_INTR_CFG EICRA */ -#define USB_INTR_CFG_SET ((1 << ISC11) | (0 << ISC10)) +#ifndef USB_INTR_CFG_SET +#define USB_INTR_CFG_SET ((1 << ISC11) | (0 << ISC10)) +#endif /* #define USB_INTR_CFG_CLR 0 */ /* #define USB_INTR_ENABLE EIMSK */ -#define USB_INTR_ENABLE_BIT INT1 +#ifndef USB_INTR_ENABLE_BIT +#define USB_INTR_ENABLE_BIT INT1 +#endif /* #define USB_INTR_PENDING EIFR */ -#define USB_INTR_PENDING_BIT INTF1 -#define USB_INTR_VECTOR INT1_vect +#ifndef USB_INTR_PENDING_BIT +#define USB_INTR_PENDING_BIT INTF1 +#endif +#ifndef USB_INTR_VECTOR +#define USB_INTR_VECTOR INT1_vect +#endif |