max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2020-04-06 11:21:23 -04:00
commit e1cbd227cc
6 changed files with 2237 additions and 2248 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
converter/ibmpc_usb/Makefile
View file

@ -50,8 +50,8 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task # Interrupt driven control endpoint task. Do not enable this.
# Not work with suart debug # This blocks long for capslock and etc. and can prevent signal handling.
#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# This improves response of keyboard when wakeup # This improves response of keyboard when wakeup

1496
converter/ibmpc_usb/binary/ibmpc_usb_at90usb1286.hex
View file

File diff suppressed because it is too large Load diff

1483
converter/ibmpc_usb/binary/ibmpc_usb_atmega32u2.hex
View file

File diff suppressed because it is too large Load diff

1493
converter/ibmpc_usb/binary/ibmpc_usb_atmega32u4.hex
View file

File diff suppressed because it is too large Load diff

1
tmk_core/protocol/lufa.mk
View file

@ -41,6 +41,7 @@ VPATH += $(TMK_DIR)/$(TMK_LUFA_PATH)
TMK_LUFA_OPTS = -DUSB_DEVICE_ONLY TMK_LUFA_OPTS = -DUSB_DEVICE_ONLY
TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
TMK_LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" TMK_LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
# Do not enable this for converters in particular, it blocks other tasks long.
#TMK_LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT #TMK_LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1 TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1

8
tmk_core/protocol/lufa/lufa.c
View file

@ -272,7 +272,6 @@ void EVENT_USB_Device_Connect(void)
if (!USB_IsInitialized) { if (!USB_IsInitialized) {
USB_Disable(); USB_Disable();
USB_Init(); USB_Init();
USB_Device_EnableSOFEvents();
} }
} }
@ -315,11 +314,6 @@ void EVENT_USB_Device_WakeUp()
hook_usb_wakeup(); hook_usb_wakeup();
} }
// called every 1ms
void EVENT_USB_Device_StartOfFrame(void)
{
}
/** Event handler for the USB_ConfigurationChanged event. /** Event handler for the USB_ConfigurationChanged event.
* This is fired when the host sets the current configuration of the USB device after enumeration. * This is fired when the host sets the current configuration of the USB device after enumeration.
* *
@ -663,8 +657,6 @@ static void setup_usb(void)
USB_Disable(); USB_Disable();
USB_Init(); USB_Init();
USB_Device_EnableSOFEvents();
} }
int main(void) __attribute__ ((weak)); int main(void) __attribute__ ((weak));