summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Migrate RN42 to UART driver and refactor (#15492)Ryan2021-12-224-71/+135
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2122-21/+245
|\
| * [Keyboard] Add 4x4 and 5x5 40percentclub boards + Unique VIDs (#15465)devilzmods2021-12-2122-21/+245
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Use the PR title rather than parsing the commit message. (#15537)Nick Brassel2021-12-221-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-211-6/+6
|\|
| * zigotica userspace rows tweak: TAB in default STENAI layer, ESC in sym/fn ↵Sergi Meseguer2021-12-211-6/+6
| | | | | | | | layers (#15525)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-202-1/+15
|\|
| * [Keyboard] Add LAYOUT_alice support for Nasu (#15513)stanrc852021-12-202-1/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1928-0/+991
|\|
| * Add Superlyra keyboard + group with Lyra under new directory (#14955)Domanic Calleja2021-12-1928-0/+991
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1910-229/+169
|\|
| * MechBrewery MB65S Refactor (#15515)James Young2021-12-1910-229/+169
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1810-0/+250
|\|
| * [Keyboard] Add k34 keyboard (#15250)JP2021-12-1810-0/+250
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: jingpingw <jingpingw@twitter.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1825-0/+1363
|\|
| * [Keyboard] update new keyboard zoom65_lite (#15218)GG2021-12-1725-0/+1363
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1811-0/+364
|\|
| * [Keyboard] Add Borderland (#15501)KiwiKey2021-12-1711-0/+364
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1711-0/+382
|\|
| * [Keyboard] Nasu (#15468)yiancar2021-12-1711-0/+382
| | | | | | | | | | | | 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: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-171-8/+6
|\|
| * [Keyboard] Remove locking support for Sweep (#15494)Albert Y2021-12-161-8/+6
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-172-13/+3
|\|
| * [Keyboard] Remove locking support from Cradio (#15495)Albert Y2021-12-161-7/+3
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] Remove locking support for Macro3 (#15496)Albert Y2021-12-161-6/+0
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1624-0/+789
|\|
| * [Keyboard] Add WestM (#15459)WestM2021-12-1624-0/+789
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-161-1/+1
|\|
| * Fix inverted gt and lt send_string mapping in canadian multilingual (#15487)billybraga2021-12-161-1/+1
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Billy Braga <bbraga@progi.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-161-26/+4
|\|
| * [Keyboard] removed extra layout from jorne.h (#15491)joric2021-12-161-26/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1616-0/+722
|\|
| * [Keyboard] Add Jorne (#15461)joric2021-12-1616-0/+722
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added jorne-dev (kyria-based) * updated files * raw logo * removed font * Fix after rebase on master: #undef SH_TG * Fix LTO parameter name. * Fix OLED. * Add VIA Jorne layout. * readme.md * updated jorne readme * Add info.json * Update keyboards/jorne/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/jorne/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/jorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/jorne/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/jorne/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * PR changes (added GPL headers, moved oled_task_user) * info.jsoon: fix thumbs poositions, reorder keys. * fix info.json maintainer * fixed layouts * Sync config.h for VIA with default keymap. * added post_config (sets brightness to 120 or it hangs) * added SPLIT_LAYER_STATE_ENABLE/SPLIT_LED_STATE_ENABLE * Update keyboards/jorne/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/jorne/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/jorne/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/jorne/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/jorne/jorne.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/jorne/jorne.c Co-authored-by: Ryan <fauxpark@gmail.com> * fixed layout, removed unnecessary defines * vendor_id set to 0x4753 Co-authored-by: beta-tank <beta-tank@outlook.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-12-164-6/+6
|\|
| * Fix some wrong keycode macros in locale mapping files (#15488)Yoichiro Tanaka2021-12-164-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-152-4/+3
|\|
| * [Core] Fix Sensor driver code (#15484)Drashna Jaelre2021-12-152-4/+3
| |
* | Fix build failure for UT47 (#15483)Ryan2021-12-151-1/+1
| |
* | Migrate serial_uart usages to UART driver (#15479)Ryan2021-12-1563-393/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate Thermal Printer feature to UART driver * Migrate 40percentclub UT47 to UART driver * Migrate Centromere to UART driver * Migrate Chimera Ergo to UART driver * Migrate Chimera Let's Split to UART driver * Migrate Chimera Ortho to UART driver * Migrate Chimera Ortho Plus to UART driver * Migrate Comet46 to UART driver * Migrate Palm USB converter to UART driver * Migrate Sun USB converter to UART driver * Migrate Dichotomy to UART driver * Migrate Honeycomb to UART driver * Migrate Mitosis to UART driver * Migrate Redox W to UART driver * Migrate Uni660 to UART driver * Migrate Telophase to UART driver
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1545-187/+815
|\|
| * [Keymap] Unicode and Pointing Device and Autocorect for drashna keymaps (#15415)Drashna Jaelre2021-12-1445-187/+815
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-159-0/+412
|\|
| * [Keyboard] Adelie Firmware (#13265)Andrew Kannan2021-12-149-0/+412
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-151-1/+7
|\|
| * [Keyboard] Add Elite-C DFU bootloader commands for Sweep (#15449)Albert Y2021-12-141-1/+7
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1512-0/+358
|\|
| * [Keyboard] W1-AT addition (#15467)yiancar2021-12-1411-0/+346
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: yiancar <yiancar@gmail.com>
| * [Keyboard] Add swap hands support for Technik_O (#15477)Albert Y2021-12-141-0/+12
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-151-29/+22
|\|
| * [Keyboard] Fix Jot50 compilation errors (#15478)Drashna Jaelre2021-12-141-29/+22
| |