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

Addition to the Apple Globe key code to QMK #24661

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e1db7e4
Added a default firmware and layout for the WindStudio Wind X R1
ChrisGVE Nov 5, 2024
084a28b
Wind X R1: cleaned-up the folders to make clear that this firmware is
ChrisGVE Nov 5, 2024
43ca630
Merge branch 'qmk:master' into master
ChrisGVE Nov 7, 2024
df21f6d
Merge branch 'qmk:master' into master
ChrisGVE Nov 8, 2024
2859d3d
Delete keyboards/windstudio/wind_x/R1 directory
ChrisGVE Nov 8, 2024
b7422ca
Merge branch 'qmk:master' into master
ChrisGVE Nov 9, 2024
e4541bf
Merge branch 'qmk:master' into main
ChrisGVE Nov 12, 2024
1d5571e
Merge branch 'qmk:master' into main
ChrisGVE Nov 16, 2024
02b20f0
Merge branch 'qmk:master' into main
ChrisGVE Nov 17, 2024
74bef5b
feat(core): add KC_GLOBE keycodes according
ChrisGVE Nov 17, 2024
20cc8b0
fix(core): fix the previous commit for the KC_GLOBE key
ChrisGVE Nov 17, 2024
84d49f6
Merge branch 'qmk:master' into apple
ChrisGVE Nov 23, 2024
bcc0cf9
Merge branch 'qmk:master' into apple
ChrisGVE Nov 29, 2024
c769c2c
Merge branch 'qmk:master' into apple
ChrisGVE Nov 30, 2024
1fd2c0d
feat(globe): added a switch to enable the Globe key
ChrisGVE Nov 30, 2024
061bbb5
docs(globe): added the Globe key to the QMK documentation
ChrisGVE Nov 30, 2024
66c7638
docs(globe key): Updated the .md file to prevent too much churn
ChrisGVE Nov 30, 2024
179fda2
chore(globe key): added keycodes_0.0.7, ran ./util/regen.sh
ChrisGVE Nov 30, 2024
90204f7
fix(keycodes.md): an end tag was missing
ChrisGVE Nov 30, 2024
0027d4b
chore(globe): removing unrelated files
ChrisGVE Nov 30, 2024
ad15e33
Update tmk_core/protocol.mk
ChrisGVE Nov 30, 2024
559cd8c
fix(globe key): corrected the flag set.
ChrisGVE Nov 30, 2024
9fed162
Update data/constants/keycodes/keycodes_0.0.7_basic.hjson
ChrisGVE Nov 30, 2024
39ffd47
Update docs/keycodes.md
ChrisGVE Nov 30, 2024
a80f527
Update docs/keycodes_basic.md
ChrisGVE Nov 30, 2024
fad7f83
Update docs/keycodes.md
ChrisGVE Dec 1, 2024
3ca8651
Update tmk_core/protocol.mk
ChrisGVE Dec 1, 2024
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
12 changes: 12 additions & 0 deletions data/constants/keycodes/keycodes_0.0.4_basic.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"keycodes": {
"0x00C3": {
"group": "media",
"key": "KC_GLOBE",
"label": "Apple Globe/FN Key",
"aliases": [
"KC_GLB"
]
}
}
}
1,430 changes: 716 additions & 714 deletions docs/keycodes.md

Large diffs are not rendered by default.

445 changes: 224 additions & 221 deletions docs/keycodes_basic.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions quantum/keycodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ enum qk_keycode_defines {
KC_ASSISTANT = 0x00C0,
KC_MISSION_CONTROL = 0x00C1,
KC_LAUNCHPAD = 0x00C2,
KC_GLOBE = 0x00C3,
QK_MOUSE_CURSOR_UP = 0x00CD,
QK_MOUSE_CURSOR_DOWN = 0x00CE,
QK_MOUSE_CURSOR_LEFT = 0x00CF,
Expand Down Expand Up @@ -943,6 +944,7 @@ enum qk_keycode_defines {
KC_ASST = KC_ASSISTANT,
KC_MCTL = KC_MISSION_CONTROL,
KC_LPAD = KC_LAUNCHPAD,
KC_GLB = KC_GLOBE,
MS_UP = QK_MOUSE_CURSOR_UP,
MS_DOWN = QK_MOUSE_CURSOR_DOWN,
MS_LEFT = QK_MOUSE_CURSOR_LEFT,
Expand Down Expand Up @@ -1488,7 +1490,7 @@ enum qk_keycode_defines {
#define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT)
#define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL)
#define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE)
#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_LAUNCHPAD)
#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_GLOBE)
#define IS_MOUSE_KEYCODE(code) ((code) >= QK_MOUSE_CURSOR_UP && (code) <= QK_MOUSE_ACCELERATION_2)
#define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT)
Expand All @@ -1514,7 +1516,7 @@ enum qk_keycode_defines {
#define INTERNAL_KEYCODE_RANGE KC_NO ... KC_TRANSPARENT
#define BASIC_KEYCODE_RANGE KC_A ... KC_EXSEL
#define SYSTEM_KEYCODE_RANGE KC_SYSTEM_POWER ... KC_SYSTEM_WAKE
#define CONSUMER_KEYCODE_RANGE KC_AUDIO_MUTE ... KC_LAUNCHPAD
#define CONSUMER_KEYCODE_RANGE KC_AUDIO_MUTE ... KC_GLOBE
#define MOUSE_KEYCODE_RANGE QK_MOUSE_CURSOR_UP ... QK_MOUSE_ACCELERATION_2
#define MODIFIER_KEYCODE_RANGE KC_LEFT_CTRL ... KC_RIGHT_GUI
#define SWAP_HANDS_KEYCODE_RANGE QK_SWAP_HANDS_TOGGLE ... QK_SWAP_HANDS_ONE_SHOT
Expand Down
7 changes: 7 additions & 0 deletions tmk_core/protocol.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ SRC += \

SHARED_EP_ENABLE = no
MOUSE_SHARED_EP ?= yes

ifeq ($(strip $(GLOBE_KEY_ENABLE)), yes)
OPT_DEFS += -DGLOBE_KEY_ENABLE
# The globe key require SHARED_EP
SHARED_EP_ENABLE = yes
endif

ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
OPT_DEFS += -DKEYBOARD_SHARED_EP
SHARED_EP_ENABLE = yes
Expand Down
4 changes: 3 additions & 1 deletion tmk_core/protocol/report.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// clang-format off

/* HID report IDs */
enum hid_report_ids {
enum hid_report_ids {
REPORT_ID_ALL = 0,
REPORT_ID_KEYBOARD = 1,
REPORT_ID_MOUSE,
Expand Down Expand Up @@ -327,6 +327,8 @@ static inline uint16_t KEYCODE2CONSUMER(uint8_t key) {
return AC_DESKTOP_SHOW_ALL_WINDOWS;
case KC_LAUNCHPAD:
return AC_SOFT_KEY_LEFT;
case KC_GLOBE:
return AC_NEXT_KEYBOARD_LAYOUT_SELECT;
default:
return 0;
}
Expand Down
Loading