Compare commits

...

33 Commits

Author SHA1 Message Date
Christian C. Berclaz
1e1cc59978 Merge 3ca8651d2ccd7b0306de2d8f2601415e55fb0917 into d5a042498770050a3d2f002540413ba14dfaf8d1 2025-01-01 15:37:59 +11:00
QMK Bot
d5a0424987 [CI] Regenerate Files (#24772)
Regenerate Files
2025-01-01 02:22:28 +00:00
QMK Bot
1e6eb5e35c Merge remote-tracking branch 'origin/master' into develop 2025-01-01 02:09:51 +00:00
QMK Bot
57f89e5388 [CI] Regenerate Files (#24770)
Regenerate Files
2025-01-01 13:02:16 +11:00
QMK Bot
4d182ec117 Merge remote-tracking branch 'origin/master' into develop 2025-01-01 01:59:15 +00:00
Joel Challis
53680fa6da Fix g_led_config parse warning (#24769) 2025-01-01 01:58:41 +00:00
Christian C. Berclaz
3ca8651d2c Update tmk_core/protocol.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-12-01 11:14:30 +01:00
Christian C. Berclaz
fad7f83ce4 Update docs/keycodes.md
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-12-01 11:14:16 +01:00
Christian C. Berclaz
a80f527faf Update docs/keycodes_basic.md
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-11-30 18:41:41 +01:00
Christian C. Berclaz
39ffd475f6 Update docs/keycodes.md
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-11-30 18:41:26 +01:00
Christian C. Berclaz
9fed1625c8 Update data/constants/keycodes/keycodes_0.0.7_basic.hjson
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-11-30 18:41:04 +01:00
Christian C. Berclaz
559cd8c4bc fix(globe key): corrected the flag set.
SHARE_EP_ENABLE was incorrectly set with GLOBE_KEY_ENABLE, what was
needed is to set the KEYBOARD_SHARED_EP instead. This corrects it.
2024-11-30 17:58:43 +01:00
Christian C. Berclaz
ad15e336de Update tmk_core/protocol.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-11-30 17:35:35 +01:00
Christian C. Berclaz
0027d4b408 chore(globe): removing unrelated files 2024-11-30 17:34:08 +01:00
Christian C. Berclaz
90204f73fc fix(keycodes.md): an end tag was missing 2024-11-30 14:24:06 +01:00
Christian C. Berclaz
179fda24b0 chore(globe key): added keycodes_0.0.7, ran ./util/regen.sh 2024-11-30 14:20:21 +01:00
Christian C. Berclaz
66c7638fdf docs(globe key): Updated the .md file to prevent too much churn 2024-11-30 14:16:08 +01:00
Christian C. Berclaz
061bbb5431 docs(globe): added the Globe key to the QMK documentation 2024-11-30 13:20:07 +01:00
Christian C. Berclaz
1fd2c0dd8f feat(globe): added a switch to enable the Globe key 2024-11-30 13:19:37 +01:00
Christian C. Berclaz
c769c2c644 Merge branch 'qmk:master' into apple 2024-11-30 12:38:38 +01:00
Christian C. Berclaz
bcc0cf9802 Merge branch 'qmk:master' into apple 2024-11-29 09:43:10 +01:00
Christian C. Berclaz
84d49f62f6 Merge branch 'qmk:master' into apple 2024-11-24 00:36:22 +01:00
Christian C. Berclaz
20cc8b0766 fix(core): fix the previous commit for the KC_GLOBE key 2024-11-17 13:51:06 +01:00
Christian C. Berclaz
74bef5b463 feat(core): add KC_GLOBE keycodes according
This commit is based on lordpixel23 commit [d390fff](d39033f320)
2024-11-17 12:35:03 +01:00
Christian C. Berclaz
02b20f0450 Merge branch 'qmk:master' into main 2024-11-17 12:28:11 +01:00
Christian C. Berclaz
1d5571e3b1 Merge branch 'qmk:master' into main 2024-11-16 14:09:18 +01:00
Christian C. Berclaz
e4541bf3f8 Merge branch 'qmk:master' into main 2024-11-12 23:05:06 +01:00
Christian C. Berclaz
b7422cafb5 Merge branch 'qmk:master' into master 2024-11-09 12:13:53 +01:00
Christian C. Berclaz
2859d3d115 Delete keyboards/windstudio/wind_x/R1 directory
Removing the uppercase R1 folder
2024-11-08 08:12:32 +01:00
Christian C. Berclaz
df21f6d1f3 Merge branch 'qmk:master' into master 2024-11-08 07:50:06 +01:00
Christian C. Berclaz
43ca630457 Merge branch 'qmk:master' into master 2024-11-07 13:58:09 +01:00
Christian C. Berclaz
084a28b523 Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.
2024-11-05 16:06:44 +01:00
Christian C. Berclaz
e1db7e4857 Added a default firmware and layout for the WindStudio Wind X R1
keyboard.
2024-11-05 15:55:18 +01:00
81 changed files with 101 additions and 80 deletions

View File

@ -0,0 +1 @@
{}

View File

@ -0,0 +1,12 @@
{
"keycodes": {
"0x00C3": {
"group": "media",
"key": "KC_GLOBE",
"label": "Apple Globe/Fn",
"aliases": [
"KC_GLB"
]
}
}
}

View File

@ -211,6 +211,7 @@ See also: [Basic Keycodes](keycodes_basic)
|`KC_ASSISTANT` |`KC_ASST` |Launch Context-Aware Assistant |✔ | | |
|`KC_MISSION_CONTROL` |`KC_MCTL` |Open Mission Control | |✔ | |
|`KC_LAUNCHPAD` |`KC_LPAD` |Open Launchpad | |✔ | |
|`KC_GLOBE` |`KC_GLB` |Apple Globe/Fn | |✔<sup>7</sup>| |
<sup>1. The Linux kernel HID driver recognizes [nearly all keycodes](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-input.c), but the default bindings depend on the DE/WM.</sup><br/>
<sup>2. Treated as F13-F15.</sup><br/>
@ -218,6 +219,7 @@ See also: [Basic Keycodes](keycodes_basic)
<sup>4. Holding Shift+Option allows for finer control of volume level.</sup><br/>
<sup>5. Skips the entire track in iTunes when tapped, seeks within the current track when held.</sup><br/>
<sup>6. WMP does not recognize the Rewind key, but both alter playback speed in VLC.</sup>
<sup>7. Requires `KEYBOARD_SHARED_EP = yes` in `rules.mk` or `usb.shared_endpoint.keyboard=true` in `keyboard.json`. Globe+F-keys/arrow keys do not work.</sup>
## Quantum Keycodes {#quantum-keycodes}

View File

@ -227,6 +227,7 @@ Some of these keycodes may behave differently depending on the OS. For example,
|`KC_ASSISTANT` |`KC_ASST`|Launch Assistant |
|`KC_MISSION_CONTROL` |`KC_MCTL`|Open Mission Control|
|`KC_LAUNCHPAD` |`KC_LPAD`|Open Launchpad |
|`KC_GLOBE` |`KC_GLB` |Apple Globe/Fn |
## Number Pad

View File

@ -789,8 +789,8 @@ def _extract_led_config(info_data, keyboard):
info_data[feature]['layout'] = ret
except Exception as e:
_log_warning(info_data, f'led_config: {file.name}: {e}')
else:
_log_warning(info_data, 'led_config: matrix size required to parse g_led_config')
else:
_log_warning(info_data, 'led_config: matrix size required to parse g_led_config')
if info_data[feature].get('layout', None) and not info_data[feature].get('led_count', None):
info_data[feature]['led_count'] = len(info_data[feature]['layout'])

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************
@ -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,
@ -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,
@ -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)
@ -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

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

View File

@ -1,4 +1,4 @@
// Copyright 2024 QMK
// Copyright 2025 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
/*******************************************************************************

Some files were not shown because too many files have changed in this diff Show More