Commit graph

301 commits

Author SHA1 Message Date
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
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
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
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
jding
2d1500aa72 Keymap 3Nov2021 10:35 am 2021-11-05 19:12:38 +00:00
jding
2510ccd1a6 [Keymap 31Oct2021 4:40 pm] 2021-10-31 23:42:59 +00:00
jding
065e5d9093 Keymap: 31Oct2021 4:30 pm, move Menu/Application from hold/tap pos 38, to combo pos 37+38 2021-10-31 23:32:29 +00:00
jding
3bacad469e Merge branch 'upstream_main' into mercury 2021-10-27 22:56:51 +00:00
jding
1640b73b2e Keymap Version: Oct 13, 2021 5:37 pm 2021-10-14 00:45:38 +00:00
jding
e667a29eea // Keymap Version: Oct 13, 2021 4:30 pm 2021-10-13 23:33:03 +00:00
eyenseo
6f29453041 [squash] implement feedback 2021-10-13 09:51:02 -07:00
eyenseo
51298f1d22 Add ergodash 2021-10-13 09:51:02 -07:00
jding
f953ce9be6 Keymap Version: Oct 11, 2021 4:55 pm, remove Shift cmt from A due to gamer WASD input delay, and reduce tapping term on cmt from 300ms to 50ms 2021-10-12 00:05:00 +00:00
jding
abb85cc6d3 update to // Keymap Version: Sept 22, 2021, 3:05 pm 2021-10-08 19:59:02 +00:00
jding
4dbc7bbf62 Merge branch 'upstream_main' into mercury 2021-10-08 19:57:36 +00:00
Aleblazer
063b496c26
feat(boards): Add Zodiark shield 2021-10-03 23:47:23 -04:00
Brandon Xie
3b8244e466
feat(shields): Add Naked60BMP shield 2021-10-03 23:23:54 -04:00
Nick Winans
687e91ab18 feat(boards): Remove usage of pro_micro_a/d nodes 2021-09-25 23:09:21 -04:00
Peter Johanson
014e5ba93c refactor(boards): Remove leftover right split name 2021-09-26 01:21:49 +00:00
Nick Winans
478cf94374 refactor(boards): Remove "left" from split keyboard names 2021-09-25 21:17:24 -04:00
Nick Winans
36ced48e53 refactor(boards): Remove split right keyboard names 2021-09-25 21:17:24 -04:00
jding
4c5210b633 // Keymap Version: Sept 24, 2021, 10:10 am, reduce tapping term for menu/cmd 2021-09-24 17:36:40 +00:00
jding
8297d895b6 turn on deep sleep 2021-09-24 17:16:55 +00:00
Dom H
db4bbbf9eb fix(shield): Update URL in A. Dux metadata 2021-09-23 14:57:40 -04:00
Dom H
80b01c7265 refactor(shield): "Architeuthis Dux" to "A. Dux"
The shorter name is more user-friendly.
2021-09-23 14:57:40 -04:00
Dom H
0c15c2291e feat(shield): Add Architeuthis Dux shield 2021-09-23 14:57:40 -04:00
jmding@gmail.com
db12b119d1 update keymap Sept 21 2021 1:52 pm 2021-09-21 20:54:09 +00:00
jding
85982ee56e update keymap to Sept 21, 2021, 10:49 am 2021-09-21 13:31:19 -07:00
jmding@gmail.com
e4f0e917a4 update keymap to September 12, 2021, 6:48 pm 2021-09-13 02:08:02 +00:00
jmding@gmail.com
00b922551c tweak keymap whitespaces 2021-09-12 16:56:47 +00:00
jmding@gmail.com
489f99f518 update keymap to Sep-12-2021 9:49am 2021-09-12 16:53:51 +00:00
jmding@gmail.com
db5a4b952a Merge branch 'conditional_mod_tap' into mercury 2021-09-12 16:51:33 +00:00
Peter Johanson
39eb80562d feat(metadata): Add MakerDiary nRF52840 M.2 interconnect
* Add interconnect details.
* Add m60 and nrf52840_m2 metadata files.
2021-09-11 00:50:36 -04:00
Peter Johanson
2907704f9f refactor(shields): Add pro-micro shield metadata. 2021-09-11 00:50:36 -04:00
Peter Johanson
b52835ffbf feat: Add a few sample hardware metadata files. 2021-09-11 00:50:36 -04:00
Dom H
4a5454b0f9 fix(shields): Add note about Cradio pin arrangement 2021-09-08 15:12:58 -04:00
Devon Allie
f31ffd8acb
fix(shields): Clean up default corne keymap. 2021-08-02 19:12:11 -04:00