Commit graph

13860 commits

Author SHA1 Message Date
QMK Bot
50b45128db Merge remote-tracking branch 'origin/master' into develop 2020-11-23 19:47:41 +00:00
mechlovin
429474d1c3
refactor adelais en ciel rev.2, mechlovin9 (#10930)
Co-authored-by: vuhopkep <boy9x0@gmail.com>
2020-11-23 19:47:01 +00:00
QMK Bot
b6bb2b86c7 Merge remote-tracking branch 'origin/master' into develop 2020-11-23 07:58:06 +00:00
Danilo de Klerk
6f9934c669
Add rules.mk for ddeklerk split_3x6_3 keymap (#11008)
* Add rules.mk

In order for the media controls to work, a rules.mk file was necessary.
2020-11-22 23:57:32 -08:00
QMK Bot
ddf1adea5e Merge remote-tracking branch 'origin/master' into develop 2020-11-22 21:25:45 +00:00
Yoichiro Tanaka
c84650a147
Add a new keyboard: yoichiro/lunakey_mini (#10958)
* Add a new keyboard: yoichiro/lunakey_mini

* Modify the VENDOR and PRODUCT IDs.

* Remove unnecessary EOL characters.

* Remove unnecessary modified characters.

* Update the layer definition more simple.

* Change the product name.

* Change the LAYOUT name (append `_split_3x6_4`) and change keys order in info.json file.
2020-11-22 21:25:17 +00:00
QMK Bot
7d0c713432 Merge remote-tracking branch 'origin/master' into develop 2020-11-22 21:22:26 +00:00
0z00
30afa1ccd3
[Keyboard] Add Wampus (#10991)
* Configure new keyboard zoo/wampus

* Apply suggestions from code review

Update LED pins to defined defaults

Co-authored-by: Joel Challis <git@zvecr.com>

* Apply suggestions from code review

- Remove unused layers from default.
- Remove chibios patch comment

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-22 21:21:51 +00:00
QMK Bot
866f853bff Merge remote-tracking branch 'origin/master' into develop 2020-11-22 21:13:12 +00:00
Joel Challis
b8443863c0
Remove references to ch-bootloader-jump.patch (#10998) 2020-11-22 21:12:30 +00:00
Zach White
ac3b7d79e0 Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py
2020-11-22 08:28:53 -08:00
Zach White
c731628946 identify the qmk-bot 2020-11-22 08:07:45 -08:00
Joel Challis
ca9edc5fe3
Fix failed develop updates within CI (#11001)
* Fix inverted logic

* skip locked instead of fail
2020-11-22 07:50:14 -08:00
Mateusz Urbanek
a952bf2d31
[Keyboard] Added Vagrant-10 keyboard (#10048)
* Initial commit for Vagrant-10

* Initial commit for Vagrant-10

* customized layout

* Fully working QMK config with default keymap

* Update info.json

* Update info.json

* Update readme.md

* prep

* fixed pull request issues

* Update keyboards/vagrant_10/keymaps/default/keymap.c

* Update keyboards/vagrant_10/keymaps/default/keymap.c

* Update keyboards/vagrant_10/vagrant_10.h

* Update keyboards/vagrant_10/vagrant_10.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/rules.mk

* Update keyboards/vagrant_10/readme.md

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/info.json

* Update keyboards/vagrant_10/info.json

* Update keyboards/vagrant_10/vagrant_10.h

* Update keyboards/vagrant_10/keymaps/default/keymap.c

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/readme.md

* Update keyboards/vagrant_10/config.h

* License header

* License header

* License header

* License header.

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/config.h

* Update keyboards/vagrant_10/vagrant_10.h
2020-11-21 23:42:58 -08:00
Zach White
44d1b2e717
push the API data for develop as well (#10852) 2020-11-21 20:06:33 +00:00
Zach White
8ddbb19df1
Rebase develop after a master push (#10812)
* rebase develop after a master push

* limit this to qmk/qmk_firmware

* change to a merge strategy

* GITHUB_TOKEN isn't needed

* check for .locked in develop

* break up into more steps
2020-11-21 11:48:13 -08:00
Joel Challis
95fd2ce81a
Refactor to use led config - Part 4 (#10967)
* Refactor to use led config

* Refactor to use led_update_kb
2020-11-21 19:11:50 +00:00
Joel Challis
23222625c2
Refactor to use led config - Part 5 (#10975)
* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
2020-11-21 19:11:24 +00:00
jonathan
4368611bfd
Add layout_all to xd96 (#10913)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-21 19:06:55 +00:00
Wilba
ccb15c2d29
[Keyboard] Added wilba.tech WT60-H1 (#10879)
* Added WT60-H1

* Update keyboards/wilba_tech/wt60_h1/info.json

* Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c

* Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c

* Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c

* Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c

* Update keyboards/wilba_tech/wt60_h1/rules.mk

* Update keyboards/wilba_tech/wt60_h1/wt60_h1.h
2020-11-20 01:42:34 -08:00
Matthew Dias
628d4a91b9
Add JNAO Via keymap (#9917)
* Add JNAO Via keymap

* Enable more layouts for via

* Apply suggestions from code review

* Remove extra layer

* Add license
2020-11-19 14:04:55 -08:00
X-Bows Tech
9454f98099
[Keyboard]Add X-Bows Nature Keyboard (#10869)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-19 19:32:57 +00:00
Luis Godinez
64572b5c4b
Add Nines by Ungodly Design (#10931)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2020-11-19 19:30:52 +00:00
Brandon Claveria
776d1adc76
add unsplit (#10892)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2020-11-19 19:29:43 +00:00
Luis Godinez
386cff8cf5
Add Launch Pad by Ungodly Design (#10952)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-11-19 19:28:53 +00:00
Drashna Jaelre
e7497b3fba
Add references for is_keyboard_left() (#10850)
* Add references for is_keyboard_left()

* Remove proto from bootmagic_lite.c
2020-11-18 16:50:32 -08:00
Drashna Jaelre
9e32e9be46
Add AT90USB support for serial.c (#10706)
* Expand list of supported controllers for serial.c

* Fix pin defines based on mtei's feedback

* Fix EICRx checks in soft_serial_target_init

* Fix copy-paste typo

* Add defines for EICRx
2020-11-18 16:49:44 -08:00
elijahblake
6dc2d5956f
[Keymap] add massdrop/alt:pregame (#8953)
Pulled some functionality from the endgame keymap for the Drop Ctrl.

* very shortened version of the Endgame keymap

* fixed pictures

* fixed link

* fixed link

* fix files

* add GREEN RGB

* fixed GREEN RGB

* not supposed to be in my fork...

* wasn't supposed to be in my fork.

* I have fixed the layer 0 RGB Settings; you can now apply layer using "COLOR" in the layout template.

* I've renamed to pregame, fixed several files

* added Underglow RGB layout, changed def
ault RGB color

* fixed the color of the default profile like i want it

* Added IRL Photo

* Update keymap.c

disabled debugging.

* Update keymap.c

* Update config.h

* Update README.md

* Update keymap.h

* Changed some settings on rules for clean up.

* Changed some settings on rules for clean up.

* fixed some errors, cleaned things up

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Fixed changes recommended by Fauxpark

* Added changes recommended by fauxpark

* trying to fix my repo

* Still trying to fix merge issues

* changed to lowercase

* Delete reading.md

* Trying to rebase my repo

* stuck in rebase loop trying to fix local files and update

* updating readme file
2020-11-18 15:54:53 -08:00
Drashna Jaelre
88a783a8a7
[Keyboard] PloopyCo update and fixes (#10936)
This is based on feedback talking with crop_octagon about the device.  Future trackballs will ship with ATMEL DFU for simplicity.  This also includes some fixes and optimizations based on code review and tinkering on my own devices.
2020-11-18 23:20:29 +01:00
Ari Madian
3aef2bef8f
Add basic OLED keymap for nullbitsco/nibble (#10912) 2020-11-18 21:33:49 +00:00
j-zero
078586b21a
Update one_shot_keys.md (#10917)
MOD_RSFT doesn't work. See: https://github.com/qmk/qmk_firmware/issues/10901
2020-11-18 21:31:21 +00:00
dsanchezseco
7bdc41b025
Changed personal keymap punk75:dsanchezseco (#10928)
added a dvorak layer with a numpad in the center
2020-11-18 21:29:35 +00:00
yonatanzunger
66d52d8cd2
Update the melody96:zunger keymap (#10888)
* Update the melody96/zunger layout to make typing Romance languages easier.

Move the combining accents to fn + (keys used by Mac OS for that purpose),
and move the fn key to be the one adjacent to the space bar, since one needs
to type combinations of that a lot more than one needs to type Greek letters
in normal use. (As determined by experiment)

Also clean up the comments.

Co-authored-by: Yonatan  Zunger <zunger@desiderata.lan>
2020-11-18 13:03:40 -08:00
MechMerlin
0f8b0d971f
VIA Support: E6V2 BMC editions (#10969)
* update readme with relevant PCB versioning

* Add VIA keymap to e6v2 LE BMC

* add via keymap

* Update keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-11-18 20:16:18 +00:00
gtips
3270cbeb46
[Keymap]Add and Update keymap for reviung34 (#10915) 2020-11-18 19:47:29 +00:00
Wilba
ad9674c5af
[Keyboard] Add wilba.tech WT80-G (#10878)
* Added WT80-G

* Fixed keyboard name in info.json
2020-11-18 11:45:44 -08:00
Wilba
e4aadf2c05
[Keyboard] Add wilba.tech WT65-G (#10877) 2020-11-18 11:35:55 -08:00
Nick Brassel
f63e3e12b9
Allow for certain code in the codebase assuming length of string. (#10974) 2020-11-19 05:54:01 +11:00
Nick Brassel
4ef4965b02
Fixup version.h writing when using SKIP_VERSION=yes (#10972) 2020-11-19 05:34:22 +11:00
Joel Challis
f00402a2f3
Refactor to use led config - Part 3 (#10966)
* Refactor to use led config

* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
2020-11-18 17:51:53 +00:00
stanrc85
e1e13c53ac
Add support for LAYOUT_alice to sneakbox pcb (#10914)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-11-18 17:47:45 +00:00
jackytrabbit
1512e07817
Add support for keyboard 'DimplePlus' (#10881)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-18 17:43:44 +00:00
pastapojken
ad5cbe5982
Added new keyboard - nack (#10940)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-18 16:56:59 +00:00
Jack
58f2e0439e
Add VIA Keymap for boardsource/microdox (#10932) 2020-11-17 19:23:27 +00:00
Joel Challis
ddcb1794fa
Refactor to use led config - Part 1 (#10905)
* Refactor to use led config

* Refactor to use led config

* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
2020-11-17 17:06:30 +00:00
Joel Challis
adfd34c451
Refactor to use led config - Part 2 (#10906)
* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
2020-11-17 17:06:23 +00:00
Leon Anavi
3c156e130b
[Keymap] ANAVI Macro Pad 8 fix kodi and default (#10727)
Improvements and bug fixes for the keymaps kodi and default for
ANAVI Macro Pad 8:

- Add space to the end of string "Active layer: " for better
  visibility on the mini I2C OLED display for both keymaps
- Replace "Main" with "Kodi" for the Kodi keymap
- Add comment with reference to Kodi documentation for the
  available shortcuts in this keymap

Signed-off-by: Leon Anavi <leon@anavi.org>
2020-11-16 21:35:23 -08:00
Salicylic-acid3
10782789be
[Keymap] Update for jisplit89 (#10859)
Some symbols were not as intended, so they were corrected.
2020-11-16 21:25:53 -08:00
Relocks
cf3b683232
[Keyboard] bm16s - Added Via Support (#10863)
* Added Via Support and Keymap

Via Specific Keymap for BM16s along with correction of the Vendor and Product ID.

* Made adjustments for PR 10863

Made adjustments based on feedback from Pull request 10853 for qmk master pull request

* Additional update for PR 10853

Same description as previous commit.

* Update .vscode/settings.json

Updating based on commit suggestion.

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-16 21:25:00 -08:00
bghull
a8967778d4
[Keymap] Add user keymaps to qmk master (#10870)
* Create user keymaps

* Prepare user keymaps for PR

Co-authored-by: bghull <35785950+BaneJammin@users.noreply.github.com>
2020-11-16 21:21:24 -08:00