From e1fa67ce621f741661f3517b47c579ecbc185209 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:00:38 +0100 Subject: [PATCH 1/7] feat(hid): Add apple globe keycode --- app/include/dt-bindings/zmk/keys.h | 4 ++++ docs/src/data/groups.js | 1 + docs/src/data/hid.js | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h index 3e67c402470..ddf1af85566 100644 --- a/app/include/dt-bindings/zmk/keys.h +++ b/app/include/dt-bindings/zmk/keys.h @@ -1439,3 +1439,7 @@ #define C_KEYBOARD_INPUT_ASSIST_CANCEL \ (ZMK_HID_USAGE(HID_USAGE_CONSUMER, HID_USAGE_CONSUMER_KEYBOARD_INPUT_ASSIST_CANCEL)) #define C_KBIA_CANCEL (C_KEYBOARD_INPUT_ASSIST_CANCEL) + +/* Apple Globe key */ +#define C_KEYBOARD_LAYOUT_SELECT (ZMK_HID_USAGE(HID_USAGE_CONSUMER, 0x029D)) +#define GLOBE (C_KEYBOARD_LAYOUT_SELECT) diff --git a/docs/src/data/groups.js b/docs/src/data/groups.js index 0eb15d27fc5..c560dbbcbf8 100644 --- a/docs/src/data/groups.js +++ b/docs/src/data/groups.js @@ -49,6 +49,7 @@ export default { "C_AC_DESKTOP_SHOW_ALL_WINDOWS", "C_AC_DESKTOP_SHOW_ALL_APPLICATIONS", "C_VOICE_COMMAND", + "C_KEYBOARD_LAYOUT_SELECT", ], applications: [ "C_AL_NEXT_TASK", diff --git a/docs/src/data/hid.js b/docs/src/data/hid.js index 457671728f8..c3f89eead51 100644 --- a/docs/src/data/hid.js +++ b/docs/src/data/hid.js @@ -7865,4 +7865,25 @@ export default [ }, footnotes: {}, }, + { + names: ["C_KEYBOARD_LAYOUT_SELECT", "GLOBE"], + description: "Layout Select (Apple Globe)", + context: "Consumer AC", + clarify: true, + usages: [ + { + application: consumerApplication, + item: usage(consumerPage, 0x29d), + }, + ], + documentation: "https://usb.org/sites/default/files/hut1_2.pdf#page=150", + os: { + windows: null, + linux: true, + android: null, + macos: true, + ios: null, + }, + footnotes: {}, + }, ]; From ac1672e46143cbe7c1b4c4041170e0ec3d7a27bb Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:19:50 +0000 Subject: [PATCH 2/7] Update docs/src/data/hid.js Co-authored-by: Cem Aksoylar --- docs/src/data/hid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/data/hid.js b/docs/src/data/hid.js index c3f89eead51..b59a6a2e5eb 100644 --- a/docs/src/data/hid.js +++ b/docs/src/data/hid.js @@ -7879,10 +7879,10 @@ export default [ documentation: "https://usb.org/sites/default/files/hut1_2.pdf#page=150", os: { windows: null, - linux: true, + linux: null, android: null, macos: true, - ios: null, + ios: true, }, footnotes: {}, }, From 4e8ddc3d9560efac9a77302a5970b089e7b2f343 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:18:43 +0000 Subject: [PATCH 3/7] Update docs/src/data/hid.js Co-authored-by: Pete Johanson --- docs/src/data/hid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/data/hid.js b/docs/src/data/hid.js index b59a6a2e5eb..93c45e3ab5d 100644 --- a/docs/src/data/hid.js +++ b/docs/src/data/hid.js @@ -7867,7 +7867,7 @@ export default [ }, { names: ["C_KEYBOARD_LAYOUT_SELECT", "GLOBE"], - description: "Layout Select (Apple Globe)", + description: "AC Next Keyboard Layout Select (Apple Globe)", context: "Consumer AC", clarify: true, usages: [ From f171088f0e683d59619ce75d33d7028a04fbca1f Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:18:49 +0000 Subject: [PATCH 4/7] Update docs/src/data/groups.js Co-authored-by: Pete Johanson --- docs/src/data/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/data/groups.js b/docs/src/data/groups.js index c560dbbcbf8..5a8dc3cfe75 100644 --- a/docs/src/data/groups.js +++ b/docs/src/data/groups.js @@ -49,7 +49,7 @@ export default { "C_AC_DESKTOP_SHOW_ALL_WINDOWS", "C_AC_DESKTOP_SHOW_ALL_APPLICATIONS", "C_VOICE_COMMAND", - "C_KEYBOARD_LAYOUT_SELECT", + "C_AC_NEXT_KEYBOARD_LAYOUT_SELECT", ], applications: [ "C_AL_NEXT_TASK", From c1e64da3155fb9f177c06a6a1934b1cf9d56a0d1 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:18:55 +0000 Subject: [PATCH 5/7] Update app/include/dt-bindings/zmk/keys.h Co-authored-by: Pete Johanson --- app/include/dt-bindings/zmk/keys.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h index ddf1af85566..364ffa8647a 100644 --- a/app/include/dt-bindings/zmk/keys.h +++ b/app/include/dt-bindings/zmk/keys.h @@ -1441,5 +1441,5 @@ #define C_KBIA_CANCEL (C_KEYBOARD_INPUT_ASSIST_CANCEL) /* Apple Globe key */ -#define C_KEYBOARD_LAYOUT_SELECT (ZMK_HID_USAGE(HID_USAGE_CONSUMER, 0x029D)) -#define GLOBE (C_KEYBOARD_LAYOUT_SELECT) +#define C_AC_NEXT_KEYBOARD_LAYOUT_SELECT (ZMK_HID_USAGE(HID_USAGE_CONSUMER, 0x029D)) +#define GLOBE (C_AC_NEXT_KEYBOARD_LAYOUT_SELECT) From 1d2ed343f9bc2404c996d5a8f040cb1a5a4c1bee Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:19:03 +0000 Subject: [PATCH 6/7] Update docs/src/data/hid.js Co-authored-by: Pete Johanson --- docs/src/data/hid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/data/hid.js b/docs/src/data/hid.js index 93c45e3ab5d..875a5da2724 100644 --- a/docs/src/data/hid.js +++ b/docs/src/data/hid.js @@ -7866,7 +7866,7 @@ export default [ footnotes: {}, }, { - names: ["C_KEYBOARD_LAYOUT_SELECT", "GLOBE"], + names: ["C_AC_NEXT_KEYBOARD_LAYOUT_SELECT", "GLOBE"], description: "AC Next Keyboard Layout Select (Apple Globe)", context: "Consumer AC", clarify: true, From 0a4d6218cf74e74c62f3d837845a6a7485e4f23e Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Fri, 29 Sep 2023 18:17:30 +0000 Subject: [PATCH 7/7] Update docs/src/data/hid.js Co-authored-by: Nick Coutsos --- docs/src/data/hid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/data/hid.js b/docs/src/data/hid.js index 875a5da2724..fc61555c8eb 100644 --- a/docs/src/data/hid.js +++ b/docs/src/data/hid.js @@ -7876,7 +7876,7 @@ export default [ item: usage(consumerPage, 0x29d), }, ], - documentation: "https://usb.org/sites/default/files/hut1_2.pdf#page=150", + documentation: "https://usb.org/sites/default/files/hut1_2.pdf#page=153", os: { windows: null, linux: null,