Commit graph

426 commits

Author SHA1 Message Date
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
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
Lucas Uyezu
4a1254bc27 Add support for Knob Goblin shield 2022-02-03 12:02:45 -06:00
Temur Beissov
c74ae45e17
Lotus58 (#1090)
* lotus58 shield added

* lotus58 default keymap

* lotus58 keymap legend update

* Lotus58 keymap fix

* lotus58 keymap update

* lotus58 kb name fixed

* lotus58 keymap update
PR fix
2022-01-31 13:02:19 -06:00
Sam Mohr
4c317e0feb
Add support for the Clog (#1092)
* Add support for the Clog

* format DTSI definition

* add a default keymap

* update copyright year, reduce conf to minimum
2022-01-30 14:55:22 -06:00
iangus
4039a50ec3
Add Contra shield (#633)
* Add Contra Shield (#1)

* Add bluetooth control layer to contra keymap (#2)

* fix contra keymap issues

* add bluetooth control layer

* clean up contra files

* add contra.conf file

* add missing bracket for default_layer

* update copyright year to 2021

* add contra metadata file

* refactor pro micro overlay for new syntax
2022-01-30 13:48:35 -06:00
David Fiander
970e63bec6
fix(boards): Properly use dfu-util to flash DZ60 2022-01-12 21:36:08 -05:00
zhiayang
d29236141e
fix(boards): Proper active high and init delay for Mikoto ext-power 2022-01-11 16:07:30 -05:00
Jamie Ding
e4aad83443 [Keymap 3Jan2022 21:03] reorder Win/Apl, so that Win is default 2022-01-04 05:18:25 +00:00
Jamie Ding
cd53e8aa79 Merge branch 'upstream_main' into mercury 2022-01-04 04:57:30 +00:00
Jamie Ding
14187a5f3c increase broadcast power 2022-01-04 04:54:26 +00:00
Midge 't Hoen
e0620f1a2d Bump init delay to 50ms for nico-nano 2022-01-03 14:39:42 -06:00
Alexander Krikun
7b023affbd
Add support for the Jiran (#1048)
* initial files to get stuff working

* Keymap by Ladniy

* Format update to new standards

* keymap update

* header

* Fixed transform, removed left and right .conf files

* Apply suggestions from code review

Formatting

Co-authored-by: Nick Winans <nick@winans.codes>

Co-authored-by: Nick Winans <nick@winans.codes>
2021-12-14 11:32:59 -06:00
Peter Johanson
af98a3fd6e fix(shields): Don't enable SSD1306 automatically.
* Fix Murphpad conditional to ensure SSD1306 driver isn't
  enabled whenever `ZMK_DISPLAY` is enabled.
2021-12-13 17:06:46 -05:00
Kyle McCreery
569a2ee2cc
[New Shield] Murphpad (#806)
* initial commit

* initial commit

* Encode, OLED, and RGB Nice Nano support added as well as refining default keymap.

* tweaking keymap

* Prepared murphpad for PR. Includes adding support for second encoder, OLED, and underglow RGB

* Enabled OLED by default.

* removed naked60 config files

* Per PR feedback from ZMK maintainers, added hardware metadata file and renamed Pro Micro pins.

* removed tabs from keymap and replaced with normal spaces

* Update app/boards/shields/murphpad/murphpad.keymap

Co-authored-by: Nick Winans <nick@winans.codes>

* Update app/boards/shields/murphpad/murphpad.zmk.yml

Co-authored-by: Nick Winans <nick@winans.codes>

* Update app/boards/shields/murphpad/murphpad.zmk.yml

Co-authored-by: Nick Winans <nick@winans.codes>

Co-authored-by: honorless <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Nick Winans <nick@winans.codes>
2021-12-13 14:41:35 -06:00
Felix Sargent
df1ae494c7
Add boardsource5x12 (#1027)
* Initial commit of boardsource5x12

* Added copyright/license header

* Update app/boards/shields/boardsource5x12/Kconfig.defconfig

Co-authored-by: Pete Johanson <peter@peterjohanson.com>

* Update app/boards/shields/boardsource5x12/boardsource5x12.overlay

Co-authored-by: Pete Johanson <peter@peterjohanson.com>

* Update app/boards/shields/boardsource5x12/Kconfig.shield

Co-authored-by: Pete Johanson <peter@peterjohanson.com>

* Update app/boards/shields/boardsource5x12/boardsource5x12.keymap

Co-authored-by: Pete Johanson <peter@peterjohanson.com>

* Swapping keymap for what used in Naked60 as it's another 60 key board, so it keeps it consistent.

* Update app/boards/shields/boardsource5x12/boardsource5x12.keymap

Co-authored-by: Nick Winans <nick@winans.codes>

* renamed layers in boardsource5-12

Co-authored-by: Pete Johanson <peter@peterjohanson.com>
Co-authored-by: Nick Winans <nick@winans.codes>
2021-12-13 14:24:21 -06:00
Ryan Butler
eca051efa0
Add support for keeb.io fourier split keyboard (#1056)
* Add support for keeb.io fourier

* Update app/boards/shields/fourier/fourier_right.overlay

Co-authored-by: Nick Winans <nick@winans.codes>

* Update app/boards/shields/fourier/fourier_left.overlay

Co-authored-by: Nick Winans <nick@winans.codes>

* Convert spaces to tabs in .dtsi

Co-authored-by: Nick Winans <nick@winans.codes>
2021-12-13 13:41:52 -06:00
Sam Mohr
b23934cf94
feat(shields): Add Osprette 2021-12-10 13:20:52 -05:00
Kyle McCreery
a8c7cf4f19
feat(boards): Add S40NC board definition (#1021)
* initial commit

* initial commit

* Encode, OLED, and RGB Nice Nano support added as well as refining default keymap.

* tweaking keymap

* Prepared murphpad for PR. Includes adding support for second encoder, OLED, and underglow RGB

* Enabled OLED by default.

* Initial commit with settings updated to match schematic.

* Removing test directories.

* removed naked60 config files

* Fixed dogbone definitions to be full working for murphpad.

* Preparing S40NC for PR

* Removed the murphpad test files that were not supposed to be a part of this PR.

* Changing licensing to be from The ZMK Contributors.

* Changed the licensing in the keymap file to be from The ZMK Contributors

* Update s40nc.keymap
2021-12-02 17:21:35 -06:00
toddmok
9148ffd05d
feat(shields) Add Redox Shield Support (#1002)
* Add redox shield support

* typo

* Pull request fixes

* requested changes

add underglow, add copyright, remove display

* remove because of no display

* comment fix

* bt clear
2021-12-02 12:51:27 -06:00
ReFil
b877410379 fix(boards): BT60 Formatting tweaks 2021-11-30 15:33:12 -06:00
ReFil
99c5a8ee6f feat(boards): Add BT60 Boards 2021-11-30 15:33:12 -06:00
Josh Johnson
66f90dae3a
feat(shield) Add Chalice support (#1022)
* add chalice

* add split bs transform

* Update app/boards/shields/chalice/chalice.zmk.yml

Co-authored-by: Nick Winans <nick@winans.codes>

Co-authored-by: Nick Winans <nick@winans.codes>
2021-11-29 11:39:46 -06:00
Nick Winans
0b44321613 fix(shields): Fix typo on Quefrency .zmk.yml 2021-11-29 00:52:57 -05:00
jding
90039e3606 remove unnecessary changes that were carry-over from conditional hold tap 2021-11-11 22:38:49 +00:00
jding
efbff6fbdc [Keymap 11Nov2021 10:25] migrate from conditional hold tap to positional hold tap 2021-11-11 18:31:50 +00:00
jding
4cb4a4632e Merge branch 'upstream_main' into mercury (positional hold-tap and tap-unless-interrupted) 2021-11-11 18:31:18 +00:00
jding
a8783b6c22 [Keymap 6Nov2021 16:20] and add nice_nano_v2 recipe to readme 2021-11-11 18:12:18 +00:00
Viet (Drake) Tran
c412fad40d
fix(shields): Fix some keycodes in reviung41 keymap
Notice some keycodes are not matched with the expected keys.
2021-11-09 10:26:21 -05:00