aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/config_options.md2
-rw-r--r--docs/feature_command.md64
-rw-r--r--keyboards/clueboard/66/rev4/config.h5
-rw-r--r--keyboards/converter/ibm_terminal/config.h4
-rw-r--r--keyboards/converter/m0110_usb/config.h4
-rw-r--r--keyboards/converter/palm_usb/config.h18
-rw-r--r--keyboards/converter/sun_usb/config.h6
-rw-r--r--keyboards/converter/xt_usb/config.h4
-rw-r--r--keyboards/ergodone/config.h4
-rw-r--r--keyboards/ergodox_ez/config.h4
-rw-r--r--keyboards/ergodox_infinity/config.h4
-rw-r--r--keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h4
-rw-r--r--keyboards/gergo/config.h10
-rw-r--r--keyboards/handwired/dactyl/config.h4
-rw-r--r--keyboards/handwired/frenchdev/config.h4
-rw-r--r--keyboards/handwired/promethium/config.h2
-rw-r--r--keyboards/massdrop/alt/keymaps/abishalom/keymap.c6
-rw-r--r--keyboards/massdrop/alt/keymaps/default/keymap.c6
-rw-r--r--keyboards/massdrop/alt/keymaps/mac/keymap.c6
-rw-r--r--keyboards/massdrop/alt/keymaps/reywood/keymap.c6
-rw-r--r--keyboards/massdrop/ctrl/keymaps/default/keymap.c6
-rw-r--r--keyboards/massdrop/ctrl/keymaps/mac/keymap.c6
-rw-r--r--keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c38
-rw-r--r--keyboards/orthodox/keymaps/drashna/config.h2
-rw-r--r--keyboards/orthodox/rev1/config.h2
-rw-r--r--keyboards/orthodox/rev3/config.h2
-rw-r--r--keyboards/orthodox/rev3_teensy/config.h2
-rw-r--r--keyboards/whitefox/keymaps/konstantin/config.h4
-rw-r--r--layouts/community/ergodox/win10_writers-block/config.h12
-rw-r--r--quantum/template/avr/config.h2
-rw-r--r--quantum/template/ps2avrgb/config.h2
-rw-r--r--tmk_core/common/command.h2
-rw-r--r--tmk_core/protocol/usb_hid/test/config.h2
33 files changed, 122 insertions, 127 deletions
diff --git a/docs/config_options.md b/docs/config_options.md
index f5c2e76e7..5e2de6d04 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -87,7 +87,7 @@ This is a C header file that is one of the first things included, and will persi
87 * mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 87 * mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
88* `#define LOCKING_RESYNC_ENABLE` 88* `#define LOCKING_RESYNC_ENABLE`
89 * tries to keep switch state consistent with keyboard LED state 89 * tries to keep switch state consistent with keyboard LED state
90* `#define IS_COMMAND() ( keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) )` 90* `#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))`
91 * key combination that allows the use of magic commands (useful for debugging) 91 * key combination that allows the use of magic commands (useful for debugging)
92* `#define USB_MAX_POWER_CONSUMPTION` 92* `#define USB_MAX_POWER_CONSUMPTION`
93 * sets the maximum power (in mA) over USB for the device (default: 500) 93 * 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 ca2ecce0d..53a140a11 100644
--- a/docs/feature_command.md
+++ b/docs/feature_command.md
@@ -16,35 +16,35 @@ 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>(keyboard_report->mods == (MOD_BIT(KC_LSHIFT) &#124; MOD_BIT(KC_RSHIFT)))</code>|The key combination to activate Command | 21|`IS_COMMAND()` |<code>(get_mods() == (MOD_BIT(KC_LSHIFT) &#124; MOD_BIT(KC_RSHIFT)))</code>|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_HELP1` |`H` |Print Command help to the console | 32|`MAGIC_KEY_HELP1` |`H` |Print Command help to the console |
33|`MAGIC_KEY_HELP2` |`SLASH` |Print Command help to the console (alternate) | 33|`MAGIC_KEY_HELP2` |`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_LAYER1` |`1` |Make layer 1 the default layer | 35|`MAGIC_KEY_LAYER1` |`1` |Make layer 1 the default layer |
36|`MAGIC_KEY_LAYER2` |`2` |Make layer 2 the default layer | 36|`MAGIC_KEY_LAYER2` |`2` |Make layer 2 the default layer |
37|`MAGIC_KEY_LAYER3` |`3` |Make layer 3 the default layer | 37|`MAGIC_KEY_LAYER3` |`3` |Make layer 3 the default layer |
38|`MAGIC_KEY_LAYER4` |`4` |Make layer 4 the default layer | 38|`MAGIC_KEY_LAYER4` |`4` |Make layer 4 the default layer |
39|`MAGIC_KEY_LAYER5` |`5` |Make layer 5 the default layer | 39|`MAGIC_KEY_LAYER5` |`5` |Make layer 5 the default layer |
40|`MAGIC_KEY_LAYER6` |`6` |Make layer 6 the default layer | 40|`MAGIC_KEY_LAYER6` |`6` |Make layer 6 the default layer |
41|`MAGIC_KEY_LAYER7` |`7` |Make layer 7 the default layer | 41|`MAGIC_KEY_LAYER7` |`7` |Make layer 7 the default layer |
42|`MAGIC_KEY_LAYER8` |`8` |Make layer 8 the default layer | 42|`MAGIC_KEY_LAYER8` |`8` |Make layer 8 the default layer |
43|`MAGIC_KEY_LAYER9` |`9` |Make layer 9 the default layer | 43|`MAGIC_KEY_LAYER9` |`9` |Make layer 9 the default layer |
44|`MAGIC_KEY_LAYER0_ALT1` |`ESC` |Make layer 0 the default layer (alternate) | 44|`MAGIC_KEY_LAYER0_ALT1` |`ESC` |Make layer 0 the default layer (alternate) |
45|`MAGIC_KEY_LAYER0_ALT2` |`GRAVE` |Make layer 0 the default layer (alternate) | 45|`MAGIC_KEY_LAYER0_ALT2` |`GRAVE` |Make layer 0 the default layer (alternate) |
46|`MAGIC_KEY_BOOTLOADER` |`PAUSE` |Enter the bootloader | 46|`MAGIC_KEY_BOOTLOADER` |`PAUSE` |Enter the bootloader |
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` |Clear the EEPROM | 48|`MAGIC_KEY_EEPROM` |`E` |Clear the EEPROM |
49|`MAGIC_KEY_NKRO` |`N` |Toggle N-Key Rollover (NKRO) | 49|`MAGIC_KEY_NKRO` |`N` |Toggle N-Key Rollover (NKRO) |
50|`MAGIC_KEY_SLEEP_LED` |`Z` |Toggle LED when computer is sleeping | 50|`MAGIC_KEY_SLEEP_LED` |`Z` |Toggle LED when computer is sleeping |
diff --git a/keyboards/clueboard/66/rev4/config.h b/keyboards/clueboard/66/rev4/config.h
index 19a9837a3..540b38722 100644
--- a/keyboards/clueboard/66/rev4/config.h
+++ b/keyboards/clueboard/66/rev4/config.h
@@ -37,11 +37,6 @@
37/* Locking resynchronize hack */ 37/* Locking resynchronize hack */
38#define LOCKING_RESYNC_ENABLE 38#define LOCKING_RESYNC_ENABLE
39 39
40/* key combination for command */
41#define IS_COMMAND() ( \
42 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
43)
44
45/* 40/*
46 * Feature disable options 41 * Feature disable options
47 * These options are also useful to firmware size reduction. 42 * These options are also useful to firmware size reduction.
diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h
index 4dd85f698..ba9ec82fa 100644
--- a/keyboards/converter/ibm_terminal/config.h
+++ b/keyboards/converter/ibm_terminal/config.h
@@ -39,11 +39,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39 39
40/* key combination for command */ 40/* key combination for command */
41#define IS_COMMAND() ( \ 41#define IS_COMMAND() ( \
42 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL)) \ 42 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL)) \
43) 43)
44 44
45 45
46/* 46/*
47 * PS/2 USART configuration for ATMega32U4 47 * PS/2 USART configuration for ATMega32U4
48 */ 48 */
49#ifdef PS2_USE_USART 49#ifdef PS2_USE_USART
diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h
index 79abb9a88..02e4c30fb 100644
--- a/keyboards/converter/m0110_usb/config.h
+++ b/keyboards/converter/m0110_usb/config.h
@@ -39,8 +39,8 @@ Ported to QMK by Techsock <info@techsock.com>
39 39
40/* magic key */ 40/* magic key */
41#define IS_COMMAND() ( \ 41#define IS_COMMAND() ( \
42 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \ 42 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \
43 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \ 43 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \
44) 44)
45 45
46/* boot magic key */ 46/* boot magic key */
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/config.h
index 4520725a1..4233a53ef 100644
--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/config.h
@@ -34,19 +34,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34 34
35// IO pins to serial 35// IO pins to serial
36// https://deskthority.net/wiki/Arduino_Pro_Micro for pin lookup 36// https://deskthority.net/wiki/Arduino_Pro_Micro for pin lookup
37#define VCC_PIN D1 // pro micro 2 37#define VCC_PIN D1 // pro micro 2
38#define RX_PIN D0 //pro micro 3 , was 8 on cy384 38#define RX_PIN D0 //pro micro 3 , was 8 on cy384
39#define RTS_PIN C6 // 5 //[ was D4 // 4 on the cy384 39#define RTS_PIN C6 // 5 //[ was D4 // 4 on the cy384
40#define DCD_PIN E6 //7 40#define DCD_PIN E6 //7
41 41
42// if using the particular arduino pinout of CY384 42// if using the particular arduino pinout of CY384
43#ifdef CY384 43#ifdef CY384
44 #define GND_PIN D7 //6 44 #define GND_PIN D7 //6
45 #define PULLDOWN_PIN B1 // 15 45 #define PULLDOWN_PIN B1 // 15
46#endif 46#endif
47 47
48#ifndef HANDSPRING 48#ifndef HANDSPRING
49// Set to 1 for Handspring or to disable RTS/DCD based handshake. 49// Set to 1 for Handspring or to disable RTS/DCD based handshake.
50 #define HANDSPRING 0 50 #define HANDSPRING 0
51#endif 51#endif
52 52
@@ -59,9 +59,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59 59
60/* key combination for command */ 60/* key combination for command */
61#define IS_COMMAND() ( \ 61#define IS_COMMAND() ( \
62 keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \ 62 get_mods() == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \
63 keyboard_report->mods == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \ 63 get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
64 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 64 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
65) 65)
66 66
67 67
@@ -74,10 +74,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74#define SERIAL_SOFT_BIT_ORDER_LSB 74#define SERIAL_SOFT_BIT_ORDER_LSB
75#if (HANDSPRING == 0) 75#if (HANDSPRING == 0)
76 #define SERIAL_SOFT_LOGIC_NEGATIVE //RS232 logic 76 #define SERIAL_SOFT_LOGIC_NEGATIVE //RS232 logic
77#endif 77#endif
78/* RXD Port */ 78/* RXD Port */
79#define SERIAL_SOFT_RXD_ENABLE 79#define SERIAL_SOFT_RXD_ENABLE
80 80
81// we are using Pro micro pin 3 / D0 as serial 81// we are using Pro micro pin 3 / D0 as serial
82#define SERIAL_SOFT_RXD_DDR DDRD 82#define SERIAL_SOFT_RXD_DDR DDRD
83#define SERIAL_SOFT_RXD_PORT PORTD 83#define SERIAL_SOFT_RXD_PORT PORTD
diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h
index f7ad41639..7713e0a91 100644
--- a/keyboards/converter/sun_usb/config.h
+++ b/keyboards/converter/sun_usb/config.h
@@ -33,9 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33 33
34/* key combination for command */ 34/* key combination for command */
35#define IS_COMMAND() ( \ 35#define IS_COMMAND() ( \
36 keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \ 36 get_mods() == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \
37 keyboard_report->mods == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \ 37 get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
38 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 38 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
39) 39)
40 40
41 41
diff --git a/keyboards/converter/xt_usb/config.h b/keyboards/converter/xt_usb/config.h
index 963a3c639..ecebc123f 100644
--- a/keyboards/converter/xt_usb/config.h
+++ b/keyboards/converter/xt_usb/config.h
@@ -31,8 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
31 31
32/* key combination for command */ 32/* key combination for command */
33#define IS_COMMAND() ( \ 33#define IS_COMMAND() ( \
34 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \ 34 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
35 keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \ 35 get_mods() == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
36) 36)
37 37
38 38
diff --git a/keyboards/ergodone/config.h b/keyboards/ergodone/config.h
index 2c764d782..815af357d 100644
--- a/keyboards/ergodone/config.h
+++ b/keyboards/ergodone/config.h
@@ -37,8 +37,8 @@
37 37
38/* key combination for command */ 38/* key combination for command */
39#define IS_COMMAND() ( \ 39#define IS_COMMAND() ( \
40 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 40 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
41 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 41 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
42) 42)
43 43
44/* number of backlight levels */ 44/* number of backlight levels */
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index ee768853a..096368f7a 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -55,8 +55,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
55 55
56/* key combination for command */ 56/* key combination for command */
57#define IS_COMMAND() ( \ 57#define IS_COMMAND() ( \
58 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 58 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
59 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 59 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
60) 60)
61 61
62/* number of backlight levels */ 62/* number of backlight levels */
diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/ergodox_infinity/config.h
index 0e64897cb..a64f3f4a1 100644
--- a/keyboards/ergodox_infinity/config.h
+++ b/keyboards/ergodox_infinity/config.h
@@ -47,8 +47,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* key combination for command */ 48/* key combination for command */
49#define IS_COMMAND() ( \ 49#define IS_COMMAND() ( \
50 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 50 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
51 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 51 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
52) 52)
53 53
54/* key matrix size */ 54/* key matrix size */
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h b/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
index 187ce8703..2e83f799c 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
+++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
@@ -49,8 +49,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
49 49
50/* key combination for command */ 50/* key combination for command */
51#define IS_COMMAND() ( \ 51#define IS_COMMAND() ( \
52 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 52 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
53 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 53 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
54) 54)
55 55
56/* key matrix size */ 56/* key matrix size */
diff --git a/keyboards/gergo/config.h b/keyboards/gergo/config.h
index a795f8dba..e4c61ecb0 100644
--- a/keyboards/gergo/config.h
+++ b/keyboards/gergo/config.h
@@ -24,11 +24,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24/* Defaults */ 24/* Defaults */
25#ifndef BALLSTEP 25#ifndef BALLSTEP
26#define BALLSTEP 20 26#define BALLSTEP 20
27#endif 27#endif
28 28
29#ifndef SCROLLSTEP 29#ifndef SCROLLSTEP
30#define SCROLLSTEP 1 30#define SCROLLSTEP 1
31#endif 31#endif
32 32
33#define VERBOSE 33#define VERBOSE
34 34
@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
36#define VENDOR_ID 0xFEED 36#define VENDOR_ID 0xFEED
37#define PRODUCT_ID 0x1307 37#define PRODUCT_ID 0x1307
38#define DEVICE_VER 0x0001 38#define DEVICE_VER 0x0001
39#define MANUFACTURER g Heavy Industries 39#define MANUFACTURER g Heavy Industries
40#define PRODUCT Gergo 40#define PRODUCT Gergo
41#define DESCRIPTION QMK keyboard firmware for Gergo 41#define DESCRIPTION QMK keyboard firmware for Gergo
42 42
@@ -65,8 +65,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
65 65
66/* key combination for command */ 66/* key combination for command */
67#define IS_COMMAND() ( \ 67#define IS_COMMAND() ( \
68 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 68 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
69 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 69 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
70) 70)
71 71
72#define DEBOUNCE 5 72#define DEBOUNCE 5
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 08931ecd3..8d42c0ae4 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -53,8 +53,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
53 53
54/* key combination for command */ 54/* key combination for command */
55#define IS_COMMAND() ( \ 55#define IS_COMMAND() ( \
56 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 56 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
57 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 57 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
58) 58)
59 59
60/* fix space cadet rollover issue */ 60/* fix space cadet rollover issue */
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index dd386402c..b01eec7aa 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -59,8 +59,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59 59
60/* key combination for command */ 60/* key combination for command */
61#define IS_COMMAND() ( \ 61#define IS_COMMAND() ( \
62 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 62 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
63 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 63 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
64) 64)
65 65
66/* 66/*
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index dca0aec2e..b5a0a7f4b 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -95,7 +95,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
95 95
96/* key combination for command */ 96/* key combination for command */
97#define IS_COMMAND() ( \ 97#define IS_COMMAND() ( \
98 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RCTRL)) \ 98 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RCTRL)) \
99) 99)
100 100
101/* control how magic key switches layers */ 101/* control how magic key switches layers */
diff --git a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
index 7ffa53dca..10bc62c1f 100644
--- a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
@@ -60,9 +60,9 @@ void matrix_init_user(void) {
60void matrix_scan_user(void) { 60void matrix_scan_user(void) {
61}; 61};
62 62
63#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 63#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
64#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 64#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
65#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 65#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
66 66
67bool process_record_user(uint16_t keycode, keyrecord_t *record) { 67bool process_record_user(uint16_t keycode, keyrecord_t *record) {
68 static uint32_t key_timer; 68 static uint32_t key_timer;
diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
index 7ffa53dca..10bc62c1f 100644
--- a/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -60,9 +60,9 @@ void matrix_init_user(void) {
60void matrix_scan_user(void) { 60void matrix_scan_user(void) {
61}; 61};
62 62
63#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 63#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
64#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 64#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
65#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 65#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
66 66
67bool process_record_user(uint16_t keycode, keyrecord_t *record) { 67bool process_record_user(uint16_t keycode, keyrecord_t *record) {
68 static uint32_t key_timer; 68 static uint32_t key_timer;
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
index 9fd4816cc..639eb2da7 100644
--- a/keyboards/massdrop/alt/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac/keymap.c
@@ -60,9 +60,9 @@ void matrix_init_user(void) {
60void matrix_scan_user(void) { 60void matrix_scan_user(void) {
61}; 61};
62 62
63#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 63#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
64#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 64#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
65#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 65#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
66 66
67bool process_record_user(uint16_t keycode, keyrecord_t *record) { 67bool process_record_user(uint16_t keycode, keyrecord_t *record) {
68 static uint32_t key_timer; 68 static uint32_t key_timer;
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
index 48b804efe..cf60acfe6 100644
--- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
@@ -60,9 +60,9 @@ void matrix_init_user(void) {
60void matrix_scan_user(void) { 60void matrix_scan_user(void) {
61}; 61};
62 62
63#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 63#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
64#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 64#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
65#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 65#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
66 66
67bool process_record_user(uint16_t keycode, keyrecord_t *record) { 67bool process_record_user(uint16_t keycode, keyrecord_t *record) {
68 static uint32_t key_timer; 68 static uint32_t key_timer;
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 11597f987..cdb627f9c 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -63,9 +63,9 @@ void matrix_init_user(void) {
63void matrix_scan_user(void) { 63void matrix_scan_user(void) {
64}; 64};
65 65
66#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 66#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
67#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 67#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
68#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 68#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
69 69
70bool process_record_user(uint16_t keycode, keyrecord_t *record) { 70bool process_record_user(uint16_t keycode, keyrecord_t *record) {
71 static uint32_t key_timer; 71 static uint32_t key_timer;
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
index badb566b3..e41b5eba2 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
@@ -63,9 +63,9 @@ void matrix_init_user(void) {
63void matrix_scan_user(void) { 63void matrix_scan_user(void) {
64}; 64};
65 65
66#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 66#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
67#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 67#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
68#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 68#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
69 69
70bool process_record_user(uint16_t keycode, keyrecord_t *record) { 70bool process_record_user(uint16_t keycode, keyrecord_t *record) {
71 static uint32_t key_timer; 71 static uint32_t key_timer;
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index eabd8d23a..0bdc15214 100644
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -37,7 +37,7 @@ enum ctrl_keycodes {
37 DBG_KBD, //DEBUG Toggle Keyboard Prints 37 DBG_KBD, //DEBUG Toggle Keyboard Prints
38 DBG_MOU, //DEBUG Toggle Mouse Prints 38 DBG_MOU, //DEBUG Toggle Mouse Prints
39 MD_BOOT, //Restart into bootloader after hold timeout 39 MD_BOOT, //Restart into bootloader after hold timeout
40 40
41 L_SP_PR, //LED Splash Pattern Select Previous 41 L_SP_PR, //LED Splash Pattern Select Previous
42 L_SP_NE, //LED Splash Pattern Select Next 42 L_SP_NE, //LED Splash Pattern Select Next
43 43
@@ -178,7 +178,7 @@ static void init_distance_map(void){
178 uint8_t id2 = ktli(KEY_POSITION_MAP[j][i]); 178 uint8_t id2 = ktli(KEY_POSITION_MAP[j][i]);
179 179
180 if(id1 == id2) continue; 180 if(id1 == id2) continue;
181 181
182 uint8_t dx = abs(i - x); 182 uint8_t dx = abs(i - x);
183 uint8_t dy = abs(j - y); 183 uint8_t dy = abs(j - y);
184 uint8_t dis = dx + dy; 184 uint8_t dis = dx + dy;
@@ -277,15 +277,15 @@ void led_matrix_run(void)
277 bo = 0; 277 bo = 0;
278 278
279 uint8_t led_index = led_cur - led_map; // only this part differs from the original function. 279 uint8_t led_index = led_cur - led_map; // only this part differs from the original function.
280 if(led_index < KEY_LED_COUNT){ // 280 if(led_index < KEY_LED_COUNT){ //
281 user_led_cur = USER_LED[led_index]; // `struct user_led_t USER_LED[]` is stored globally. 281 user_led_cur = USER_LED[led_index]; // `struct user_led_t USER_LED[]` is stored globally.
282 } // 282 } //
283 // 283 //
284 if(led_index < KEY_LED_COUNT && user_led_cur.state){ // `user_led_cur` is just for convenience 284 if(led_index < KEY_LED_COUNT && user_led_cur.state){ // `user_led_cur` is just for convenience
285 ro = user_led_cur.r; // 285 ro = user_led_cur.r; //
286 go = user_led_cur.g; // 286 go = user_led_cur.g; //
287 bo = user_led_cur.b; // 287 bo = user_led_cur.b; //
288 } // 288 } //
289 else if (led_lighting_mode == LED_MODE_KEYS_ONLY && led_cur->scan == 255) 289 else if (led_lighting_mode == LED_MODE_KEYS_ONLY && led_cur->scan == 255)
290 { 290 {
291 //Do not act on this LED 291 //Do not act on this LED
@@ -513,7 +513,7 @@ static uint8_t COLOR_PATTERNS[][COLOR_PATTERN_RGB_COUNT][3] = {
513 {181, 181, 181}, {164, 164, 164}, {147, 147, 147}, 513 {181, 181, 181}, {164, 164, 164}, {147, 147, 147},
514 {128, 128, 128}, {108, 108, 108}, { 88, 88, 88}, 514 {128, 128, 128}, {108, 108, 108}, { 88, 88, 88},
515 { 66, 66, 66}, { 45, 45, 45}, { 23, 23, 23}, 515 { 66, 66, 66}, { 45, 45, 45}, { 23, 23, 23},
516 }, 516 },
517}; 517};
518static const uint8_t COLOR_PATTERNS_COUNT = ( 518static const uint8_t COLOR_PATTERNS_COUNT = (
519 sizeof(COLOR_PATTERNS) / sizeof(COLOR_PATTERNS[0])); 519 sizeof(COLOR_PATTERNS) / sizeof(COLOR_PATTERNS[0]));
@@ -561,7 +561,7 @@ void refresh_color_pattern_indicators(void){
561 static uint8_t ZXCVBNM_COMM_DOT[] = { 561 static uint8_t ZXCVBNM_COMM_DOT[] = {
562 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, 562 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
563 }; 563 };
564 564
565 if(layer_state >= 0x04){ 565 if(layer_state >= 0x04){
566 uint8_t (*c)[3] = &COLOR_PATTERNS[USER_CONFIG.COLOR_PATTERN_INDEX][0]; 566 uint8_t (*c)[3] = &COLOR_PATTERNS[USER_CONFIG.COLOR_PATTERN_INDEX][0];
567 for(uint8_t i = 0; i < 9; ++i){ 567 for(uint8_t i = 0; i < 9; ++i){
@@ -589,7 +589,7 @@ void matrix_scan_user(void) {
589 589
590 calculate_keystroke_distance(); 590 calculate_keystroke_distance();
591 591
592 592
593 #define USE_PATTERN 0 593 #define USE_PATTERN 0
594 #define BLACK_RGB 1 594 #define BLACK_RGB 1
595 #define COLOR_RGB 2 595 #define COLOR_RGB 2
@@ -599,7 +599,7 @@ void matrix_scan_user(void) {
599 uint8_t distance; 599 uint8_t distance;
600 for(uint8_t i = 1; i <= KEY_LED_COUNT; ++i){ 600 for(uint8_t i = 1; i <= KEY_LED_COUNT; ++i){
601 if(USER_LED[i-1].state >= 2) continue; 601 if(USER_LED[i-1].state >= 2) continue;
602 602
603 handle_type = USE_PATTERN; 603 handle_type = USE_PATTERN;
604 distance = DISTANCE_FROM_LAST_KEYSTROKE[i]; 604 distance = DISTANCE_FROM_LAST_KEYSTROKE[i];
605 605
@@ -695,9 +695,9 @@ void matrix_scan_user(void) {
695 695
696}; 696};
697 697
698#define MODS_SHIFT (keyboard_report->mods & MOD_BIT(KC_LSHIFT) || keyboard_report->mods & MOD_BIT(KC_RSHIFT)) 698#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
699#define MODS_CTRL (keyboard_report->mods & MOD_BIT(KC_LCTL) || keyboard_report->mods & MOD_BIT(KC_RCTRL)) 699#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
700#define MODS_ALT (keyboard_report->mods & MOD_BIT(KC_LALT) || keyboard_report->mods & MOD_BIT(KC_RALT)) 700#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
701 701
702bool process_record_user(uint16_t keycode, keyrecord_t *record) { 702bool process_record_user(uint16_t keycode, keyrecord_t *record) {
703 static uint32_t key_timer; 703 static uint32_t key_timer;
@@ -835,7 +835,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
835 835
836 836
837 837
838 838
839 case L_SP_PR: // previous dripple pattern 839 case L_SP_PR: // previous dripple pattern
840 case L_SP_NE: // next dripple pattern 840 case L_SP_NE: // next dripple pattern
841 if (record->event.pressed) { 841 if (record->event.pressed) {
@@ -880,7 +880,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
880 USER_CONFIG.WAVE_PERIOD = 10; 880 USER_CONFIG.WAVE_PERIOD = 10;
881 break; 881 break;
882 } 882 }
883 883
884 // remove effect after changing pattern 884 // remove effect after changing pattern
885 for(int i = 0; i < KEY_STROKES_LENGTH; ++i){ 885 for(int i = 0; i < KEY_STROKES_LENGTH; ++i){
886 KEY_STROKES[i].alive = 0; 886 KEY_STROKES[i].alive = 0;
@@ -903,7 +903,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
903 case L_SP_SL: 903 case L_SP_SL:
904 if(record->event.pressed){ 904 if(record->event.pressed){
905 short incre = keycode == L_SP_FA ? -1 : 1; 905 short incre = keycode == L_SP_FA ? -1 : 1;
906 906
907 USER_CONFIG.WAVE_PERIOD += 10 * incre; 907 USER_CONFIG.WAVE_PERIOD += 10 * incre;
908 if(USER_CONFIG.WAVE_PERIOD < 10){ 908 if(USER_CONFIG.WAVE_PERIOD < 10){
909 USER_CONFIG.WAVE_PERIOD = 10; 909 USER_CONFIG.WAVE_PERIOD = 10;
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index 6fca4278d..eed1cbe89 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34 34
35/* key combination for magic key command */ 35/* key combination for magic key command */
36#define IS_COMMAND() ( \ 36#define IS_COMMAND() ( \
37 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \ 37 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \
38) 38)
39 39
40#ifdef RGBLIGHT_ENABLE 40#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 03936e737..f7497c09c 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
65 65
66/* key combination for command */ 66/* key combination for command */
67#define IS_COMMAND() ( \ 67#define IS_COMMAND() ( \
68 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \ 68 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
69) 69)
70 70
71/* ws2812 RGB LED */ 71/* ws2812 RGB LED */
diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index 2e4018e91..d727ae674 100644
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -70,7 +70,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
70 70
71/* key combination for command */ 71/* key combination for command */
72#define IS_COMMAND() ( \ 72#define IS_COMMAND() ( \
73 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \ 73 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
74) 74)
75 75
76/* ws2812 RGB LED */ 76/* ws2812 RGB LED */
diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h
index e2e693079..591827fb9 100644
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62 62
63/* key combination for command */ 63/* key combination for command */
64#define IS_COMMAND() ( \ 64#define IS_COMMAND() ( \
65 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \ 65 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
66) 66)
67 67
68/* ws2812 RGB LED */ 68/* ws2812 RGB LED */
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h
index 85d472165..99dc6af75 100644
--- a/keyboards/whitefox/keymaps/konstantin/config.h
+++ b/keyboards/whitefox/keymaps/konstantin/config.h
@@ -1,10 +1,10 @@
1#pragma once 1#pragma once
2 2
3#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))
4
3#define LAYER_FN 5#define LAYER_FN
4#define LAYER_NUMPAD 6#define LAYER_NUMPAD
5 7
6#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))
7
8#define MAGIC_KEY_LAYER0_ALT1 BSLS 8#define MAGIC_KEY_LAYER0_ALT1 BSLS
9#define MAGIC_KEY_BOOTLOADER ESC 9#define MAGIC_KEY_BOOTLOADER ESC
10 10
diff --git a/layouts/community/ergodox/win10_writers-block/config.h b/layouts/community/ergodox/win10_writers-block/config.h
index ed6170369..b0b4a1ebb 100644
--- a/layouts/community/ergodox/win10_writers-block/config.h
+++ b/layouts/community/ergodox/win10_writers-block/config.h
@@ -3,10 +3,10 @@
3 3
4#include QMK_KEYBOARD_CONFIG_H 4#include QMK_KEYBOARD_CONFIG_H
5 5
6#undef MOUSEKEY_DELAY 6#undef MOUSEKEY_DELAY
7#undef MOUSEKEY_INTERVAL 7#undef MOUSEKEY_INTERVAL
8#undef MOUSEKEY_MAX_SPEED 8#undef MOUSEKEY_MAX_SPEED
9#undef MOUSEKEY_TIME_TO_MAX 9#undef MOUSEKEY_TIME_TO_MAX
10 10
11#define MOUSEKEY_DELAY 100 11#define MOUSEKEY_DELAY 100
12#define MOUSEKEY_INTERVAL 20 12#define MOUSEKEY_INTERVAL 20
@@ -28,8 +28,8 @@
28 28
29/* key combination for command */ 29/* key combination for command */
30#define IS_COMMAND() ( \ 30#define IS_COMMAND() ( \
31 keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ 31 get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
32 keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ 32 get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
33) 33)
34 34
35#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ 35#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h
index 3b288c217..a31fcf236 100644
--- a/quantum/template/avr/config.h
+++ b/quantum/template/avr/config.h
@@ -132,7 +132,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
132 132
133/* key combination for magic key command */ 133/* key combination for magic key command */
134/* defined by default; to change, uncomment and set to the combination you want */ 134/* defined by default; to change, uncomment and set to the combination you want */
135// #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 135// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
136 136
137/* control how magic key switches layers */ 137/* control how magic key switches layers */
138//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true 138//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h
index a05873c34..01cdf932e 100644
--- a/quantum/template/ps2avrgb/config.h
+++ b/quantum/template/ps2avrgb/config.h
@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44 44
45/* key combination for magic key command */ 45/* key combination for magic key command */
46/* defined by default; to change, uncomment and set to the combination you want */ 46/* defined by default; to change, uncomment and set to the combination you want */
47// #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 47// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
48 48
49/* Bootmagic Lite key configuration */ 49/* Bootmagic Lite key configuration */
50// #define BOOTMAGIC_LITE_ROW 0 50// #define BOOTMAGIC_LITE_ROW 0
diff --git a/tmk_core/common/command.h b/tmk_core/common/command.h
index e25b97463..052e25184 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() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 38#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
39#endif 39#endif
40 40
41#ifndef MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS 41#ifndef MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
diff --git a/tmk_core/protocol/usb_hid/test/config.h b/tmk_core/protocol/usb_hid/test/config.h
index c2230fb57..a2403fe9c 100644
--- a/tmk_core/protocol/usb_hid/test/config.h
+++ b/tmk_core/protocol/usb_hid/test/config.h
@@ -35,6 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
35 35
36 36
37/* key combination for command */ 37/* key combination for command */
38#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT))) 38#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
39 39
40#endif 40#endif