summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (#14302)JayceFayne2021-09-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-092-14/+14
|\|
| * [Keyboard] Minor tweaks to Work Board layout (#14351)Drashna Jaelre2021-09-082-14/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-093-13/+16
|\|
| * Bugfix for Joystick and JSON schema (#14295)Ryan2021-09-093-13/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-089-0/+295
|\|
| * [Keyboard] Add new Mokey keyboard (#14329)rhmokey2021-09-089-0/+295
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-0/+160
|\|
| * [Keymap] Add Gaston's Lily58 custom keymap (#14334)Gastón Jorquera2021-09-084-0/+160
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0811-118/+141
|\|
| * [Keyboard] Tractyl Manuform - configuration updates (#14314)Drashna Jaelre2021-09-0811-118/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Tractyl Manuform - configuration updates * Update readmes * Add more details * Fix issues with encoder pins * Additional fixes for pin config * Fix up some comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-082-0/+56
|\|
| * [Keyboard] Add VIA keymap for the reviung39 (#14234)Keenan Brock2021-09-082-0/+56
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-5/+6
|\|
| * Fixes for recent i2c migrations (#14352)Joel Challis2021-09-084-5/+6
| |
* | Remove Arduino-style `analogRead()` (#14348)Ryan2021-09-082-24/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-081-20/+20
|\|
| * [Keyboard] Update VIA support for lazydesigners/the40 (#14240)jackytrabbit2021-09-081-20/+20
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-0/+268
|\|
| * [Keymap] New keymap for bm40 (#14182)Gabriel Bustamante2021-09-074-0/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-089-0/+224
|\|
| * [Keyboard] add wang ergo (#14245)Rifaa Subekti2021-09-079-0/+224
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-085-15/+15
|\|
| * Sneakbox Ava tidy-up (#14298)James Young2021-09-075-15/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-0/+203
|\|
| * [Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342)IFo Hancroft2021-09-074-0/+203
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-081-11/+10
|\|
| * [Keyboard] Fix issues with 3w6 rev2 matrix (#14346)Drashna Jaelre2021-09-081-11/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-086-442/+52
|\|
| * handwired/dactyl - Refactor use of legacy i2c implementation (#14344)Joel Challis2021-09-076-442/+52
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-078-526/+89
|\|
| * 3w6 - Refactor use of AVR only I2C functions (#14339)Joel Challis2021-09-072-105/+64
| | | | | | | | | | | | | | * Refactor use of legacy i2c functions * Align rev2 * Review fixes
| * Refactor use of legacy i2c implementation (#14341)Joel Challis2021-09-076-421/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-074-417/+15
|\|