kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1737 commits 18 branches 0 tags 93 MiB
Commit graph

1737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jamie Ding
59a2dc3f52 Merge branch 'petejohanson_behaviors/macros-take-two' into mercury_3x5+3_v2_dIsNone_withMacros 2022-03-22 03:44:26 +00:00
Jamie Ding
38e47f478a Merge branch 'behaviors/macros-take-two' of https://github.com/petejohanson/zmk into petejohanson_behaviors/macros-take-two 2022-03-22 03:43:46 +00:00
Peter Johanson
a2f7b0e3ba feat(docs): Document the macro behavior. 2022-03-22 03:25:13 +00:00
Jamie Ding
503f8ea237 Merge branch 'behaviors/macros-take-two' of https://github.com/petejohanson/zmk into petejohanson_behaviors/macros-take-two 2022-03-21 20:41:44 +00:00
Peter Johanson
20717b6c33 feat(docs): Document the macro behavior. 2022-03-21 11:43:37 -04:00
Peter Johanson
d627c39e4b feat(behaviors): Add macro support. 
* Fine grainted press/release/tap actions.
* TIming between actions can be controlled.
* Processed async, to avoid blocking.
 2022-03-21 11:43:33 -04:00
Jamie Ding
81d9c51744 wip 2022-03-20 01:13:46 +00:00
Jamie Ding
46954cc99f add readme to mercury test explaining run procedure 2022-03-19 23:07:24 +00:00
Jamie Ding
7557ce2fe2 overwrite native_posix.overlay to enable larger keymaps, and write tests pointing to mercury.keymap 2022-03-19 18:20:14 +00:00
Jamie Ding
425e347a0d wip, doesn't work, s/d/f keys don't emit on tap 2022-03-19 03:49:51 +00:00
Jamie Ding
6e9b745b0f Merge branch 'petejohanson_behaviors/macros-take-two' into mercury_3x5+3_v2_dIsNone_withMacros 2022-03-18 19:16:31 +00:00
Jamie Ding
e87736242a attempt to fix issue where D+S would combo into shift as expected, but then releasing S while keeping D held would NOT release the shift. This results in the bigram @2 occasionally being mistyped as @@. The attempted fix is to use D as @none, and S as a mod/tap positional instead of a layer/tap positional. This doesn't quite work because now S+D produces D instead of a pure shift 2022-03-18 18:51:21 +00:00
Peter Johanson
42e92e10d8 feat(docs): Document the macro behavior. 2022-03-17 04:06:56 +00:00
Peter Johanson
8d8ba7d9b3 feat(behaviors): Add macro support. 
* Fine grainted press/release/tap actions.
* TIming between actions can be controlled.
* Processed async, to avoid blocking.
 2022-03-16 20:56:42 -04:00
Jamie Ding
5097eeed12 fix menu combo position 2022-03-17 00:08:45 +00:00
Kurtis Lew
58c7c0ee0c
feat(docs): Add tap-dance to feature matrix 2022-03-16 11:06:55 -04:00
Kurtis Lew
32ebe2cfb5
feat(behaviors): Add Tap-Dance behavior 2022-03-16 01:08:42 -04:00
okke
ad5a12a7bc fix(behaviors): Fix bug in nested sticky keys 
If multiple sticky keys with quick release were nested, only the first one
was properly released. This fix makes sure all of them are released properly.

Fixes https://github.com/zmkfirmware/zmk/issues/1149
 2022-03-15 23:04:45 -04:00
Krzysztof Gutkowski
459972fddd fix(boards): Adjust matrix for BT60v1 to fix the broken right Shift key 
according to the diagram from the board creators, it should be RC(3,12)
instead of RC(3,13)
 2022-03-14 13:01:54 -05:00
Aaron Nunley
d6a2290d5e Added support for 2% Milk (Updated with metadata) 
Update app/boards/shields/two_percent_milk/two_percent_milk.overlay

Co-Authored-By: Nick Winans <nick@winans.codes>
 2022-03-14 01:26:24 -05:00
Carlos Filoteo
2b4d5dd7d9
feat(shields): Add elephant42 Shield Support (#1009) 
* Initial Elephant42 implementation

* Add underglow feature

* Fix keymap

* Copy corne defconfig for OLED and LED

* Fix matrix positions

* Add nice_nano_v2.overlay

* Usability improvements to keymap

* Update LED length

* Delete nice_nano v1 overlay

* Remove unused conf files

* Add copyright/license headers

* PR feedback

* Try fixing formatting again

* Minor format

* More missed tabs

* Format
 2022-03-14 00:51:55 -05:00
Nick Winans
a1a8c30f7f Remove deprecated key codes from bat43 keymap 2022-03-14 00:43:03 -05:00
dnaq
745338dc10 feat(shield): Add Bat43 shield 
See https://kbd.dailycraft.jp/bat43/ for details.
 2022-03-14 00:43:03 -05:00
Jamie Ding
cefb8dd70a formatting 2022-03-14 05:32:51 +00:00
Jamie Ding
d2fc4fc9c8 switch left and right bracket, move scroll lock, pause break, print screen and caps lock out of nav layer to allow left-hand shift combo to still work when nav layer is active 2022-03-14 05:28:28 +00:00
Jamie Ding
a6c1f41866 move caps lock combo to m+, 2022-03-14 03:40:09 +00:00
Jamie Ding
aba63a92d1 increase timeout for cross-hand, caps-lock combo 2022-03-14 02:53:38 +00:00
Jamie Ding
e9d496be93 tweak combo timeout to 37 2022-03-14 02:45:24 +00:00
Jamie Ding
dc5d908b63 add shift to num and func layers 2022-03-14 02:43:18 +00:00
Jamie Ding
3c0ae06c16 offload most of right pinky duty (except quote) 2022-03-14 02:03:05 +00:00
Jamie Ding
fb585d24d1 re-unite right/left hand combo timeouts, and fix position of right hand positiona layer tap 2022-03-14 01:30:08 +00:00
Jamie Ding
20123ee236 split combo timeouts to right/left hand 2022-03-14 01:21:09 +00:00
Jamie Ding
7cb5924e93 right hand k/l shift 2022-03-14 01:12:07 +00:00
Jamie Ding
e78de821e9 move grav from left hand to right hand 2022-03-14 00:53:44 +00:00
Jamie Ding
cc6d72905a add constant for combo timeout 2022-03-14 00:51:29 +00:00
Jamie Ding
7e26919f12 swap layer and shift combos 2022-03-14 00:49:51 +00:00
Jamie Ding
68bf8d06f9 make SYS combo 3 key instead of 4 2022-03-14 00:24:28 +00:00
Jamie Ding
dc4de1f3fd swap esc and tab combo, move tilde and grav to r/t 2022-03-14 00:22:39 +00:00
Jamie Ding
071bb2b263 num layer, move grav, tilde, and none-out <D> 2022-03-13 23:51:38 +00:00
Jamie Ding
6d4b012e93 fix bug, combo esc was 26 and 26 instead of 26 and 27 2022-03-13 23:44:41 +00:00
Jamie Ding
abc79a9535 fix bug where <j> <d> intending <shift> produced 'D' 2022-03-13 23:38:03 +00:00
Jamie Ding
2e8628b085 initial implementation 2022-03-13 23:36:47 +00:00
Jamie Ding
3e09f63975 Merge branch 'upstream_main' into mercury 2022-03-12 02:23:17 +00:00
Peter Johanson
37c830fb8a feat: Add blog post with Zephyr 3.0 prep. 2022-03-08 14:14:15 -05:00
Caleb Goates
594cc55e0c fix(docs): Update instructions to find settings reset firmware 2022-03-08 06:21:53 -05:00
Kurt
f1b5dc4081
fix(shields): Proper arrow comments in reference keymap 
swapped the up and down arrows to reflect the bindings
 2022-03-05 13:01:41 -05:00
Peter Johanson
1d5b48cb52 fix(shields): Add missing kyria_rev2.keymap 
Needed for setup.sh script, which assumes the shield ID name, not
the shield dir name for downloading.
 2022-02-20 16:24:55 +00:00
Peter Johanson
7b1b979461 fix(shields): Proper siblings for Kyria Rev2. 2022-02-20 16:11:50 +00:00
Peter Johanson
b54128331e feat(shields): Add Kyria Rev2 shield. 
* New matrix pin selections.
* New encoder pins.
 2022-02-19 23:48:06 -05:00
dependabot[bot]
5cc9b8f71a chore(deps): bump follow-redirects from 1.14.7 to 1.14.8 in /docs 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-19 23:42:39 -05:00