summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-311-1/+1
|\
| * [Keyboard] Disable console on Iris Rev5 (#14249)Drashna Jaelre2021-08-311-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-311-20/+24
|\|
| * emi20: remove dead space from Configurator layout (#14254)James Young2021-08-311-20/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-319-0/+419
|\|
| * [Keyboard] Add FJLabs KF87 PCB (#14179)Felix Jen2021-08-319-0/+419
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-311-22/+21
|\|
| * [Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji2021-08-311-22/+21
| |
* | handwired/symmetric70_proto use post_rules.mk (#14235)Takeshi ISHII2021-08-315-12/+2
| |
* | [Keyboard] Helix use `post_rules.mk` (#14216)Takeshi ISHII2021-08-3114-49/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Helix/pico use post_rules.mk insted of local_features.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 ``` * Helix/rev2 use post_rules.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 ```
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3111-29/+170
|\|
| * [Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225)Salicylic-acid32021-08-3011-29/+170
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-305-5/+170
|\|
| * [Keyboard] Add Iris Rev. 5 (#13934)Danny2021-08-305-5/+170
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-303-0/+583
|\|
| * [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)dogspace2021-08-303-0/+583
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3029-2/+1133
|\|
| * [Keyboard] Add OwLab Jelly Epoch (#14190)kb-elmo2021-08-3020-2/+907
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add slamz keyboard (#14188)Rifaa Subekti2021-08-309-0/+226
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-309-0/+375
|\|
| * [Keyboard] add maker keyboards alexa (#14165)Felix Jen2021-08-309-0/+375
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-0/+23
|\|
| * [Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr2021-08-301-0/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-302-1/+14
|\|
| * [Keyboard] Changed ProductID on basketweav keyboards (#14162)Vincent Vorholter2021-08-302-1/+14
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za>
* | Remove bin/qmk (#14231)Zach White2021-08-291-2/+2
|/ | | | | * Remove the bin/qmk script * remove bin/qmk from workflows
* Nyquist (#14202)peott-fr2021-08-291-21/+21
| | | | | | | | | * adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap.
* [Keyboard] Add Viktus SP Mini (#14069)J.Flanagan2021-08-299-0/+581
| | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Corrected layout for np24 by YMDK (#14096)Trent Hoh2021-08-292-11/+58
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keymap] My Prime E keymap (#14117)peott-fr2021-08-291-0/+97
|
* [Keyboard] Add kelownaRGB64 (#14141)Weirdo2021-08-299-0/+302
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-269-0/+237
|\
| * Add support for lazydesigners/cassette8 (#14145)jackytrabbit2021-08-269-0/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for lazydesigners/cassette8 Add support for lazydesigners/cassette8 * Update keyboards/lazydesigners/cassette8/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/cassette8/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2613-0/+418
|\|
| * New Keyboard - V4n4g0rth0n (#14152)jpuerto962021-08-2613-0/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * General: Initial commit for v4n4g0rth0n * Remove unecessary things| * General: Fix info.json * Finalize changes * Update keyboards/v4n4g0rth0n/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/v4n4g0rth0n/v1/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Update readme files (#14172)Joel Challis2021-08-2625-79/+74
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-261-1/+1
|\|
| * Skeletn87 - Fix RGB pin (#14170)kb-elmo2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again) * fix skeletn87 indicator LEDs * fix led pin for production PCB
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-259-0/+442
|\|
| * [keyboard] Add 0x3E (#14088)Charles2021-08-269-0/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 0x3E - default config * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review 2 Firmware size optimization Co-authored-by: Drashna Jaelre <drashna@live.com> * Rename files as per project guidelines + remove empty * Update link in readme.md Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-251-1/+1
|\|
| * [converter/a1200] Changing layout macro reference info.json (#14143)8bits4ever2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h * Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk * Create dummy * Add files via upload * Delete dummy * Update readme.md * Update info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-254-0/+317
|\|
| * [Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137)MechMaster482021-08-254-0/+317
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-241-9/+9
|\|
| * [Keyboard] Update Technik ortholinear RGB matrix points (#14124)Albert Y2021-08-241-9/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Fix merge artifacts (#14146)Joel Challis2021-08-245-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2411-0/+426
|\|
| * [Keyboard] Add yoichiro/lunakey_macro (#13849)Yoichiro Tanaka2021-08-2411-0/+426
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>