drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Change Command keycode defaults to match corresponding Bootmagic codes (#5078)

Browse source 
* Change Command keycode defaults to match corresponding Bootmagic codes

* Make alternate magic key keycodes consistent

* Reflect changes from previous commit in tmk_core/common/command.c

* Remove unnecessary MAGIC_KEY_* definitions from keymaps compatible with these changes

* Swap E and BSPACE for MAGIC_KEY_EEPROM

* Add MAGIC_KEY_EEPROM_CLEAR instead of MAGIC_KEY_EEPROM_ALT

* Remove BOOTMAGIC_ENABLE checks around EECONFIG stuff

* Update Command descriptions
This commit is contained in:
Konstantin Đorđević 2019-02-18 07:23:32 +01:00 • committed by Drashna Jaelre
parent 4e2369693f
commit 5cb713148d
7 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tmk_core/common/command.h
View file

@ -50,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
@ -86,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
@ -135,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
@ -146,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
@ -155,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)