Commit graph

13886 commits

Author SHA1 Message Date
QMK Bot
2d1a29b7d3 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:48:50 +00:00
J.Flanagan
35b329052c
[Keyboard] Add Viktus Styrka (#10982)
* Initial Styrka Commit

Initial commit of basic working firmware.

- has basic 6.25u spacebar and fullsize backspace support in default keymap
- has basic 6.25u spacebar and split backspace support in split_bs keymap
- beginning work for via keymap (not complete)

* Viktus Styrka Update 1

First edit update for Viktus Styrka

- Corrected LAYOUT macros
- Updated keymaps
- Updated info.json to match LAYOUT macros
- Added and updated VIA keymap
- Added and updated ALL keymap
- Removed unused features from config
- Added more detailed board info to main readme

* Update info.json

Update info.json - missing end }

* Update to files in initial commit

As requested, changes made to:

- styrka.c
- rules.mk
- split_bs/keymap.c
- all/keymap.c
- info.json
- config.h

* Update keyboards/viktus/styrka/rules.mk

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-25 10:48:12 -08:00
QMK Bot
d2f965b837 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:37:26 +00:00
Felix Jen
e8a65baf41
[Keyboard] Added Phantom Keyboard by Lucid (#10988)
* Added upcoming Phantom keyboard from Lucid

* syntax error

* updated layout name
2020-11-25 10:36:49 -08:00
QMK Bot
1180213509 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:27:53 +00:00
dsanchezseco
d82e002737
Added VIA keymap to punk75 keyboard (#10927)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-11-25 18:27:17 +00:00
QMK Bot
37a2387aad Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:25:30 +00:00
nopunin10did
c78ef391dc
Boardrun Classic & Bizarre layouts (replaces PR 10934) (#10990)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Rossman360 <rmontsinger@gmail.com>
Co-authored-by: Luke <golichowski.to@gmail.com>
2020-11-25 18:24:58 +00:00
QMK Bot
537291adde Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:09:50 +00:00
Sid Carter
1bf657be41
[Keymap] Updates - Unikorn/Curiosity/Prime_E/Ferris/Corne (#10925)
* update keymap for unikorn

* add new map

* update keymap

* update keymap

* update map

* update the current keymap

* update keymap so it accounts for mouse keys as well

* add extra control and shift, for when we need to use the other keys

* get me square and curly braces

* remove unused macros

* update these changes so far

* update ilpse keymap

* rmove a layer and simplify my layers a bit

* I think there's a working keymap now for the corne. let's leave this here.

* I thought maybe that helped? but who knows

* save changes made so far

* update madhatter keymap to match what I want

* switch to use lcmd for main alt

* update my curiosity keymap

* make curiosity via enabled

* add via keymap

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/primekb/prime_e/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* stick to enum

* add bootmagic stuff and update keymap

* switch to bootmagic lite

* fix typo

* cleanup for writing to LED

* consistency

* fix led pins

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* fix build issue

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

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

Co-authored-by: Khader Syed <khader.syed@aicure.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-25 10:09:15 -08:00
QMK Bot
71a49dfccb Merge remote-tracking branch 'origin/master' into develop 2020-11-25 18:05:36 +00:00
r-pufky
8897ab9b11
[Keymap] Add personal massdrop/ctrl:r-pufky keymap. (#10887)
* Add personal massdrop/ctrl:r-pufky keymap.

* Added personal keymap per: https://docs.qmk.fm/#/contributing?id=keymaps

* Update massdrop/ctrl:r-pufky per review.

* Trimmed config.h
* Remove rules.mk
* Add copyright header to keymap.c
* Rename README.md to readme.md

* Remove files/lines per review.

* Removed keyboard-layout-editor.com json layouts.
* Removed keymap_config line.
2020-11-25 10:05:01 -08:00
QMK Bot
b839674d83 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 17:14:32 +00:00
Thorben
50611bd814
[Keyboard] Fixes fox idb_60 keyboard (#10827)
* Fixed VIA keymap build warning on gcc 10.2.0, Fixed misleading LED function names, Fixed formatting

* Fix: Allow layer LED indicators to be overriden on the keymap level

* Implemented suggested change from led_set_kb callback to led_update_kb callback

* Apply suggestions from code review

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

* Update keyboards/idb/idb_60/idb_60.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-11-25 09:10:42 -08:00
QMK Bot
a69d684ce9 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 17:00:41 +00:00
bt66tech
86b0acbae0
[Keyboard] add bt66tech60 handwired (#10867)
* Add files via upload

add handwired bt66tech keyboard

* Update info.json

* Update rules.mk

* Update info.json

* Update config.h

change #define DESCRIPTION

* Update bt66tech60.c

remove #include "bt66tech.h"

* Update config.h

remove #define DESCRIPTION A handwired 60% keyboard.

* Update keymap.c

remove \ and 
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
    QMKBEST = SAFE_RANGE,
    QMKURL
};

* Update readme.md

fill description

* Update rules.mk

apply suggestion

* Update keymap.c

remove bool process_record_user(uint16_t keycode, keyrecord_t *record) .....

* Update keymap.c

remove enter inline 25

* Update readme.md

remove *

* Update bt66tech60.c

remove all and add #include "bt66tech60.h"

* Update keymap.c

* Update rules.mk

remove enter

* Update info.json

chenge LAYOUT to LAYOUT_60_ansi

* Update readme.md

* Update rules.mk

add LAYOUTS = 60_ansi

* Update rules.mk

when add LAYOUTS = 60_ansi the pullrequest check say error so i'm remove it

* Update rules.mk

add LAYOUTS = 60_ansi

* Update rules.mk
2020-11-25 09:00:03 -08:00
QMK Bot
cc63130756 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 16:58:44 +00:00
Matthew Dias
24a741649d
[Keyboard] Add minim keyboard (#10970)
* Create minim firmware

* Cleanup and add configurator support

* PR Checklist Items

* Delete keymap.c

* Apply suggestions from code review

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

Co-authored-by: Joel Challis <git@zvecr.com>
2020-11-25 08:57:58 -08:00
QMK Bot
745e6874b3 Merge remote-tracking branch 'origin/master' into develop 2020-11-25 16:53:43 +00:00
Felix Jen
0a9476bc2a
[Keyboard] Added BKS65 Bolsa Supply PCB (#10933)
* Copied B65 and updated matrix

* Updated Caps LED Pin

* Updated most of the FW

* Updated errant names from Bolsa65 copy

* Keymap updates

* Moved to config.h LED indicators. Tested on PCB for functionality
2020-11-25 08:53:06 -08:00
QMK Bot
f250c01bba Merge remote-tracking branch 'origin/master' into develop 2020-11-24 20:12:06 +00:00
Dan
3fadfb565d
add dcompact layout for minivan (#10951)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Dan Herrera <sonarius@shew.io>
2020-11-24 20:11:28 +00:00
QMK Bot
49b3aafdaf Merge remote-tracking branch 'origin/master' into develop 2020-11-24 13:46:54 +00:00
Max Bridgland
66b5c5eff2
Add M4cs Keymap for dekunukem/duckyPad (#10900)
* Add Keymap

* Fix Media Keys

* Add Keymap ASCII and Clean Up

* Add Readme

* Add GPL Headers, Clean Up Code Based on @drashna Suggestions

* Remove unnecessary include

* Add Layout for info.json and Readme.md

* Fix Layout for info.json

* Fix #endif Error

* Remove Tapping Term

* Add Default Keymap

* Add comments, fix readmes, clean up

* Fix README formatting

* Fix Timeout

* Fix I2C Rules

* Fix Comment Formatting, Multiline Breaks

* Add Sleep/Backlight Rules

* Clean Up README

* Clean Up Rules

* Fix Comments

* Add Pragmas

Co-authored-by: M4cs <mabridgland@protonmail.com>
Co-authored-by: Max <max@Maxs-MacBook-Pro.local>
2020-11-24 13:46:23 +00:00
QMK Bot
2b97c20837 Merge remote-tracking branch 'origin/master' into develop 2020-11-24 09:59:58 +00:00
nopunin10did
6e97a4c8b9
Railroad fix (#10935)
* Fix Railroad build issues

* Update keyboards/nopunin10did/railroad/rev0/rules.mk

* Update keyboards/nopunin10did/railroad/rev0/rev0.h

* Add extra copy of readme to the rev0 folder

* Update keyboards/nopunin10did/railroad/rev0/readme.md
2020-11-24 01:59:22 -08:00
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