Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow some usbconfig.h overrides at the keyboard level #8647

Merged
merged 1 commit into from
Apr 28, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions tmk_core/protocol/vusb/usbconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -160,7 +166,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
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
/* 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+.
Expand Down Expand Up @@ -343,10 +351,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
fauxpark marked this conversation as resolved.
Show resolved Hide resolved