Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
20169 commits 2 branches 1 tag 294 MiB
Commit graph

20169 commits

This branch
This branch
All branches
Author SHA1 Message Date
fauxpark
93387f8941 Merge remote-tracking branch 'upstream/master' into develop 2021-09-09 16:54:39 +10:00
Ryan
d6dd2e0d51
 		Fix CRLF in lyra/rev1 (#14360) 2021-09-09 16:50:52 +10:00
QMK Bot
4e8f064c27 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 06:35:29 +00:00
Malevolti
4c88f76be8
 		[Keyboard] add lyra (#13977) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 23:34:32 -07:00
QMK Bot
9ce3d1a7d4 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 05:23:52 +00:00
mechlovin
82ee9bd475
 		[Keyboard] Add Olly JF PCB (#14056) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 22:23:26 -07:00
QMK Bot
ac4849df13 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 03:20:08 +00:00
Drashna Jaelre
6d43a5daf4
 		Backport F_CPU/F_USB hack from system76 (#14286) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 20:19:06 -07:00
QMK Bot
f03e78e888 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 02:45:20 +00:00
Felix Jen
cb4006c0b4
 		[Keymap] Fix Maker Keyboards Alexa Keymap (#14355) 2021-09-08 19:44:52 -07:00
QMK Bot
588a3afe40 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 02:14:37 +00:00
Ethan Yates
891ddd9a30
 		[Keyboard] Add 61Key (#14259) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 19:14:03 -07:00
QMK Bot
1837d98425 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 01:35:09 +00:00
JayceFayne
f3bef84dac
 		ST7565_TIMEOUT 0 and ST7565_DISABLE_TIMEOUT should behave the same (#14315) 2021-09-08 18:34:49 -07:00
JayceFayne
da81e5c7cd
 		OLED TIMEOUT 0 and OLED_DISABLE_TIMEOUT should behave the same (#14302) 2021-09-08 18:34:34 -07:00
QMK Bot
d961d8df83 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 01:11:20 +00:00
Drashna Jaelre
853e56d080
 		[Keyboard] Minor tweaks to Work Board layout (#14351) 2021-09-08 18:10:43 -07:00
QMK Bot
8fa2a7ea2a Merge remote-tracking branch 'origin/master' into develop 2021-09-09 00:28:34 +00:00
Ryan
9e77cdf4e6
 		Bugfix for Joystick and JSON schema (#14295) 2021-09-09 10:27:58 +10:00
QMK Bot
60c985ac8e Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:58:10 +00:00
rhmokey
3f2a030de6
 		[Keyboard] Add new Mokey keyboard (#14329) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 16:57:43 -07:00
QMK Bot
cab0d7955f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:55:47 +00:00
Gastón Jorquera
d510f6afa9
 		[Keymap] Add Gaston's Lily58 custom keymap (#14334) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
 2021-09-08 16:55:12 -07:00
QMK Bot
24000ef2e1 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:53:13 +00:00
Drashna Jaelre
4294aa0f1e
 		[Keyboard] Tractyl Manuform - configuration updates (#14314) 
* [Keyboard] Tractyl Manuform - configuration updates

* Update readmes

* Add more details

* Fix issues with encoder pins

* Additional fixes for pin config

* Fix up some comments
 2021-09-08 16:52:43 -07:00
QMK Bot
983580322f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:03:20 +00:00
Keenan Brock
8f8411a98a
 		[Keyboard] Add VIA keymap for the reviung39 (#14234) 2021-09-08 16:02:50 -07:00
QMK Bot
38afc7e4cc Merge remote-tracking branch 'origin/master' into develop 2021-09-08 22:44:49 +00:00
Joel Challis
2e0659f7fd
 		Fixes for recent i2c migrations (#14352) 2021-09-08 15:44:18 -07:00
Ryan
d977e5d3e9
 		Remove Arduino-style analogRead() (#14348) 2021-09-08 14:37:59 +01:00
QMK Bot
9b3e973aa2 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 07:35:06 +00:00
jackytrabbit
9c175f1801
 		[Keyboard] Update VIA support for lazydesigners/the40 (#14240) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2021-09-08 00:34:36 -07:00
QMK Bot
4164f4148b Merge remote-tracking branch 'origin/master' into develop 2021-09-08 06:54:03 +00:00
Gabriel Bustamante
541e101291
 		[Keymap] New keymap for bm40 (#14182) 2021-09-07 23:53:33 -07:00
QMK Bot
6482fb9911 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 04:07:40 +00:00
Rifaa Subekti
3ef01a3482
 		[Keyboard] add wang ergo (#14245) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-07 21:07:00 -07:00
QMK Bot
1498ecaa24 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 03:24:22 +00:00
James Young
1ebaec96e7
 		Sneakbox Ava tidy-up (#14298) 2021-09-07 20:23:45 -07:00
QMK Bot
456f7019de Merge remote-tracking branch 'origin/master' into develop 2021-09-08 03:02:25 +00:00
IFo Hancroft
267ffb9914
 		[Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342) 2021-09-07 20:01:58 -07:00
QMK Bot
4ba8305a5c Merge remote-tracking branch 'origin/master' into develop 2021-09-08 01:54:23 +00:00
Drashna Jaelre
0b8d6df390
 		[Keyboard] Fix issues with 3w6 rev2 matrix (#14346) 2021-09-08 02:53:55 +01:00
QMK Bot
f6b0484f0f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 01:23:43 +00:00
Joel Challis
60c5bd7b5e
 		handwired/dactyl - Refactor use of legacy i2c implementation (#14344) 2021-09-07 18:23:11 -07:00
QMK Bot
af19461a02 Merge remote-tracking branch 'origin/master' into develop 2021-09-07 15:35:32 +00:00
Joel Challis
04c0704b28
 		3w6 - Refactor use of AVR only I2C functions (#14339) 
* Refactor use of legacy i2c functions

* Align rev2

* Review fixes
 2021-09-07 16:35:13 +01:00
Joel Challis
e7a5c006d9
 		Refactor use of legacy i2c implementation (#14341) 2021-09-07 16:34:59 +01:00
QMK Bot
c669c43769 Merge remote-tracking branch 'origin/master' into develop 2021-09-07 15:33:58 +00:00
Joel Challis
2d6635214a
 		ergodone - Refactor use of legacy i2c implementation (#14340) 
* Refactor use of legacy i2c implementation

* copy-paste error
 2021-09-07 16:33:29 +01:00
QMK Bot
f98f23d6d6 Merge remote-tracking branch 'origin/master' into develop 2021-09-06 19:45:19 +00:00