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 /keyboards/mechmini | |
| 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 'keyboards/mechmini')
| -rw-r--r-- | keyboards/mechmini/v1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/mechmini/v2/keymaps/arkag/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/mechmini/v2/rules.mk | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechmini/v1/rules.mk index c1582d9c6..553fe954c 100644 --- a/keyboards/mechmini/v1/rules.mk +++ b/keyboards/mechmini/v1/rules.mk | |||
| @@ -12,7 +12,7 @@ MCU = atmega32a | |||
| 12 | BOOTLOADER = atmel-dfu | 12 | BOOTLOADER = atmel-dfu |
| 13 | 13 | ||
| 14 | # build options | 14 | # build options |
| 15 | BOOTMAGIC_ENABLE = full | 15 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 16 | MOUSEKEY_ENABLE = yes | 16 | MOUSEKEY_ENABLE = yes |
| 17 | EXTRAKEY_ENABLE = yes | 17 | EXTRAKEY_ENABLE = yes |
| 18 | CONSOLE_ENABLE = no | 18 | CONSOLE_ENABLE = no |
diff --git a/keyboards/mechmini/v2/keymaps/arkag/rules.mk b/keyboards/mechmini/v2/keymaps/arkag/rules.mk index c4ee1a7d7..cbc8b06e8 100644 --- a/keyboards/mechmini/v2/keymaps/arkag/rules.mk +++ b/keyboards/mechmini/v2/keymaps/arkag/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = lite | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 2 | MOUSEKEY_ENABLE = no | 2 | MOUSEKEY_ENABLE = no |
| 3 | STENO_ENABLE = no | 3 | STENO_ENABLE = no |
| 4 | EXTRAKEY_ENABLE = yes | 4 | EXTRAKEY_ENABLE = yes |
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk index 49a55db51..9f13f14c2 100755 --- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk +++ b/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = full # 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 | CONSOLE_ENABLE = yes # Console for debug(+400) | 4 | CONSOLE_ENABLE = yes # Console for debug(+400) |
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk index 9ea2eeee8..b07c796ff 100755 --- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk +++ b/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = full # 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 | CONSOLE_ENABLE = yes # Console for debug(+400) | 4 | CONSOLE_ENABLE = yes # Console for debug(+400) |
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk b/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk index cade68ac9..82f1f96f6 100644 --- a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk +++ b/keyboards/mechmini/v2/keymaps/spacebarracecar/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/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk index 1484e2dd0..49b4a2ab5 100755 --- a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk +++ b/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 2 | CONSOLE_ENABLE = no # Console for debug(+400) | 2 | CONSOLE_ENABLE = no # Console for debug(+400) |
| 3 | COMMAND_ENABLE = no # Commands for debug and configuration | 3 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 4 | SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 4 | SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechmini/v2/rules.mk index d585958de..ff282b33a 100755 --- a/keyboards/mechmini/v2/rules.mk +++ b/keyboards/mechmini/v2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # comment out to disable the options. | 15 | # comment out to disable the options. |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | 18 | MOUSEKEY_ENABLE = no # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
