zephyr
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
673 Commits 26 Branches 7 Tags 113 MiB
Commit Graph

178 Commits

Author SHA1 Message Date
Pete Johanson 9475188869
Merge pull request #162 from kurtis-lew/iris 
Update iris_right.overlay
 2020-09-04 23:35:55 -04:00
kurtis-lew 4ce42350e7 Update iris_right.overlay 2020-09-04 20:28:45 -07:00
CrossR 0ede549a13 Fix Sofle build, update Intro page. 2020-09-03 22:54:06 +01:00
Kurtis Lew 6e8f19028a
Added copyright header to iris.keymap 2020-09-02 07:22:39 -07:00
Kurtis Lew c2ffeb1cf4
Added Copyright Header to Kconfig.defconfig 2020-09-02 07:21:45 -07:00
kurtis-lew 081ae84d0e Added Iris Shield 2020-09-01 20:22:11 -07:00
CrossR ca0f2bb074 Add to setup. 2020-09-01 18:32:45 +01:00
CrossR 21875cde88 Merge remote-tracking branch 'upstream/main' into CrossR/Sofle 2020-09-01 18:27:40 +01:00
Pete Johanson ef3c96c2ac
Merge pull request #134 from chenkevinh/lily58-encoder 
Add Lily58 Left Encoder Support
 2020-08-29 21:25:02 -04:00
Kevin 1ffcbefd72 Added encoder to unified conf file 2020-08-29 18:12:12 -07:00
CrossR 6be07b5b24 Merge branch 'main' into CrossR/Sofle 2020-08-29 22:54:43 +01:00
Kevin 0331943855 Removed extra encoder config lines 2020-08-29 13:48:40 -07:00
Kevin 8b6e912d36 Reverted back to default keymap 2020-08-29 11:48:33 -07:00
Kevin 72232b4ec7 Fixed encoder config and added build_right script 2020-08-29 11:36:48 -07:00
Kevin 8b38193ec2 Removed status line 2020-08-28 23:33:29 -07:00
Kevin e616fc2c81 Added left encoder support 2020-08-28 20:36:43 -07:00
Kevin 6475009da9 Added encoder and changed BT unpair keys in overlays 2020-08-28 20:36:28 -07:00
Pete Johanson 86c3dac153
Merge pull request #131 from BrainWart/tests/native-posix-test-exploration 
Native posix integration testing
 2020-08-28 22:58:08 -04:00
Pete Johanson 14d09e7b07
Merge pull request #130 from tominabox1/shield_qaz 
[Keyboard] Add QAZ Shield
 2020-08-28 18:51:58 -04:00
tominabox1 887ba47cbe Add copyright header 2020-08-28 16:38:40 -05:00
Cody McGinnis f02fa01e9a fix(test): change the layout 2020-08-28 16:21:31 -04:00
tominabox1 cf003262e6 Remove RGB, Remove debug, Add Copyright and Licenses 2020-08-27 22:23:27 -05:00
tominabox1 ac3e4af1ce Add QAZ shield 2020-08-27 19:09:40 -05:00
jrhe 79f0ecf8b5
Correct number of rows in Lily58 shield 2020-08-28 01:02:50 +01:00
Richard Jones b8fbc3784d Not needed 2020-08-26 21:25:46 +01:00
Richard Jones 6ac1a324e0 Typo 2020-08-26 21:25:26 +01:00
Pete Johanson f4f265c57e
Merge pull request #122 from bmcgavin/romac 
New shield : RoMac 2.1
 2020-08-25 20:44:25 -04:00
Richard Jones 3affd45f0d Formatting 2020-08-23 20:08:00 +01:00
Richard Jones cafd5c1fe2 Oops comment format 2020-08-23 20:05:56 +01:00
Richard Jones 3ce9459365 Add license / copyright 2020-08-23 20:02:28 +01:00
Richard Jones 9b5af05f16 Make the shield name on-brand 2020-08-23 19:59:41 +01:00
Richard Jones 221535fdc1 refactor to remove SPI; no need for shared DTSI 2020-08-23 19:28:03 +01:00
CrossR 7abcae6949 Update License info. 2020-08-23 18:48:28 +01:00
Pete Johanson 6806cd2a55
Merge pull request #113 from megamind4089/dev/nrfmicro_charger 
Add KConfig for board battery charger
 2020-08-23 07:09:20 -04:00
Mega Mind bc023baa7d Incorporate comments - Change config name to nrfmicro specific 2020-08-23 12:59:39 +08:00
Richard Jones a0a4b8a2f5
Romac (#1) 
* New shield: romac 2.1
 2020-08-22 21:47:29 +01:00
CrossR c84516bfcf Fix PR issues. 2020-08-22 09:51:01 +01:00
Pete Johanson 760de7d3c6
Merge pull request #92 from Na-Cly/shields/splitreus62 
Add splitreus62 shield
 2020-08-21 22:37:50 -04:00
CrossR 796b2dddd9 Remove erroneous key. 2020-08-21 22:43:23 +01:00
Derek 39fd982367 Swap central back to left hand 2020-08-21 17:29:18 -04:00
CrossR d848034c81 Add keycodes properly. 2020-08-21 22:15:27 +01:00
CrossR 84761fc589 Merge branch 'main' into CrossR/Sofle 2020-08-21 22:03:52 +01:00
CrossR 5c29259fed Remove unpair combo config option. 2020-08-21 17:10:29 +01:00
CrossR d4e8312db6 Mute is a consumer keypress. 2020-08-21 17:08:43 +01:00
Derek 3b71c4311b Update Kconfig.defconfig 2020-08-20 17:27:41 -04:00
Derek 94c7d27f04 Updated files as per request 
Updated
 2020-08-20 15:13:51 -04:00
Mega Mind 7aea57328c Add KConfig for board battery charger 2020-08-21 03:12:06 +08:00
Mega Mind 4efce4223a Use correct macro for board 2020-08-20 18:59:41 +08:00
Pete Johanson a65b746a86 fix(bluetooth): Add unpair combo if DT node exists 2020-08-19 23:34:34 -04:00
Pete Johanson f2724ada38
Merge pull request #107 from epid/main 
Fixed arrows on default keymap
 2020-08-19 21:00:30 -04:00