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/melgeek | |
| 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/melgeek')
| -rw-r--r-- | keyboards/melgeek/mj61/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj61/rev2/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj63/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj63/rev2/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj64/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj64/rev2/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj64/rev3/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mj65/rev3/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/melgeek/mj6xy/rev3/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/melgeek/mojo68/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/mojo75/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/melgeek/z70ultra/rev1/rules.mk | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk index e7b3e77e4..f21cf4a4a 100644 --- a/keyboards/melgeek/mj61/rev1/rules.mk +++ b/keyboards/melgeek/mj61/rev1/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk index e7b3e77e4..f21cf4a4a 100644 --- a/keyboards/melgeek/mj61/rev2/rules.mk +++ b/keyboards/melgeek/mj61/rev2/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk index e77935576..8ad931b0e 100644 --- a/keyboards/melgeek/mj63/rev1/rules.mk +++ b/keyboards/melgeek/mj63/rev1/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk index e77935576..8ad931b0e 100644 --- a/keyboards/melgeek/mj63/rev2/rules.mk +++ b/keyboards/melgeek/mj63/rev2/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk index 0efb7fb8f..02b475124 100644 --- a/keyboards/melgeek/mj64/rev1/rules.mk +++ b/keyboards/melgeek/mj64/rev1/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk index 0efb7fb8f..02b475124 100644 --- a/keyboards/melgeek/mj64/rev2/rules.mk +++ b/keyboards/melgeek/mj64/rev2/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk index 0efb7fb8f..02b475124 100644 --- a/keyboards/melgeek/mj64/rev3/rules.mk +++ b/keyboards/melgeek/mj64/rev3/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 13a802355..043105a70 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mj6xy/rev3/rules.mk b/keyboards/melgeek/mj6xy/rev3/rules.mk index a58a76732..8fad60497 100755 --- a/keyboards/melgeek/mj6xy/rev3/rules.mk +++ b/keyboards/melgeek/mj6xy/rev3/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk index ec17a50b5..b2e76b3ad 100755 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ b/keyboards/melgeek/mojo68/rev1/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk index 9b3d6367f..c83a53529 100644 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ b/keyboards/melgeek/mojo75/rev1/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk index a80e42906..174a842af 100644 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ b/keyboards/melgeek/z70ultra/rev1/rules.mk | |||
| @@ -8,7 +8,7 @@ BOOTLOADER = stm32-dfu | |||
| 8 | # Build Options | 8 | # Build Options |
| 9 | # change yes to no to disable | 9 | # change yes to no to disable |
| 10 | # | 10 | # |
| 11 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 12 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
