Age | Commit message (Collapse) | Author |
|
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
|
|
0) Built a Bastyl, gave away the ErgoDoxEZ
1) UNICODEMAP
2) Iris left is now Elite-C
3) New QMK flashing instructions
|
|
* 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
|
|
* Added german_gaming keymap for hidtech/bastyl
* Apply suggestions from code review
* Added missing brace
|
|
Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
|
|
* add bastyl
* no need to copy the folder anymore
* clean up according to PR rules
* remove via, fix disposition
* add reset button on right half
* Update readme.md
* Update keyboards/hidtech/bastyl/bastyl.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* move json, remove via files
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* add GPL to c and h files
* Update keyboards/hidtech/bastyl/info.json
Change order to match layout macro
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* serial define can be ommited, is used by default
* Corrected VENDOR_ID
Incorrect VENDOR_ID has been updated to the correct one.
Co-authored-by: Quentin <qlebastard@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
|
|
* add bastyl
* no need to copy the folder anymore
* clean up according to PR rules
* remove via, fix disposition
* add reset button on right half
* Update readme.md
* Update keyboards/hidtech/bastyl/bastyl.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* move json, remove via files
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/hidtech/bastyl/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* add GPL to c and h files
* Update keyboards/hidtech/bastyl/info.json
Change order to match layout macro
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hidtech/bastyl/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* serial define can be ommited, is used by default
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
|