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

1206 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
c619fb9c58
Merge pull request #116 from petejohanson/behaviors/reset-uf2-reset-node 
Add `&bootloader` behavior, add reset docs.
 2020-08-21 11:30:40 -04: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
tjcampie
6b23c7f554 Merge branch 'main' of https://github.com/zmkfirmware/zmk into main 2020-08-21 06:37:04 -05:00
tjcampie
5b76179bf6 Accidentally added these to main branch. 2020-08-21 06:31:08 -05:00
Pete Johanson
1ff13676f7 fix(docs): Better behavior sidebar label/titles. 2020-08-21 00:31:28 -04:00
Nick
74fd4fc997 fix(rgb): fix underglow settings location 2020-08-20 21:13:17 -05:00
Nick
bee5f7c350 fix(rgb): add missing Kconfig docs 2020-08-20 21:13:05 -05:00
tjcampie
f3361e79ce Add QAZ to zmk 2020-08-20 20:22:55 -05: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
63a408d2a0
Merge pull request #112 from Nicell/actions/cache-west-timeout 
fix(actions): timeout stuck cache west modules
 2020-08-20 14:58:10 -04:00
Nick
dc1bb36639 fix(actions): continue build on failed west cache 2020-08-20 13:54:58 -05:00
Nick
8aae2231e2 fix(actions): timeout stuck cache west modules 2020-08-20 13:43:03 -05:00
Pete Johanson
3e7bb6dc76
Merge pull request #111 from petejohanson/shields/load-out-of-tree-shield-kconfig-files 
fix(shields): Load Kconfig for out-of-tree shields
 2020-08-20 11:57:52 -04: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
Nick
3ee2d1196b feat(rgb): underglow state Kconfig and settings 2020-08-20 00:07:04 -05:00
Pete Johanson
11e3566277 fix(docs): Link to 2.3.0 docs, macOS toolchain fix 
* Link explicitly to the 2.3.0 docs from upstream
  Zephyr.
* Update the macOS toolchain section to properly
  refer to the 3rd party toolchain setup.
 2020-08-20 00:11:07 -04:00
Pete Johanson
6ca8e673ac fix(bluetooth): Typo for closed conditional. 2020-08-20 00:01:59 -04:00
Pete Johanson
b8b25f0c03
Merge pull request #108 from petejohanson/bluetooth/unpair-combo-build-fixes 
Build unpair combo behavior in if DT node is present.
 2020-08-19 23:38:08 -04:00
Pete Johanson
a65b746a86 fix(bluetooth): Add unpair combo if DT node exists 2020-08-19 23:34:34 -04:00
Pete Johanson
3576738ab4
Merge pull request #103 from BrainWart/bond-clearing 
feat(docs): create a bond clearing page
 2020-08-19 21:02:03 -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
Pete Johanson
e6ed051ff4
Merge pull request #106 from petejohanson/boards/bluemicro840-naming-refactor 
refactor(boards): Rename to bluemicro840_v1.
 2020-08-19 19:00:27 -04: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
Pete Johanson
ebd6fbb225
Merge pull request #105 from epid/main 
Working on corne default keymap
 2020-08-19 13:59:15 -04:00
Jared Giles
4085145b85 Working on corne default keymap 2020-08-19 18:37:47 +01:00
Pete Johanson
f9163f7a7c
Merge pull request #104 from Nicell/boards/cleanup-nn-bm 
Cleanup nice!nano DT and fix BlueMicro LED
 2020-08-19 06:57:57 -04: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
Cody McGinnis
02f541969c fix(docs): make time to clear explicit 2020-08-19 00:11:44 -04:00
Cody McGinnis
feadfc93dc feat(docs): create a bond clearing page 2020-08-19 00:07:08 -04: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
1ae9e9d817
Merge pull request #96 from petejohanson/core/usb-hid-error-release-semaphore 
Fix for locking when USB sends fail (e.g. on BLE only)
 2020-08-18 17:55:06 -04:00
Pete Johanson
66c4b7ebb0 fix(usb): Restore write semaphore, release it on write failures. 2020-08-18 17:13:32 -04:00