summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-119-0/+333
|\
| * [keyboard] Add hotswap YMDK Wings (#14176)alittlepeace2021-09-119-0/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Update keyboards/ymdk/wingshs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete wingshs.json * Update keyboards/ymdk/wingshs/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ymdk/wingshs/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ymdk/wingshs/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-114-0/+410
|\|
| * [Keymap] Add john-ezra Kyria Keymap (#14338)john-ezra2021-09-114-0/+410
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-117-72/+1363
|\|
| * [Keyboard] Update rocketboard_16 with *most* of its final features (#12537)Seth2021-09-117-72/+1363
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1110-0/+411
|\|
| * [Keyboard] Add mokey63 (#14357)rhmokey2021-09-1010-0/+411
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1112-0/+481
|\|
| * [Keyboard] added KPs BM43 RGB board (#13888)Sebastian Laube2021-09-1012-0/+481
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1111-0/+505
|\|
| * [Keyboard] New PCB Canary60RGB from CanaryTeam (#14321)AnthonyNguyen1682021-09-1011-0/+505
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-113-18/+12
|\|
| * [Keyboard] owl8 bugfix (#14020)yfuku2021-09-103-18/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1116-11/+366
|\|
| * [Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499)AKiwi922021-09-1016-11/+366
| | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ash <ash@splitpixel.co.uk>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-114-0/+472
|\|
| * [Keymap] Add keymap for crkbd/rarick (#13240)rarick2021-09-104-0/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added new keymap for crkbd/rarick * Delete flash.sh Deleted rarick crkbd flashing script, as it will not be used by most users. * Applied feedback, and fixed build error caused by builder updates * Update keyboards/crkbd/keymaps/rarick/config.h Removed USE_MATRIX_I2C, no longer used. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1122-4/+924
|\|
| * [Keymap] moults31 userspace and keymaps (#12025)Zac Moulton2021-09-1022-4/+924
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1011-0/+340
|\|
| * [Keyboard] Add RS60 (#14073)Xelus222021-09-1011-0/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial rs60 * update * remove * Include rs60.h Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * List form readme. Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * add layout Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * 2021 update Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * sigprof suggested changes * Remove redundant define Co-authored-by: Ryan <fauxpark@gmail.com> * Fixup readme Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/xelus/rs60/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1036-36/+0
|\|
| * Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)Ryan2021-09-1036-36/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-10106-156/+154
|\|
| * Change USBasp and bootloadHID bootloaders to lowercase (#14354)Ryan2021-09-10107-158/+156
| |
* | Move non-assignment code to post_rules.mk (#14207)Zach White2021-09-0934-155/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 40percentclub/ut47: move non-assignment code to post_rules.mk * converter/palm_usb: move non-assignment code to post_rules.mk * converter/sun_usb: move non-assignment code to post_rules.mk * dm9records/ergoinu: move non-assignment code to post_rules.mk * ergotaco: move non-assignment code to post_rules.mk * handwired/symmetric70_proto: move non-assignment code to post_rules.mk * hhkb/ansi: move non-assignment code to post_rules.mk * hhkb/jp: move non-assignment code to post_rules.mk * lfkeyboards/lfk78: move non-assignment code to post_rules.mk * lfkeyboards/lfk87: move non-assignment code to post_rules.mk * lfkeyboards/lfkpad: move non-assignment code to post_rules.mk * lfkeyboards/mini1800: move non-assignment code to post_rules.mk * manta60: move non-assignment code to post_rules.mk * mschwingen/modelm: move non-assignment code to post_rules.mk * newgame40: move non-assignment code to post_rules.mk * numatreus: move non-assignment code to post_rules.mk * rgbkb/zen: move non-assignment code to post_rules.mk * rgbkb/zen/rev2: move non-assignment code to post_rules.mk * Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk" This reverts commit cffaf0075c3c9b2473a660ba4af8835a9162311b.
* | Fix number of elements in info.json does not match errors (#14213)Zach White2021-09-0911-489/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-10765-5233/+34
|\|
| * Remove bootloader listings from rules.mk (#14330)Ryan2021-09-10765-5233/+34
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1017-17/+0
|\|
| * Remove commented out BLUETOOTH_ENABLE rules (#14361)Ryan2021-09-1017-17/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-102-60/+60
|\|
| * Align rgb/led matrix docs with current behaviour (#14367)Joel Challis2021-09-102-60/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0911-0/+706
|\|
| * [Keyboard] Add custom pcb for Polaris (#14347)Uy Bui2021-09-0911-0/+706
| | | | | | | | | | | | | | | | | | | | | | * [Keyboard] pcb for Polaris * [Keyboard] pcb for Polaris: update layout * Update keyboards/wekey/polaris/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-091-17/+17
|\|
| * Fix CRLF in lyra/rev1 (#14360)Ryan2021-09-091-17/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0915-0/+540
|\|
| * [Keyboard] add lyra (#13977)Malevolti2021-09-0815-0/+540
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0913-0/+926
|\|
| * [Keyboard] Add Olly JF PCB (#14056)mechlovin2021-09-0813-0/+926
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-091-1/+6
|\|
| * Backport F_CPU/F_USB hack from system76 (#14286)Drashna Jaelre2021-09-081-1/+6
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-091-4/+4
|\|
| * [Keymap] Fix Maker Keyboards Alexa Keymap (#14355)Felix Jen2021-09-081-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-099-0/+423
|\|
| * [Keyboard] Add 61Key (#14259)Ethan Yates2021-09-089-0/+423
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-091-2/+2
|\|
| * `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (#14315)JayceFayne2021-09-081-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 19:29:39 +0000