From a0061d6de8e3723accdc24363aa9dddc6382213a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sat, 3 Nov 2018 23:13:06 +0100 Subject: [PATCH 1/2] Use consistent IS_COMMAND block in templates --- quantum/template/avr/config.h | 2 +- quantum/template/ps2avrgb/config.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h index e509ead4d7c4..a520603724c3 100644 --- a/quantum/template/avr/config.h +++ b/quantum/template/avr/config.h @@ -113,7 +113,7 @@ along with this program. If not, see . */ /* key combination for magic key command */ -/* defined by default. To change, uncomment and set to the combination you want */ +/* defined by default; to change, uncomment and set to the combination you want */ // #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) /* control how magic key switches layers */ diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h index ea14f79ca040..a05873c34b09 100644 --- a/quantum/template/ps2avrgb/config.h +++ b/quantum/template/ps2avrgb/config.h @@ -43,10 +43,8 @@ along with this program. If not, see . #define NO_UART 1 /* key combination for magic key command */ -/* defined by default. To change, uncomment and set to the combination you want */ -// #define IS_COMMAND() ( \ -// keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -// ) +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) /* Bootmagic Lite key configuration */ // #define BOOTMAGIC_LITE_ROW 0 From 11c51bbe98fec59ec8f0745f7289a7057df26e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sat, 3 Nov 2018 23:15:13 +0100 Subject: [PATCH 2/2] Remove unnecessary `#undef IS_COMMAND` directives --- keyboards/orthodox/keymaps/drashna/config.h | 5 +---- keyboards/s60_x/keymaps/ansi_qwertz/config.h | 3 +-- keyboards/whitefox/keymaps/konstantin/config.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index 09df12d9ed96..c7441c476b3a 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h @@ -33,10 +33,7 @@ along with this program. If not, see . #define EE_HANDS -/* key combination for command */ -#ifdef IS_COMMAND -#undef IS_COMMAND -#endif +/* key combination for magic key command */ #define IS_COMMAND() ( \ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \ ) diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/config.h b/keyboards/s60_x/keymaps/ansi_qwertz/config.h index 6c01d579f87d..bae759028d2a 100644 --- a/keyboards/s60_x/keymaps/ansi_qwertz/config.h +++ b/keyboards/s60_x/keymaps/ansi_qwertz/config.h @@ -6,9 +6,8 @@ // keymap needs oneshot functionality #undef NO_ACTION_ONESHOT -#undef IS_COMMAND #define IS_COMMAND() ( \ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -#endif \ No newline at end of file +#endif diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h index 39450d680268..f3961eeff3d9 100644 --- a/keyboards/whitefox/keymaps/konstantin/config.h +++ b/keyboards/whitefox/keymaps/konstantin/config.h @@ -13,5 +13,4 @@ #define TAPPING_TERM 200 #define TAPPING_TOGGLE 2 -#undef IS_COMMAND #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))