pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1287 commits 1 branch 0 tags 16 MiB
Commit graph

312 commits

Author SHA1 Message Date
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
Jared Giles
6da6d7397f Fixed arrows on default keymap 2020-08-20 00:41:31 +01:00
CrossR
0d7bf03158 Fix BT unpair combo. 2020-08-19 21:52:31 +01:00
Pete Johanson
506c3b031e refactor(boards): Rename to bluemicro840_v1. 2020-08-19 16:35:18 -04:00
Pete Johanson
2a0e35c11f
Merge pull request #101 from okke-formsma/nrfmicro 
nrfmicro support
 2020-08-19 16:05:51 -04:00
CrossR
f8a635aaa0 Merge remote-tracking branch 'upstream/main' into CrossR/Sofle 2020-08-19 20:53:40 +01:00
CrossR
dcd36f12e0 Add BT clear bind. 
Should check the positions are correct.
 2020-08-19 20:53:22 +01:00
CrossR
aa187a54d4 Fix keymap. 2020-08-19 20:18:27 +01:00
Okke Formsma
93b1e0ac44 Add nrfmicro 1.1, 1.1 flipped and 1.3 boards. 2020-08-19 21:02:21 +02:00
Jared Giles
4085145b85 Working on corne default keymap 2020-08-19 18:37:47 +01:00
Nick
cab34d835f fix(board): Fix status LED on BlueMicro 2020-08-18 23:28:34 -05:00
Nick
674c230dbb fix(board): Cleanup nice!nano DT 2020-08-18 23:28:06 -05:00
Pete Johanson
307e2b3e63 fix(shields): OLED fixes for Corne, add anchors. 2020-08-18 23:24:53 -04:00
Pete Johanson
3c4a9686f8 fix(boards): Proper last col transform for Corne. 2020-08-18 21:56:22 -04:00
Pete Johanson
0d3cfa8596
Merge pull request #99 from petejohanson/core/bluetooth-unpair-magic-combo 
Add magic combo for unpairing BT devices on start.
 2020-08-18 19:21:43 -04:00
Pete Johanson
59f85c93cd fix(boards): Remove dup uart0 overrides for nano 2020-08-18 16:33:24 -04:00
Pete Johanson
4402e4fbc7 feeature(bt): Add "unpair combo" on startup. 
* Especially for splits, we need the ability to
  unpair all paired devices as  sledgehammer
  if we need to "reset things", and doing so via
  keymaps isn't suitable.
* Allows shields to define a collection of key
  positions that if all held 2 seconds after
  startup, will unpair all existing pairs for the
  device.
 2020-08-18 13:17:10 -04:00
Pete Johanson
3f1dfbaad1
Merge pull request #91 from Na-Cly/boards/bluemicro52840_v1 
Add bluemicro support
 2020-08-16 22:32:04 -04:00
Pete Johanson
8b4d2b6093 Add DCDC mode config. 2020-08-16 21:33:01 -04:00
Pete Johanson
abe40f8ef5 Various fixes. 2020-08-16 21:30:45 -04:00
Pete Johanson
47b219cca5 Remove duplicate uart0 node. 2020-08-16 21:27:37 -04:00
CrossR
eff6934066 Update pins. 2020-08-16 19:15:47 +01:00
Derek
6ef2102af9 Update board.cmake 2020-08-16 08:48:34 -04:00
Derek
75f4adb101 Update arduino_pro_micro_pins.dtsi 2020-08-16 08:46:16 -04:00
CrossR
892394d9e6 Update to include missing encoder config. 2020-08-16 12:44:18 +01:00
CrossR
e593e971ec Merge branch 'main' into CrossR/Sofle 2020-08-16 12:25:47 +01:00
Pete Johanson
94549b4a07
Merge pull request #89 from Nicell/underglow/fix-configs 
Add missing configuration values for RGB underglow
 2020-08-15 21:17:14 -04:00
Derek
caecce62b7 Drop OLED support. 2020-08-15 16:32:14 -04:00
Derek
ba136eb9ee
Update app/boards/shields/splitreus62/splitreus62_left.overlay 
Co-authored-by: Nick Winans <nick@winans.codes>
 2020-08-15 16:22:00 -04:00
Derek
1fa993fca2
Update app/boards/shields/splitreus62/splitreus62_right.overlay 
Co-authored-by: Nick Winans <nick@winans.codes>
 2020-08-15 16:21:54 -04:00
Derek
bb5eb51df7 Updated comment and removed display flag 2020-08-15 16:11:18 -04:00
Derek
3e264e46d4 Add splitreus62 shield 2020-08-15 16:01:35 -04:00
Derek
dd165c6829 Corrected pins for scl-pin and sda-pin 2020-08-15 15:53:31 -04:00
Derek
9dd8217cd4 Add bluemicro support 2020-08-15 15:32:36 -04:00
Pete Johanson
4acfa8d7ef Add DCDC setting for nano. 2020-08-14 23:26:03 -04:00
Nick
a03b3ab68c Fix grammar 2020-08-14 21:33:33 -05:00
Nick
aa4ae90fb7 Add missing configuration values for RGB underglow 2020-08-14 21:31:18 -05:00
CrossR
45ddd4c2ae Add very basic, untested, Sofle configuration. 2020-08-11 23:39:58 +01:00
Pete Johanson
78059bbbdb Fix up some incorrect license headers. 2020-08-11 14:49:43 -04:00
Pete Johanson
bc6b11eb02
Merge pull request #78 from Nicell/docs/rgb 
Add RGB documentation
 2020-08-10 13:46:46 -04:00
Pete Johanson
030f0dbd07 Tweak note about per-key RGB. 2020-08-10 12:51:01 -04:00
Pete Johanson
aebeb7a153 Updated config note about underglow. 2020-08-10 12:36:12 -04:00
Pete Johanson
be57b10c56 Initial Corne shield definition. 
* Also include a build for Clueboard California macropad.
 2020-08-10 11:30:24 -04:00
Nick
8d3ac00f31 Add missing space to comment 2020-08-08 19:02:54 -05:00
Nick
d901a0061d Add underglow feature docs + DT fixes 2020-08-08 19:02:00 -05:00
Pete Johanson
726fb4b76f Better default configs. 2020-08-07 15:05:25 -04:00
Pete Johanson
d57c271804 Whitespace at EOF fix. 2020-08-07 00:00:35 -04:00
Pete Johanson
2c734c9133 Whitespace tweaks. 2020-08-06 23:59:20 -04:00
Pete Johanson
b4ae91a649 Revert some personal Kyria keymap changes. 2020-08-06 23:57:11 -04:00
Pete Johanson
0460631729 Refactor to simpler keymaps. 2020-08-06 23:28:34 -04:00
Pete Johanson
eafd2a83e5 Remove an unneeded include for the keymap. 2020-08-06 14:26:36 -04:00
Pete Johanson
f83ec5ce2b Refactor to using .keymap files 
* Still just devicetree keymaps.
* Filename can now use `<board>.keymap` or
  `<shield>.keymap` convention, including
  overrides for revisions, etc.
 2020-08-06 10:32:06 -04:00
Nick
cdec1645e2 Fix tabs in keymap bottom row 2020-08-02 20:52:28 -05:00
Nick
fbaeb95601 Add better default keymap for lily58 2020-08-02 20:46:56 -05:00
Nick
bc282a0a4f WIP DZ60RGB board definition 2020-08-02 10:29:07 -05:00
Pete Johanson
58cc3edcf6 Add underglow config for Kyria + nice!nano. 2020-07-27 16:28:38 -04:00
Pete Johanson
4e5a819f3a
Merge pull request #64 from Nicell/feature/rgb_underglow 
Initial RGB Underglow implementation
 2020-07-26 21:43:43 -04:00
Pete Johanson
5e96c0014a Default the reverse mode. 2020-07-25 23:11:38 -04:00
Pete Johanson
c34472bf3f Fixes for loading without encoder drivers. 
* Build fixes.
 2020-07-25 23:10:40 -04:00
Pete Johanson
2ca6c21027 Add the Lily58 OLED. 2020-07-25 23:10:40 -04:00
Pete Johanson
d80063ff51 Initial display support. 2020-07-25 23:10:40 -04:00
Nick
bb09707bd2 Add base files and configuration for RGB underglow 2020-07-24 01:06:56 -05:00
Pete Johanson
5958bfed0b Naming tweaks for the sensor behavior. 2020-07-22 16:24:31 -04:00
Pete Johanson
34ff6190bd Initial behavior for key presses on encoder rotate 2020-07-22 14:54:18 -04:00
Pete Johanson
adfa1b5443 Initial work on sensor bindings. 2020-07-22 02:13:52 -04:00
Pete Johanson
54f1ddc1f5
Merge pull request #59 from petejohanson/sensors/en11-encoder-sensor 
Initial low level EC11 sensor driver
 2020-07-21 14:38:32 -04:00
Pete Johanson
3a508c42d0 Trailing newline fix. 2020-07-21 14:28:59 -04:00
Pete Johanson
b49755b724 Skip chosen node for now. 2020-07-21 14:24:58 -04:00
Pete Johanson
ec74adb3b7 Better chosen name. 2020-07-21 14:01:48 -04:00
Pete Johanson
a734d58ffe More consistent DT for the split encoders. 2020-07-21 14:01:15 -04:00
Pete Johanson
f3267e6030 Tweaks for orientation and A/B pins for Kyria left 2020-07-21 13:52:03 -04:00
Pete Johanson
109c69cbab EN11 is actually EC11, some sample work. 2020-07-20 20:54:58 -04:00
Pete Johanson
331bfa7052 Interrupt fixes. 2020-07-20 10:27:44 -04:00
Pete Johanson
893b99d907 Initial en11 exploration. 2020-07-19 22:11:17 -04:00
Pete Johanson
64b9963bca Name each Lily58 side differently. 2020-07-17 23:02:00 -04:00
Pete Johanson
5b61c211ea Tweaks for split Lily58 sync. 2020-07-17 22:44:35 -04:00
Pete Johanson
339a15881a Tweaks for turning off USB for split peripherals. 2020-07-17 22:43:40 -04:00
Pete Johanson
f4cb3a7cba Clean up old global behavior logic. 2020-07-17 22:43:40 -04:00
Pete Johanson
6701b7babc Working BT settings. 2020-07-17 22:43:40 -04:00
Pete Johanson
0321c490b5 Disable USB on the peripheral size. 2020-07-17 22:43:40 -04:00
Pete Johanson
d74efb331a Kconfig fixes for split roles. 2020-07-17 22:43:40 -04:00
Pete Johanson
3796f76c56 Initial exploration of split BLE service. 
* Service for split peripheral to report
  position state to split central.
* Updated advertising info.
* Behavior for split BT until we have a proper
  event system.
 2020-07-17 22:43:40 -04:00
Pete Johanson
4495aaa7be Minor keymap fix from PR review. 2020-07-17 22:35:33 -04:00
Pete Johanson
c3dd7b694d Initial Lily58 shield definition. 2020-07-16 23:41:55 -04:00
Pete Johanson
33d4341320 Code partition size fix for nice!nano. 2020-07-15 23:27:15 -04:00
Pete Johanson
c45dbe3c8f boards: nice_nano: Fix i2c usage. 
* change conflicting pins usage for uart.
* use i2c0 properly instead.
 2020-07-11 13:09:18 -04:00
Pete Johanson
6cafa9556c nice!nano fixes for necessary USB CDC ACM UART console. 2020-07-07 10:49:51 -04:00
Pete Johanson
9bee640ae3 More Planck rev6 fixes. 2020-07-06 10:19:44 -04:00
Pete Johanson
a9b949cd94 Fixes for WIP planck board definition. 2020-07-06 00:43:03 -04:00
Pete Johanson
5ffd95694f Kyria left/right overlays, matrix transform fixes 
* Refactor Kyria into separate left/right "revisions"
  of the Kyria shield, and include central
  kyria.dtsi file with common definition.
* Fixes for keymaps to work fully with matrix
  transforms that override effective rows/columns.
* Add ability for matrix transform to do row/col
  offsets, which is needed for split keyboards.
 2020-06-27 00:16:15 -04:00
Pete Johanson
f84a41de3e Only test w/ Kyria and handwire. 2020-06-26 11:38:58 -04:00
Pete Johanson
2eb6fbd5a2 Fix the clueboard keymap. 2020-06-26 11:32:32 -04:00
Pete Johanson
f8010d046f Add missing semicolon to pro micro nexus. 2020-06-26 11:23:31 -04:00
Pete Johanson
559670b818 Missed removing some preceding 0 padding. 2020-06-26 11:07:42 -04:00
Pete Johanson
2ff217d39e Refactor ProMicro to a/d connector. 2020-06-25 23:21:53 -04:00
Pete Johanson
cd6bdc336a Enable ZMK USB by default on nano. 2020-06-25 23:20:31 -04:00
Pete Johanson
c457d9880d
Merge pull request #32 from petejohanson/core/refactor-keymap-to-behaviors 
Refactor keymap to behaviors
 2020-06-25 14:39:08 -04:00
Pete Johanson
17ef033f00 Tweaks to readme. 2020-06-24 10:19:02 -04:00
Pete Johanson
d35a95c7af Initial working Clueboard California Macropad w/ proton-c fixes 
* Basic Clueboard Californai Macropad shield definition.
* New "direct" KSCAN driver that supports non-matrix direct
  wiring for switches, needed for macropad that doesn't have
  a matrix at all.
* Some renames for existing KSCAN GPIO driver to make the implied
  "matrix" part explicit.
 2020-06-24 10:14:27 -04:00
Pete Johanson
55cf9db564 Fix consumer keys w/ refactored behaviors. 2020-06-22 11:06:01 -04:00
Pete Johanson
8027be106e Fix momentary-layer reference. 2020-06-21 23:20:38 -04:00
Pete Johanson
321d510d02 One more minor fix. 2020-06-21 22:56:13 -04:00
Pete Johanson
037db585c1 Remove unneeded custom keymap code. 2020-06-21 22:52:50 -04:00
Pete Johanson
ec663310c1 Clean up after refactor, better HID constants. 2020-06-21 22:46:27 -04:00
Pete Johanson
c6625169e5 Refactor to single <behaviors.dtsi> include. 2020-06-21 22:05:11 -04:00
Pete Johanson
93635077e6 Implement momentary layer + transparent behaviors 
* Implement "momentary layer" behavior with `&mo`
  reference.
* Implement basic "transparent" behavior with `&trans`
  reference.
 2020-06-21 21:56:49 -04:00
Pete Johanson
223edf05ad Refactor global bindings, implement mod-tap. 
* Use extra comptible = "zmk,behavior-global" to add
   behaviors to global bindings for event notification.
* Implement mod-tap, as a keymap binding and global one
  to skip tap if other keycode pressed while held.
 2020-06-21 21:43:44 -04:00
Pete Johanson
7e659851c8 Refactor matrix transform, positions pervasively 
* Do mapping to positions right in kscan handler, and then
  surface positions throughout the API.
 2020-06-20 17:54:52 -04:00
Pete Johanson
d65629b9a0 Lots more pieces toward HID working again. 2020-06-20 00:11:39 -04:00
Pete Johanson
c23d752917 Some initial work on behavior bindings for keymaps 2020-06-19 15:32:33 -04:00
Pete Johanson
6e111f4676
Merge pull request #29 from petejohanson/build/zmk-config-initial-work 
Initial refactor to have a shield/board have one default keymap.
 2020-06-17 09:40:28 -04:00
Pete Johanson
c9b22e55fd
Merge pull request #14 from zmkfirmware/boards/nice-nano-prep 
Initial basic work on nice!nano board support.
 2020-06-16 23:10:53 -04:00
Pete Johanson
8ee9a37498 Tweak the defconfigs for nice_nano and handwire. 2020-06-16 22:35:29 -04:00
Pete Johanson
1659562bb7 Rename keymap-transform to matrix-transform. 
* Clearer name to capture essence of the role of the
  transform.
 2020-06-16 21:35:44 -04:00
Pete Johanson
6b6ecb3b0c Tweaks to remove "helper macros" 
* More direct transform maps were agreed to be clearer.
* Remove helpers, just use simple `RC` macro to map a
  logical location to a row/column pair.
 2020-06-16 21:32:11 -04:00
Pete Johanson
a65cdea66b Better naming, layout comments for clarity. 2020-06-16 16:21:39 -04:00
Pete Johanson
a4885db2bf Use the correct family ID for the AdaFruit bootloader. 2020-06-16 11:40:51 -04:00
Pete Johanson
85e505e06e Build UF2 image for nice!nano board as well. 2020-06-15 23:00:35 -04:00
Pete Johanson
557996bcd0 Fixes for SPI pins for "P1" pins 
Co-authored-by: Nick Winans <nick.win999@gmail.com>
 2020-06-15 22:38:30 -04:00
Pete Johanson
879ce6fa6b Enable BLE by default as well. 2020-06-15 22:38:30 -04:00
Pete Johanson
75b01869f0 Add (untested) pins for SPI. 2020-06-15 22:38:30 -04:00
Pete Johanson
a5ade1f947 Add missing compatible entry for the toplevel board. 2020-06-15 22:38:30 -04:00
Pete Johanson
4294b4873e Initial basic work on nice!nano board support. 2020-06-15 22:38:30 -04:00
Pete Johanson
1751470785 Initial work on keymap transforms for non-standard matrixes. 
* Allows "gaps" for keyboards like Kyra.
* Allows keyboards with matrixes that don't map the logical key
  locations to have normal looking keymaps when defined.
 2020-06-15 17:03:34 -04:00
Pete Johanson
0712dadd29 Tweaks for Proton-C board. 2020-06-15 16:58:18 -04:00
Pete Johanson
583839afce Initial refactor to have a shield/board have one default keymap. 
* Start of work of focusing on out-of-tree user keymaps.

Add ZMK_CONFIG support.

* General external configuration supported via ZMK_CONFIG,
  which should point to a configuration directory.
* Priority order of overlay files to select.
  * ${SHIELD}_${BOARD}.overlay
  * ${SHIELD}.overlay
  * ${BOARD}.overlay
  * default.overlay
* Equivalent search order for .conf files for initial Kconfig
  values.
 2020-06-14 23:58:43 -04:00
Pete Johanson
0ee01390bd Initial handwire proton-c shield for testing. 2020-06-11 23:38:04 -04:00
Pete Johanson
7614e7e52b Initial work on Proton-C board definition. 2020-06-11 23:37:47 -04:00
Pete Johanson
297e457dd5 Fix remaining Apache header lines. 2020-06-09 09:54:13 -04:00
Pete Johanson
38f1dbd984 Move Zephyr app into subdirectory. 2020-06-08 21:07:16 -04:00