diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-06 23:59:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-06 23:59:56 -0700 |
commit | a03aa301def77c867ae6c6c840f7fc82b26d91d6 (patch) | |
tree | a6bc1e2ce769edfd3ce3e25c86ece48d1ca14853 /layouts/community | |
parent | 0bc9090b1f98038b2bf4f648618d6143dcd93c82 (diff) | |
download | qmk_firmware-a03aa301def77c867ae6c6c840f7fc82b26d91d6.tar.gz qmk_firmware-a03aa301def77c867ae6c6c840f7fc82b26d91d6.zip |
Remove Full Bootmagic (#13846)
* disambiguate Bootmagic rules in keymaps
The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic.
This commit edits the files to specify that full Bootmagic is intended.
* remove BOOTMAGIC_ENABLE=full setting
* unify commented BOOTMAGIC_ENABLE rules in keyboards
Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} +
```
* remove commented Bootmagic rules from keymap/user level
Command:
```
find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} +
```
* update keyboard BOOTMAGIC_ENABLE rule formatting
Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later).
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
```
* update keyboards' BOOTMAGIC_ENABLE settings
Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' +
```
* update keymap/user BOOTMAGIC_ENABLE settings
Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
```
* remove and replace inline comments in keyboards and keymap/user files
Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' +
```
* rename improperly named makefiles
Some files intended to be used as makefiles had improper names causing them to not be used as intended when building.
This commit corrects the filenames of the affected files.
* update renamed file with new rule formatting
* update QMK's template files
Updates QMK's `rules.mk` templates to use the new inline comment.
* update QMK Docs
- remove documentation of full Bootmagic
- update links to Bootmagic Lite doc
- add doc for Magic Keycodes
* rules.mk patch for coarse/ixora and coarse/vinta
Diffstat (limited to 'layouts/community')
20 files changed, 19 insertions, 19 deletions
diff --git a/layouts/community/ergodox/algernon/rules.mk b/layouts/community/ergodox/algernon/rules.mk index 1b4c0995f..e8972cf10 100644 --- a/layouts/community/ergodox/algernon/rules.mk +++ b/layouts/community/ergodox/algernon/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE=no | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | COMMAND_ENABLE=no | 2 | COMMAND_ENABLE=no |
3 | SLEEP_LED_ENABLE=no | 3 | SLEEP_LED_ENABLE=no |
4 | FORCE_NKRO ?= yes | 4 | FORCE_NKRO ?= yes |
diff --git a/layouts/community/ergodox/berfarah/rules.mk b/layouts/community/ergodox/berfarah/rules.mk index abd95b500..2ad163064 100644 --- a/layouts/community/ergodox/berfarah/rules.mk +++ b/layouts/community/ergodox/berfarah/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = no | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | COMMAND_ENABLE = no | 2 | COMMAND_ENABLE = no |
3 | SLEEP_LED_ENABLE = yes | 3 | SLEEP_LED_ENABLE = yes |
4 | FORCE_NKRO ?= yes | 4 | FORCE_NKRO ?= yes |
diff --git a/layouts/community/ergodox/bocaj/rules.mk b/layouts/community/ergodox/bocaj/rules.mk index c6a306fda..f7d387031 100644 --- a/layouts/community/ergodox/bocaj/rules.mk +++ b/layouts/community/ergodox/bocaj/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = full | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
2 | TAP_DANCE_ENABLE = no | 2 | TAP_DANCE_ENABLE = no |
3 | COMMAND_ENABLE = no # Commands for debug and configuration | 3 | COMMAND_ENABLE = no # Commands for debug and configuration |
4 | CONSOLE_ENABLE = yes | 4 | CONSOLE_ENABLE = yes |
diff --git a/layouts/community/ergodox/colemak_code_friendly/rules.mk b/layouts/community/ergodox/colemak_code_friendly/rules.mk index 2bff0c5cf..ee89b5486 100644 --- a/layouts/community/ergodox/colemak_code_friendly/rules.mk +++ b/layouts/community/ergodox/colemak_code_friendly/rules.mk | |||
@@ -1,5 +1,5 @@ | |||
1 | COMMAND_ENABLE = no | 1 | COMMAND_ENABLE = no |
2 | BOOTMAGIC_ENABLE = no | 2 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
3 | MOUSEKEY_ENABLE = no | 3 | MOUSEKEY_ENABLE = no |
4 | CONSOLE_ENABLE = no | 4 | CONSOLE_ENABLE = no |
5 | RGBLIGHT_ENABLE = no | 5 | RGBLIGHT_ENABLE = no |
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk index 31f4788fa..6a207c952 100644 --- a/layouts/community/ergodox/drashna/rules.mk +++ b/layouts/community/ergodox/drashna/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = lite | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
2 | TAP_DANCE_ENABLE = no | 2 | TAP_DANCE_ENABLE = no |
3 | COMMAND_ENABLE = no # Commands for debug and configuration | 3 | COMMAND_ENABLE = no # Commands for debug and configuration |
4 | CONSOLE_ENABLE = no | 4 | CONSOLE_ENABLE = no |
diff --git a/layouts/community/ergodox/dvorak_programmer/rules.mk b/layouts/community/ergodox/dvorak_programmer/rules.mk index 44d702209..a3ac8ed6f 100644 --- a/layouts/community/ergodox/dvorak_programmer/rules.mk +++ b/layouts/community/ergodox/dvorak_programmer/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE=no | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | COMMAND_ENABLE=no | 2 | COMMAND_ENABLE=no |
3 | SLEEP_LED_ENABLE=no | 3 | SLEEP_LED_ENABLE=no |
4 | FORCE_NKRO = yes | 4 | FORCE_NKRO = yes |
diff --git a/layouts/community/ergodox/kejadlen/rules.mk b/layouts/community/ergodox/kejadlen/rules.mk index 8e8684828..ceee16687 100644 --- a/layouts/community/ergodox/kejadlen/rules.mk +++ b/layouts/community/ergodox/kejadlen/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
4 | CONSOLE_ENABLE = no # Console for debug(+400) | 4 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/layouts/community/ergodox/supercoder/makefile.mk b/layouts/community/ergodox/supercoder/rules.mk index 41a195d9c..61b6dae84 100644 --- a/layouts/community/ergodox/supercoder/makefile.mk +++ b/layouts/community/ergodox/supercoder/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE=no | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | COMMAND_ENABLE=no | 2 | COMMAND_ENABLE=no |
3 | SLEEP_LED_ENABLE=no | 3 | SLEEP_LED_ENABLE=no |
4 | UNICODE_ENABLE=no | 4 | UNICODE_ENABLE=no |
diff --git a/layouts/community/ergodox/townk_osx/makefile.mk b/layouts/community/ergodox/townk_osx/rules.mk index c06021b9f..c06021b9f 100644 --- a/layouts/community/ergodox/townk_osx/makefile.mk +++ b/layouts/community/ergodox/townk_osx/rules.mk | |||
diff --git a/layouts/community/numpad_5x6/bjohnson/rules.mk b/layouts/community/numpad_5x6/bjohnson/rules.mk index d370da7f1..d85826165 100644 --- a/layouts/community/numpad_5x6/bjohnson/rules.mk +++ b/layouts/community/numpad_5x6/bjohnson/rules.mk | |||
@@ -2,4 +2,4 @@ AUDIO_ENABLE = no | |||
2 | RGBLIGHT_ENABLE = yes | 2 | RGBLIGHT_ENABLE = yes |
3 | BACKLIGHT_ENABLE = no | 3 | BACKLIGHT_ENABLE = no |
4 | NO_SECRETS = yes | 4 | NO_SECRETS = yes |
5 | BOOTMAGIC_ENABLE = lite | 5 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
diff --git a/layouts/community/numpad_5x6/drashna/rules.mk b/layouts/community/numpad_5x6/drashna/rules.mk index 0bdf97bae..6de3056dd 100644 --- a/layouts/community/numpad_5x6/drashna/rules.mk +++ b/layouts/community/numpad_5x6/drashna/rules.mk | |||
@@ -2,7 +2,7 @@ AUDIO_ENABLE = no | |||
2 | RGBLIGHT_ENABLE = yes | 2 | RGBLIGHT_ENABLE = yes |
3 | BACKLIGHT_ENABLE = no | 3 | BACKLIGHT_ENABLE = no |
4 | NO_SECRETS = yes | 4 | NO_SECRETS = yes |
5 | BOOTMAGIC_ENABLE = lite | 5 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
6 | INDICATOR_LIGHTS = no | 6 | INDICATOR_LIGHTS = no |
7 | RGBLIGHT_TWINKLE = yes | 7 | RGBLIGHT_TWINKLE = yes |
8 | MAKE_BOOTLOADER = yes | 8 | MAKE_BOOTLOADER = yes |
diff --git a/layouts/community/ortho_4x12/bocaj/rules.mk b/layouts/community/ortho_4x12/bocaj/rules.mk index 5c642e65c..58ff4d724 100644 --- a/layouts/community/ortho_4x12/bocaj/rules.mk +++ b/layouts/community/ortho_4x12/bocaj/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
4 | TAP_DANCE_ENABLE = no | 4 | TAP_DANCE_ENABLE = no |
diff --git a/layouts/community/ortho_4x12/brandonschlack/rules.mk b/layouts/community/ortho_4x12/brandonschlack/rules.mk index e36b073d2..d27ef6420 100644 --- a/layouts/community/ortho_4x12/brandonschlack/rules.mk +++ b/layouts/community/ortho_4x12/brandonschlack/rules.mk | |||
@@ -6,5 +6,5 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
6 | BACKLIGHT_ENABLE = no # No backlights installed | 6 | BACKLIGHT_ENABLE = no # No backlights installed |
7 | 7 | ||
8 | ifeq ($(strip $(KEYBOARD)), jnao) | 8 | ifeq ($(strip $(KEYBOARD)), jnao) |
9 | BOOTMAGIC_ENABLE = lite | 9 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
10 | endif | 10 | endif |
diff --git a/layouts/community/ortho_4x12/buswerks/rules.mk b/layouts/community/ortho_4x12/buswerks/rules.mk index 72f825732..d08db7130 100644 --- a/layouts/community/ortho_4x12/buswerks/rules.mk +++ b/layouts/community/ortho_4x12/buswerks/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) |
3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
4 | CONSOLE_ENABLE = no # Console for debug(+400) | 4 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk index e78d073ae..dc64fe63b 100644 --- a/layouts/community/ortho_4x12/drashna/rules.mk +++ b/layouts/community/ortho_4x12/drashna/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
4 | TAP_DANCE_ENABLE = no | 4 | TAP_DANCE_ENABLE = no |
diff --git a/layouts/community/ortho_4x12/junonum/rules.mk b/layouts/community/ortho_4x12/junonum/rules.mk index 9f5d7e986..72e6214d2 100644 --- a/layouts/community/ortho_4x12/junonum/rules.mk +++ b/layouts/community/ortho_4x12/junonum/rules.mk | |||
@@ -17,4 +17,4 @@ EXTRAKEY_ENABLE = yes # Audio control and System control | |||
17 | CONSOLE_ENABLE = no # Console for debug | 17 | CONSOLE_ENABLE = no # Console for debug |
18 | COMMAND_ENABLE = no # Commands for debug and configuration | 18 | COMMAND_ENABLE = no # Commands for debug and configuration |
19 | 19 | ||
20 | BOOTMAGIC_ENABLE = no # mainly to save space \ No newline at end of file | 20 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite \ No newline at end of file |
diff --git a/layouts/community/ortho_5x12/brandonschlack/rules.mk b/layouts/community/ortho_5x12/brandonschlack/rules.mk index dacfc28b2..0035209d3 100644 --- a/layouts/community/ortho_5x12/brandonschlack/rules.mk +++ b/layouts/community/ortho_5x12/brandonschlack/rules.mk | |||
@@ -6,5 +6,5 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
6 | BACKLIGHT_ENABLE = no # No backlights installed | 6 | BACKLIGHT_ENABLE = no # No backlights installed |
7 | 7 | ||
8 | ifeq ($(strip $(KEYBOARD)), jnao) | 8 | ifeq ($(strip $(KEYBOARD)), jnao) |
9 | BOOTMAGIC_ENABLE = lite | 9 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
10 | endif | 10 | endif |
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk index af68e04c0..0c2858e5e 100644 --- a/layouts/community/ortho_5x12/drashna/rules.mk +++ b/layouts/community/ortho_5x12/drashna/rules.mk | |||
@@ -1,4 +1,4 @@ | |||
1 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
4 | CONSOLE_ENABLE = no # Console for debug(+400) | 4 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/layouts/community/ortho_5x12/xyverz/rules.mk b/layouts/community/ortho_5x12/xyverz/rules.mk index c77748325..94b076ece 100644 --- a/layouts/community/ortho_5x12/xyverz/rules.mk +++ b/layouts/community/ortho_5x12/xyverz/rules.mk | |||
@@ -2,7 +2,7 @@ | |||
2 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
3 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
4 | # | 4 | # |
5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 5 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
6 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 6 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
7 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 7 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
8 | CONSOLE_ENABLE = no # Console for debug(+400) | 8 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk index cbb0b1c11..5abdda9a1 100644 --- a/layouts/community/split_3x6_3/drashna/rules.mk +++ b/layouts/community/split_3x6_3/drashna/rules.mk | |||
@@ -3,7 +3,7 @@ | |||
3 | # change to "no" to disable the options, or define them in the Makefile in | 3 | # change to "no" to disable the options, or define them in the Makefile in |
4 | # the appropriate keymap folder that will get included automatically | 4 | # the appropriate keymap folder that will get included automatically |
5 | # | 5 | # |
6 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 6 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
7 | MOUSEKEY_ENABLE = no # Mouse keys | 7 | MOUSEKEY_ENABLE = no # Mouse keys |
8 | EXTRAKEY_ENABLE = yes # Audio control and System control | 8 | EXTRAKEY_ENABLE = yes # Audio control and System control |
9 | CONSOLE_ENABLE = no # Console for debug | 9 | CONSOLE_ENABLE = no # Console for debug |