Commit graph

679 commits

Author SHA1 Message Date
Nick
6b433fdefd Finish DZ60RGB board definition 2020-09-07 12:24:47 -05:00
Nick
fa40558f73 Merge commit '61b249666b13f7f356c0e77ee5eb500d672d7dce' into boards/dz60rgb 2020-09-07 12:22:18 -05:00
Pete Johanson
61b249666b
Merge pull request #163 from bmcgavin/non-split-template
Add RoMac / non-split template support
2020-09-06 13:02:50 -04:00
Richard Jones
01da54aadf
point setup.sh at upstream 2020-09-06 17:54:45 +01:00
Pete Johanson
ba07fd1879
Merge pull request #154 from chenkevinh/docs/encoders
Encoder documentation
2020-09-06 12:23:11 -04:00
Richard Jones
80034c0078 Add RoMac / non-split template support 2020-09-06 15:51:12 +01:00
Pete Johanson
e15fe2665a Merge branch 'main' of github.com:zmkfirmware/zmk into main 2020-09-04 23:59:01 -04:00
Pete Johanson
0559ec9013 fix(ci): Only run tests if app/{src,tests} changes 2020-09-04 23:58:31 -04:00
Pete Johanson
9475188869
Merge pull request #162 from kurtis-lew/iris
Update iris_right.overlay
2020-09-04 23:35:55 -04:00
Pete Johanson
94147bfc62
Merge pull request #156 from CrossR/CrossR/FixSofle
Fix Sofle build.
2020-09-04 23:31:54 -04:00
kurtis-lew
4ce42350e7 Update iris_right.overlay 2020-09-04 20:28:45 -07:00
CrossR
df422e0205 Revert changes to Intro page. 2020-09-04 20:47:21 +01:00
CrossR
89d604b74b Clarify low power mode wording. 2020-09-04 19:31:04 +01:00
CrossR
0ede549a13 Fix Sofle build, update Intro page. 2020-09-03 22:54:06 +01:00
Pete Johanson
e559cb2d71 Add hold-tap to sidebar. 2020-09-03 10:14:16 -04:00
Kevin
e904a098b3 Added keymap update to encoder docs 2020-09-02 21:12:22 -07:00
Pete Johanson
c8f95dbaa8
Merge pull request #155 from kurtis-lew/iris
Update setup.sh
2020-09-03 00:05:06 -04:00
Kurtis Lew
f738fd7a67
Update setup.sh 2020-09-02 20:57:42 -07:00
kurtis-lew
9b1fd1323f Update setup.sh 2020-09-02 20:53:14 -07:00
Kevin
5eb50d7b18 Fixed links 2020-09-02 18:36:35 -07:00
Kevin
2629aa354f Removed old dev encoder page 2020-09-02 18:28:00 -07:00
Kevin
6f74e61dd3 Added user and dev encoder docs 2020-09-02 18:25:46 -07:00
Kevin
5b493ef334 Merge branch 'main' into docs/encoders
Sync with upstream
2020-09-02 17:37:39 -07:00
Pete Johanson
d53a8e36ca
Merge pull request #151 from kurtis-lew/iris
Added Iris Shield
2020-09-02 14:07:01 -04:00
Pete Johanson
48a3729ffe
Merge pull request #146 from okke-formsma/hold-tap
Hold-Tap implementation
2020-09-02 13:55:26 -04:00
Okke Formsma
c9a82d71d0 fixes for feedback round 2 2020-09-02 16:41:39 +02: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
Okke Formsma
c5ca664411 some fixes based on feedback 2020-09-02 15:26:06 +02:00
Okke Formsma
f6a9c1ee57 rename tests 2020-09-02 15:10:46 +02:00
Kevin
068626d1a7 Some work on encoder docs 2020-09-01 21:12:09 -07:00
kurtis-lew
081ae84d0e Added Iris Shield 2020-09-01 20:22:11 -07:00
Pete Johanson
c80b0a754b
Merge pull request #118 from CrossR/CrossR/Sofle
Add Sofle Keyboard
2020-09-01 14:39:05 -04:00
Okke Formsma
29a23f0182 Add tap-hold docs, update mod-tap docs 2020-09-01 19:41:08 +02:00
Okke Formsma
c33931c72c Initial implementation of hold-tap 2020-09-01 19:41:08 +02: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
4202db5a01
Merge pull request #126 from BrainWart/fix-layer-release
Fix keys not releasing when layers change
2020-09-01 10:08:03 -04:00
Pete Johanson
b85ac13564
Merge pull request #145 from okke-formsma/stop-fatal-errors
stop on fatal errors
2020-09-01 10:04:17 -04:00
Pete Johanson
c6517737f7
Merge pull request #143 from kurtis-lew/patch-3
Update key-press.md
2020-09-01 10:00:46 -04:00
Pete Johanson
01db53b46a fix(kscan): Avoid sending duplicate kscan events. 2020-09-01 09:55:25 -04:00
Cody McGinnis
639a338c2d fix(core): track layer state with keypress 2020-09-01 09:49:21 -04:00
Okke Formsma
21fcab208e stop on fatal errors 2020-08-31 22:24:36 +02:00
Kurtis Lew
96fde77560
Update key-press.md
Specified keypress and consumer press pages
2020-08-30 20:12:53 -07:00
Pete Johanson
af6ddfb7e2
Merge pull request #135 from chenkevinh/docs-update
Documentation update
2020-08-30 00:38:31 -04:00
Kevin Chen
45b1756a70
Replaced \ with /
Co-authored-by: Pete Johanson <peter@peterjohanson.com>
2020-08-29 21:36:00 -07:00
Kevin
212dd91e29 PuTTY image fix 2020-08-29 21:27:03 -07:00
Kevin
06af711f57 Replaced png with jpg 2020-08-29 21:20:38 -07:00
Kevin
af23445aa0 COM image fix 2020-08-29 21:13:48 -07:00
Kevin
0e04596ef6 Renamed COM port image 2020-08-29 21:04:32 -07:00