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

Merge branch 'apple_magic_keyboard_support'

Browse source
This commit is contained in:
tmk 2023-01-25 13:33:31 +09:00
commit 8fd2ba90e7
6 changed files with 2154 additions and 2122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
converter/usb_usb/Makefile.8mhz
View file

@ -1,5 +1,7 @@
TARGET = usb_usb_8mhz
F_CPU = 8000000 F_CPU = 8000000
F_USB = 16000000 F_USB = 16000000
UNIMAP_ENABLE = yes UNIMAP_ENABLE = yes
KEYMAP_SECTION_ENABLE = yes KEYMAP_SECTION_ENABLE = yes
NO_DEBUG = yes
include Makefile include Makefile

27
converter/usb_usb/Makefile.8mhz_debug Normal file
View file

@ -0,0 +1,27 @@
TARGET = usb_usb_8mhz_debug
F_CPU = 8000000
F_USB = 16000000
#UNIMAP_ENABLE = yes
#KEYMAP_SECTION_ENABLE = yes
# LUFA debug print
# This may prevent USB enumeration and keyboard init
#TMK_LUFA_DEBUG = yes
# Select one of outputs for debug print
#TMK_LUFA_DEBUG_UART = yes
#TMK_LUFA_DEBUG_SUART = yes
# USB_Host_Shield_2.0 debug print
# This may prevent USB enumeration and keyboard init
OPT_DEFS += -DDEBUG_USB_HOST
CONSOLE_ENABLE = yes
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = no
COMMAND_ENABLE = no
OPT_DEFS += -DNO_ACTION_TAPPING
OPT_DEFS += -DNO_ACTION_LAYER
OPT_DEFS += -DNO_ACTION_MACRO
include Makefile

1966
converter/usb_usb/binary/usb_usb_debug.hex
View file

File diff suppressed because it is too large Load diff

2271
converter/usb_usb/binary/usb_usb_unimap.hex
View file

File diff suppressed because it is too large Load diff

8
converter/usb_usb/usb_usb.cpp
View file

@ -220,10 +220,10 @@ void matrix_print(void) {
void led_set(uint8_t usb_led) void led_set(uint8_t usb_led)
{ {
if (kbd1.isReady()) kbd1.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd1.isReady()) kbd1.SetLed(&usb_led);
if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd2.isReady()) kbd2.SetLed(&usb_led);
if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd3.isReady()) kbd3.SetLed(&usb_led);
if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd4.isReady()) kbd4.SetLed(&usb_led);
} }
// We need to keep doing UHS2 USB::Task() to initialize keyboard // We need to keep doing UHS2 USB::Task() to initialize keyboard

2
tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk

@ -1 +1 @@
Subproject commit 35606b2a9bb1e02e1adac14a8484c32d7a5e9f1c Subproject commit 8d7ecfa054b7ceb1be49cbb5bf35f4763cb70910