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

367 commits

Author SHA1 Message Date
Cody McGinnis
abf8b5abfa fix(test): fix normal momentary-layer test snapshot 2020-08-28 16:21:31 -04:00
Cody McGinnis
de92bf2b2d fix(test): use a smaller value for mock key intervals 2020-08-28 16:21:31 -04:00
Cody McGinnis
f1224422c5 fix(test): stop using pristine and use 4 threads 2020-08-28 16:21:31 -04:00
Cody McGinnis
5f56266a69 feat(test): add tests for momentary layers 2020-08-28 16:21:31 -04:00
Cody McGinnis
5b21f15a0a fix(test): off by one error with kscan processing 2020-08-28 16:21:31 -04:00
Cody McGinnis
f02fa01e9a fix(test): change the layout 2020-08-28 16:21:31 -04:00
Pete Johanson
6cd46b9504
Merge pull request #132 from BrainWart/behavior/none 
fix(behavior): none should not be transparent
 2020-08-27 23:25:49 -04:00
tominabox1
cf003262e6 Remove RGB, Remove debug, Add Copyright and Licenses 2020-08-27 22:23:27 -05:00
Cody McGinnis
cbea2d5bed fix(behavior): none should not be transparent 2020-08-27 23:12:56 -04: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
Pete Johanson
7d8c0411d5
Merge pull request #123 from okke-formsma/bugfix-modtap 
fix bug in modtap behavior which cleared the wrong keycode events
 2020-08-27 04:03:58 -04: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
Okke Formsma
ebc3542aa6 fix bug in modtap bahavior which cleared the wrong keycode events 2020-08-23 14:46:52 +02: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
Pete Johanson
805ea77005 feat(behaviors): Add &bootloader behavior. 
* Allow reset behavior to have a type property.
* Add `bootloader` node that triggers DFU UF2
  bootloader mode using the AdaFruit nrf52
  bootloader.
 2020-08-21 11:23:45 -04: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
Pete Johanson
9730876393 fix(shields): Load Kconfig for out-of-tree shields 2020-08-20 11:38:36 -04:00
Pete Johanson
1797cfb5c5
Merge pull request #110 from megamind4089/bug/nrfmicro_charger_fix 
nRFMicro: Charger issue. Use correct macro for board
 2020-08-20 07:47:21 -04:00
Pete Johanson
fb3dadba87
fix(bluetooth): disable BT_SETTINGS for now. 2020-08-20 07:39:14 -04:00
Mega Mind
4efce4223a Use correct macro for board 2020-08-20 18:59:41 +08:00
Pete Johanson
6ca8e673ac fix(bluetooth): Typo for closed conditional. 2020-08-20 00:01:59 -04: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
66c4b7ebb0 fix(usb): Restore write semaphore, release it on write failures. 2020-08-18 17:13:32 -04:00
Pete Johanson
59f85c93cd fix(boards): Remove dup uart0 overrides for nano 2020-08-18 16:33:24 -04:00
Pete Johanson
05235ca96d fix(bluetooth): Stop peripheral half advertising once connected. 2020-08-18 16:18:16 -04:00
Pete Johanson
c054feb3c9
Merge pull request #100 from petejohanson/behaviors/add-none 
Add `&none` behavior.
 2020-08-18 14:31:20 -04:00
Pete Johanson
63e02d60dc feat(behaviors): Add &none behavior 2020-08-18 14:28:11 -04:00
Cody McGinnis
50643b2c56 fix(keymap): add brackets around if statement body 2020-08-18 14:21:39 -04:00
Cody McGinnis
7facb6eee8 fix(keymap): move the toggle layer logic to keymap.c 2020-08-18 14:02:25 -04:00
Cody McGinnis
a82f990d4c feat(keymap): allow users to toggle layers 2020-08-18 14:02: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
d7dee20e8d Add missing license header. 2020-08-18 09:56:25 -04:00
Pete Johanson
e5ba03f088 Revert "Merge pull request #93 from careyk007/main" 
This reverts commit 8cd8933c87, reversing
changes made to 3f1dfbaad1.
 2020-08-17 23:23:30 -04:00
Pete Johanson
064323b667 fix(build): Remove more unused west modules. 2020-08-17 22:49:15 -04:00
Pete Johanson
24836cdde8
Merge pull request #94 from Nicell/split/default-conn-fix 
Create proper fix for split default connection bug
 2020-08-16 23:00:19 -04:00
Pete Johanson
8cd8933c87
Merge pull request #93 from careyk007/main 
Wait for USB HID ready before sending reports
 2020-08-16 22:39:26 -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
Nick
087574f607 Create proper fix for split default conn bug 2020-08-16 15:36:43 -05:00
Kellen Carey
5b4e5a30c4 remove unnecessary include 2020-08-16 12:51:06 -07:00
Kellen Carey
25c8a26998 wait before sending HID report 2020-08-16 12:49:08 -07: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
Pete Johanson
7e8a07e693 Remove use of printk. 2020-08-14 16:45:05 -04:00
Pete Johanson
8b61beb2bb Bump max paired connections to 2 for central. 2020-08-14 16:44:13 -04: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
Pete Johanson
3127192720 Invoke called behavior after layer change. 
* If you press a key with a layer active, then
  deactivate the layer (e.g. releasing a `&mo`,
  then release the key, we currently may send
  the wrong key release event.
* Fixes #67.
 2020-08-09 12:30:47 -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
01b8b724c1 Remove debugging line that snuck in. 2020-08-06 23:54:18 -04:00
Pete Johanson
0460631729 Refactor to simpler keymaps. 2020-08-06 23:28:34 -04:00
Pete Johanson
fd3ce4ba1c Encoder Kconfig fixes. 2020-08-06 23:22:02 -04:00
Pete Johanson
eafd2a83e5 Remove an unneeded include for the keymap. 2020-08-06 14:26:36 -04:00
Pete Johanson
fd381e8117
Merge pull request #70 from Nicell/split/2m-phy 
Split connection parameter adjustments and 2M PHY added
 2020-08-06 11:11:48 -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
370cfcc59f Add if block and param req callback comment 2020-08-05 22:38:40 -05:00
Pete Johanson
ac802bedb1 Bump delay in scanning while held to 5ms. 2020-08-05 22:58:14 -04:00
Nick
cfea5cceb1 Remove updated callback 2020-08-03 17:22:11 -05: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
f23ca9d7ee Add two solutions to param updates 2020-08-02 15:51:38 -05:00
Nick
880c6e0601 Fix variable name in peripheral PHY update 2020-08-02 15:01:32 -05:00
Nick
f26bd495ea Fix interval update, add PHY update 2020-08-02 14:51:42 -05:00
Pete Johanson
cd30f440d9 Fix for the right start index for event releases. 2020-08-02 14:10:56 -04:00
Nick
bc282a0a4f WIP DZ60RGB board definition 2020-08-02 10:29:07 -05:00
Pete Johanson
8a07938d9b Minor cleanup. 2020-07-31 23:29:32 -04:00
Pete Johanson
8bba1fb738 Major mod-tap improvements. 
* Track active mods when mods or keycode
  events occur.
* Use the tracked mods when releasing or
  generating keycode events.
* Track pending/used status in one array, for
  improved storage efficency.
 2020-07-31 14:38:10 -04:00
Pete Johanson
f548f2a87c Initial stab at mod-tap improvements. 
* Not working: Roll over + mod-tap with multiple
  mod-tap bindings!
 2020-07-31 00:07:16 -04:00
Pete Johanson
cf8c7856ff Add the ability to capture event and release later 2020-07-30 00:13:32 -04:00
Pete Johanson
2f1c3dd538 Remove unneeded macro. 2020-07-29 00:12:35 -04:00
Pete Johanson
2ba4385f49 Merge branch 'main' of github.com:zmkfirmware/zmk into main 2020-07-27 16:28:40 -04:00
Pete Johanson
58cc3edcf6 Add underglow config for Kyria + nice!nano. 2020-07-27 16:28:38 -04:00
Pete Johanson
05d7bd30f3
Merge pull request #66 from Nicell/keycodes/f-keys-prsc 
Add F keys and a few other missing HID keycodes
 2020-07-27 09:18:22 -04:00
Nick
885176e748 Add a few more keys 2020-07-26 22:31:11 -05:00
Nick
5bbd20b527 Add F keys and print screen 2020-07-26 22:23:26 -05: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
Nick
dc8c7011b1 If LED strip can't be found, behaviors return err 2020-07-26 12:49:43 -05:00
Pete Johanson
5b862655b4 Whitespace fix. 2020-07-25 23:17:33 -04:00
Pete Johanson
d1cb3969f0 Remove extra '#'. 2020-07-25 23:17:19 -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
6956094ac0 Add missing return To brightness up 2020-07-25 15:39:01 -05:00
Nick
564f787280 Add suggested changes 2020-07-25 14:53:42 -05:00
Pete Johanson
91d8237cab Fixes for building with a different .conf file. 2020-07-25 00:50:42 -04:00
Pete Johanson
7a59467420 Properly add overlay/conf files for base shield dir name as well. 
* Needed so when building with `kyria_left` shield, then config
  dir containing `kyria.conf` and `kyria.overlay` will also be
  applied as configs/overlays.
 2020-07-25 00:13:42 -04:00
Nick
295af93289 Only include behavior if feature enabled 2020-07-24 22:48:48 -05:00
Nick
ca569c8143 Initial RGB Underglow implementation 2020-07-24 22:37:00 -05:00