diff options
| author | Joel Challis <git@zvecr.com> | 2020-04-29 00:17:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 00:17:54 +0100 |
| commit | 374525c99525dbc903c2043e242c8c9d4ea8a68a (patch) | |
| tree | 54b69f02afd876188b63350209c842e3c78ecbc7 /tmk_core/protocol | |
| parent | e02a3c559dfff16dd523e1b5ef65bf983f3638db (diff) | |
Allow some usbconfig.h overrides at the keyboard level (#8647)
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/vusb/usbconfig.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tmk_core/protocol/vusb/usbconfig.h b/tmk_core/protocol/vusb/usbconfig.h index f118dc8ede..dcef7584c4 100644 --- a/tmk_core/protocol/vusb/usbconfig.h +++ b/tmk_core/protocol/vusb/usbconfig.h @@ -24,15 +24,21 @@ section at the end of this file). /* ---------------------------- Hardware Config ---------------------------- */ +#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. */ +#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. */ +#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 @@ -151,7 +157,9 @@ section at the end of this file). /* This macro (if defined) is executed when a USB SET_ADDRESS request was * received. */ +#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+. @@ -321,10 +329,18 @@ section at the end of this file). /* Set INT1 for D- falling edge to count SOF */ /* #define USB_INTR_CFG EICRA */ +#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 */ +#ifndef USB_INTR_ENABLE_BIT #define USB_INTR_ENABLE_BIT INT1 +#endif /* #define USB_INTR_PENDING EIFR */ +#ifndef USB_INTR_PENDING_BIT #define USB_INTR_PENDING_BIT INTF1 +#endif +#ifndef USB_INTR_VECTOR #define USB_INTR_VECTOR INT1_vect +#endif |