X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fcommand.h;h=e7c7b0ea1d2296c692b440d849ecc46edffc7fd1;hb=fe6b8edd581c334a92a97c15faced95a12d5e882;hp=c38f2b9e809d19efe656a8fde299e64d955013fc;hpb=47c91fc7f75ae0a477e55b687aa0fc30da0a283c;p=qmk_firmware.git

diff --git a/tmk_core/common/command.h b/tmk_core/common/command.h
index c38f2b9e8..e7c7b0ea1 100644
--- a/tmk_core/common/command.h
+++ b/tmk_core/common/command.h
@@ -34,6 +34,9 @@ bool command_proc(uint8_t code);
 #define command_proc(code)      false
 #endif
 
+#ifndef IS_COMMAND
+#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+#endif
 
 #ifndef MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
 #define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
@@ -47,12 +50,12 @@ bool command_proc(uint8_t code);
 #define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
 #endif
 
-#ifndef MAGIC_KEY_HELP1
-#define MAGIC_KEY_HELP1          H
+#ifndef MAGIC_KEY_HELP
+#define MAGIC_KEY_HELP           H
 #endif
 
-#ifndef MAGIC_KEY_HELP2
-#define MAGIC_KEY_HELP2          SLASH
+#ifndef MAGIC_KEY_HELP_ALT
+#define MAGIC_KEY_HELP_ALT       SLASH
 #endif
 
 #ifndef MAGIC_KEY_DEBUG
@@ -83,18 +86,14 @@ bool command_proc(uint8_t code);
 #define MAGIC_KEY_CONSOLE        C
 #endif
 
-#ifndef MAGIC_KEY_LAYER0_ALT1
-#define MAGIC_KEY_LAYER0_ALT1    ESC
-#endif
-
-#ifndef MAGIC_KEY_LAYER0_ALT2
-#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-#endif
-
 #ifndef MAGIC_KEY_LAYER0
 #define MAGIC_KEY_LAYER0         0
 #endif
 
+#ifndef MAGIC_KEY_LAYER0_ALT
+#define MAGIC_KEY_LAYER0_ALT     GRAVE
+#endif
+
 #ifndef MAGIC_KEY_LAYER1
 #define MAGIC_KEY_LAYER1         1
 #endif
@@ -132,7 +131,11 @@ bool command_proc(uint8_t code);
 #endif
 
 #ifndef MAGIC_KEY_BOOTLOADER
-#define MAGIC_KEY_BOOTLOADER     PAUSE
+#define MAGIC_KEY_BOOTLOADER     B
+#endif
+
+#ifndef MAGIC_KEY_BOOTLOADER_ALT
+#define MAGIC_KEY_BOOTLOADER_ALT ESC
 #endif
 
 #ifndef MAGIC_KEY_LOCK
@@ -143,6 +146,10 @@ bool command_proc(uint8_t code);
 #define MAGIC_KEY_EEPROM         E
 #endif
 
+#ifndef MAGIC_KEY_EEPROM_CLEAR
+#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+#endif
+
 #ifndef MAGIC_KEY_NKRO
 #define MAGIC_KEY_NKRO           N
 #endif
@@ -152,5 +159,5 @@ bool command_proc(uint8_t code);
 
 #endif
 
-#define XMAGIC_KC(key) KC_##key
-#define MAGIC_KC(key) XMAGIC_KC(key)
+#define XMAGIC_KC(key)  KC_ ## key
+#define MAGIC_KC(key)   XMAGIC_KC(key)