Skip to content

Commit eb65448

Browse files
authored
Merge pull request #636 from alessandromrc/patch-4
Add F13 to F24 keys to USBKeyboard
2 parents 0504d34 + 2115e65 commit eb65448

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

libraries/USBHID/src/USBKeyboard.cpp

+26-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ typedef struct {
3232

3333
#ifdef US_KEYBOARD
3434
/* US keyboard (as HID standard) */
35-
#define KEYMAP_SIZE (152)
35+
#define KEYMAP_SIZE (164)
3636
const KEYMAP keymap[KEYMAP_SIZE] = {
3737
{0, 0}, /* NUL */
3838
{0, 0}, /* SOH */
@@ -175,6 +175,18 @@ const KEYMAP keymap[KEYMAP_SIZE] = {
175175
{0x43, 0}, /* F10 */
176176
{0x44, 0}, /* F11 */
177177
{0x45, 0}, /* F12 */
178+
{0x68, 0}, /* F13 */
179+
{0x69, 0}, /* F14 */
180+
{0x6a, 0}, /* F15 */
181+
{0x6b, 0}, /* F16 */
182+
{0x6c, 0}, /* F17 */
183+
{0x6d, 0}, /* F18 */
184+
{0x6e, 0}, /* F19 */
185+
{0x6f, 0}, /* F20 */
186+
{0x70, 0}, /* F21 */
187+
{0x71, 0}, /* F22 */
188+
{0x72, 0}, /* F23 */
189+
{0x73, 0}, /* F24 */
178190

179191
{0x46, 0}, /* PRINT_SCREEN */
180192
{0x47, 0}, /* SCROLL_LOCK */
@@ -193,7 +205,7 @@ const KEYMAP keymap[KEYMAP_SIZE] = {
193205

194206
#else
195207
/* UK keyboard */
196-
#define KEYMAP_SIZE (152)
208+
#define KEYMAP_SIZE (164)
197209
const KEYMAP keymap[KEYMAP_SIZE] = {
198210
{0, 0}, /* NUL */
199211
{0, 0}, /* SOH */
@@ -336,6 +348,18 @@ const KEYMAP keymap[KEYMAP_SIZE] = {
336348
{0x43, 0}, /* F10 */
337349
{0x44, 0}, /* F11 */
338350
{0x45, 0}, /* F12 */
351+
{0x68, 0}, /* F13 */
352+
{0x69, 0}, /* F14 */
353+
{0x6a, 0}, /* F15 */
354+
{0x6b, 0}, /* F16 */
355+
{0x6c, 0}, /* F17 */
356+
{0x6d, 0}, /* F18 */
357+
{0x6e, 0}, /* F19 */
358+
{0x6f, 0}, /* F20 */
359+
{0x70, 0}, /* F21 */
360+
{0x71, 0}, /* F22 */
361+
{0x72, 0}, /* F23 */
362+
{0x73, 0}, /* F24 */
339363

340364
{0x46, 0}, /* PRINT_SCREEN */
341365
{0x47, 0}, /* SCROLL_LOCK */

libraries/USBHID/src/USBKeyboard.h

+12
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ enum FUNCTION_KEY {
6060
KEY_F10, /* F10 key */
6161
KEY_F11, /* F11 key */
6262
KEY_F12, /* F12 key */
63+
KEY_F13, /* F13 key */
64+
KEY_F14, /* F14 key */
65+
KEY_F15, /* F15 key */
66+
KEY_F16, /* F16 key */
67+
KEY_F17, /* F17 key */
68+
KEY_F18, /* F18 key */
69+
KEY_F19, /* F19 key */
70+
KEY_F20, /* F20 key */
71+
KEY_F21, /* F21 key */
72+
KEY_F22, /* F22 key */
73+
KEY_F23, /* F23 key */
74+
KEY_F24, /* F24 key */
6375

6476
KEY_PRINT_SCREEN, /* Print Screen key */
6577
KEY_SCROLL_LOCK, /* Scroll lock */

0 commit comments

Comments
 (0)