aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2019-07-20 22:21:40 +0200
committerDrashna Jaelre <drashna@live.com>2019-07-20 13:21:40 -0700
commita2e91ebec910d31a9f32cc56924ef3d6f0291e72 (patch)
treea2727aa99c89025aea5b4fd67fec7aa4b6ae8fea
parenta40dbf94e81e44b1e1ecc9f37c48258dde5ced27 (diff)
downloadqmk_firmware-a2e91ebec910d31a9f32cc56924ef3d6f0291e72.tar.gz
qmk_firmware-a2e91ebec910d31a9f32cc56924ef3d6f0291e72.zip
Update IS_COMMAND definitions to use MOD_MASK_SHIFT (#6348)
* Update IS_COMMAND definition in templates to use MOD_MASK_SHIFT * Update IS_COMMAND in docs * Update IS_COMMAND default definition in tmk_core * Update table in Command docs based on suggestion Co-Authored-By: fauxpark <fauxpark@gmail.com>
Diffstat
-rw-r--r--docs/config_options.md2
-rw-r--r--docs/feature_command.md66
-rw-r--r--quantum/template/avr/config.h2
-rw-r--r--quantum/template/ps2avrgb/config.h2
-rw-r--r--tmk_core/common/command.h2
5 files changed, 37 insertions, 37 deletions
diff --git a/docs/config_options.md b/docs/config_options.md
index 3012dcdcf..01c0e3ee8 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -89,7 +89,7 @@ This is a C header file that is one of the first things included, and will persi
89 * mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 89 * mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
90* `#define LOCKING_RESYNC_ENABLE` 90* `#define LOCKING_RESYNC_ENABLE`
91 * tries to keep switch state consistent with keyboard LED state 91 * tries to keep switch state consistent with keyboard LED state
92* `#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))` 92* `#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)`
93 * key combination that allows the use of magic commands (useful for debugging) 93 * key combination that allows the use of magic commands (useful for debugging)
94* `#define USB_MAX_POWER_CONSUMPTION` 94* `#define USB_MAX_POWER_CONSUMPTION`
95 * sets the maximum power (in mA) over USB for the device (default: 500) 95 * sets the maximum power (in mA) over USB for the device (default: 500)
diff --git a/docs/feature_command.md b/docs/feature_command.md
index deabedc1c..a4ce3f5ae 100644
--- a/docs/feature_command.md
+++ b/docs/feature_command.md
@@ -16,36 +16,36 @@ To use Command, hold down the key combination defined by the `IS_COMMAND()` macr
16 16
17If you would like to change the key assignments for Command, `#define` these in your `config.h` at either the keyboard or keymap level. All keycode assignments here must omit the `KC_` prefix. 17If you would like to change the key assignments for Command, `#define` these in your `config.h` at either the keyboard or keymap level. All keycode assignments here must omit the `KC_` prefix.
18 18
19|Define |Default |Description | 19|Define |Default |Description |
20|------------------------------------|---------------------------------------------------------------------------|------------------------------------------------| 20|------------------------------------|--------------------------------|------------------------------------------------|
21|`IS_COMMAND()` |<code>(get_mods() == (MOD_BIT(KC_LSHIFT) &#124; MOD_BIT(KC_RSHIFT)))</code>|The key combination to activate Command | 21|`IS_COMMAND()` |`(get_mods() == MOD_MASK_SHIFT)`|The key combination to activate Command |
22|`MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS` |`true` |Set default layer with the Function row | 22|`MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS` |`true` |Set default layer with the Function row |
23|`MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS` |`true` |Set default layer with the number keys | 23|`MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS` |`true` |Set default layer with the number keys |
24|`MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM`|`false` |Set default layer with `MAGIC_KEY_LAYER0..9` | 24|`MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM`|`false` |Set default layer with `MAGIC_KEY_LAYER0..9` |
25|`MAGIC_KEY_DEBUG` |`D` |Toggle debugging over serial | 25|`MAGIC_KEY_DEBUG` |`D` |Toggle debugging over serial |
26|`MAGIC_KEY_DEBUG_MATRIX` |`X` |Toggle key matrix debugging | 26|`MAGIC_KEY_DEBUG_MATRIX` |`X` |Toggle key matrix debugging |
27|`MAGIC_KEY_DEBUG_KBD` |`K` |Toggle keyboard debugging | 27|`MAGIC_KEY_DEBUG_KBD` |`K` |Toggle keyboard debugging |
28|`MAGIC_KEY_DEBUG_MOUSE` |`M` |Toggle mouse debugging | 28|`MAGIC_KEY_DEBUG_MOUSE` |`M` |Toggle mouse debugging |
29|`MAGIC_KEY_CONSOLE` |`C` |Enable the Command console | 29|`MAGIC_KEY_CONSOLE` |`C` |Enable the Command console |
30|`MAGIC_KEY_VERSION` |`V` |Print the running QMK version to the console | 30|`MAGIC_KEY_VERSION` |`V` |Print the running QMK version to the console |
31|`MAGIC_KEY_STATUS` |`S` |Print the current keyboard status to the console| 31|`MAGIC_KEY_STATUS` |`S` |Print the current keyboard status to the console|
32|`MAGIC_KEY_HELP` |`H` |Print Command help to the console | 32|`MAGIC_KEY_HELP` |`H` |Print Command help to the console |
33|`MAGIC_KEY_HELP_ALT` |`SLASH` |Print Command help to the console (alternate) | 33|`MAGIC_KEY_HELP_ALT` |`SLASH` |Print Command help to the console (alternate) |
34|`MAGIC_KEY_LAYER0` |`0` |Make layer 0 the default layer | 34|`MAGIC_KEY_LAYER0` |`0` |Make layer 0 the default layer |
35|`MAGIC_KEY_LAYER0_ALT` |`GRAVE` |Make layer 0 the default layer (alternate) | 35|`MAGIC_KEY_LAYER0_ALT` |`GRAVE` |Make layer 0 the default layer (alternate) |
36|`MAGIC_KEY_LAYER1` |`1` |Make layer 1 the default layer | 36|`MAGIC_KEY_LAYER1` |`1` |Make layer 1 the default layer |
37|`MAGIC_KEY_LAYER2` |`2` |Make layer 2 the default layer | 37|`MAGIC_KEY_LAYER2` |`2` |Make layer 2 the default layer |
38|`MAGIC_KEY_LAYER3` |`3` |Make layer 3 the default layer | 38|`MAGIC_KEY_LAYER3` |`3` |Make layer 3 the default layer |
39|`MAGIC_KEY_LAYER4` |`4` |Make layer 4 the default layer | 39|`MAGIC_KEY_LAYER4` |`4` |Make layer 4 the default layer |
40|`MAGIC_KEY_LAYER5` |`5` |Make layer 5 the default layer | 40|`MAGIC_KEY_LAYER5` |`5` |Make layer 5 the default layer |
41|`MAGIC_KEY_LAYER6` |`6` |Make layer 6 the default layer | 41|`MAGIC_KEY_LAYER6` |`6` |Make layer 6 the default layer |
42|`MAGIC_KEY_LAYER7` |`7` |Make layer 7 the default layer | 42|`MAGIC_KEY_LAYER7` |`7` |Make layer 7 the default layer |
43|`MAGIC_KEY_LAYER8` |`8` |Make layer 8 the default layer | 43|`MAGIC_KEY_LAYER8` |`8` |Make layer 8 the default layer |
44|`MAGIC_KEY_LAYER9` |`9` |Make layer 9 the default layer | 44|`MAGIC_KEY_LAYER9` |`9` |Make layer 9 the default layer |
45|`MAGIC_KEY_BOOTLOADER` |`B` |Jump to bootloader | 45|`MAGIC_KEY_BOOTLOADER` |`B` |Jump to bootloader |
46|`MAGIC_KEY_BOOTLOADER_ALT` |`ESC` |Jump to bootloader (alternate) | 46|`MAGIC_KEY_BOOTLOADER_ALT` |`ESC` |Jump to bootloader (alternate) |
47|`MAGIC_KEY_LOCK` |`CAPS` |Lock the keyboard so nothing can be typed | 47|`MAGIC_KEY_LOCK` |`CAPS` |Lock the keyboard so nothing can be typed |
48|`MAGIC_KEY_EEPROM` |`E` |Print stored EEPROM config to the console | 48|`MAGIC_KEY_EEPROM` |`E` |Print stored EEPROM config to the console |
49|`MAGIC_KEY_EEPROM_CLEAR` |`BSPACE` |Clear the EEPROM | 49|`MAGIC_KEY_EEPROM_CLEAR` |`BSPACE` |Clear the EEPROM |
50|`MAGIC_KEY_NKRO` |`N` |Toggle N-Key Rollover (NKRO) | 50|`MAGIC_KEY_NKRO` |`N` |Toggle N-Key Rollover (NKRO) |
51|`MAGIC_KEY_SLEEP_LED` |`Z` |Toggle LED when computer is sleeping | 51|`MAGIC_KEY_SLEEP_LED` |`Z` |Toggle LED when computer is sleeping |
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h
index fc65bb597..0fc7cf9cb 100644
--- a/quantum/template/avr/config.h
+++ b/quantum/template/avr/config.h
@@ -136,7 +136,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
136 136
137/* key combination for magic key command */ 137/* key combination for magic key command */
138/* defined by default; to change, uncomment and set to the combination you want */ 138/* defined by default; to change, uncomment and set to the combination you want */
139// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 139// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
140 140
141/* control how magic key switches layers */ 141/* control how magic key switches layers */
142//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true 142//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h
index 320d71fcb..9117bf1f9 100644
--- a/quantum/template/ps2avrgb/config.h
+++ b/quantum/template/ps2avrgb/config.h
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* key combination for magic key command */ 48/* key combination for magic key command */
49/* defined by default; to change, uncomment and set to the combination you want */ 49/* defined by default; to change, uncomment and set to the combination you want */
50// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 50// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
51 51
52/* Bootmagic Lite key configuration */ 52/* Bootmagic Lite key configuration */
53// #define BOOTMAGIC_LITE_ROW 0 53// #define BOOTMAGIC_LITE_ROW 0
diff --git a/tmk_core/common/command.h b/tmk_core/common/command.h
index e7c7b0ea1..e6e67fae4 100644
--- a/tmk_core/common/command.h
+++ b/tmk_core/common/command.h
@@ -35,7 +35,7 @@ bool command_proc(uint8_t code);
35#endif 35#endif
36 36
37#ifndef IS_COMMAND 37#ifndef IS_COMMAND
38#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 38#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
39#endif 39#endif
40 40
41#ifndef MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS 41#ifndef MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 14:05:20 +0000