Commit Graph

7 Commits (8574bf20d35b21c7b44ba8550fa11b4d100fdbbd)

Author SHA1 Message Date
James Young 345f6dc4e6
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
2021-08-11 09:48:25 -07:00
James Young 3161f10b1f
Update USB Device strings for VIA identification (#13962) 2021-08-11 00:19:55 -07:00
James Young a03aa301de
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
2021-08-06 23:59:56 -07:00
Zach White 6368a5697d
Exclude more keyboards from CI (#11436)
* exclude all of handwired

* exclude more keyboards from CI
2021-01-13 08:12:28 -08:00
Zach White c0dcee96a8
Initial list of keyboards to exclude from CI (#11213) 2020-12-21 15:38:39 +01:00
QMK Bot 860deb774e format code according to conventions [skip ci] 2020-09-24 02:35:14 +00:00
gooberpsycho 30ffae2317
[Keyboard] add 3dp660 handwired (#10296)
* Create keymap.c

* Add files via upload

* Added files for handwired 3d printed clueboard 660

* create via layout files

* added layout files for via

* updated product ID to fix id conflicts

* change product ID to fix ID conflicts.

* fixed capitalization error that was causing issues

* fixed capitalization issues.

* fix syntax errors

* Fixed syntax errors (stray punctuation)

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* capitalization fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility Fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility changes

* upkeep, fixing typos

* Update keyboards/handwired/3dp660/config.h

Removed Description line

* Update keyboards/handwired/3dp660/rules.mk

correct bootloader

* Update keyboards/handwired/3dp660/3dp660.h

fix case sensitive typos

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

change tab indentation to space indentations.

* Update keyboards/handwired/3dp660/keymaps/via/keymap.c

change tab indentations to space indentations

* Delete 3dp660.json

This file was for VIA, and shouldn't be in this repo. I placed it here so I wouldn't misplace it in my filesystem. My apologies.

* Update info.json

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

more capitalization fixes

* Update keyboards/handwired/3dp660/readme.md

shortened imgur url

* Update keyboards/handwired/3dp660/rules.mk

remove extraneous comments

* Delete config.h

* Update keyboards/handwired/3dp660/rules.mk

* Update 3dp660.c

add license headers to all .c and .h files

* Update 3dp660.h

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keyboards/handwired/3dp660/readme.md

Add maintainer URL

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

remove extraneous default keymap layers

* Update keyboards/handwired/3dp660/keymaps/default/rules.mk

* Update rules.mk

Moved LTO to keyboard level.

* Update rules.mk

Moved LTO to keyboard level.

* Delete rules.mk

Made obsolete by LTO move to keyboard level.

* Update keyboards/handwired/3dp660/rules.mk

capitalization errors.

* Apply suggestions from code review

Housekeeping, changing code for readability.
2020-09-23 19:32:33 -07:00