pwarren
/
zmk_mf68
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
872 Commits 1 Branch 0 Tags 16 MiB
Commit Graph

872 Commits

Author SHA1 Message Date
Pete Johanson f4f265c57e
Merge pull request #122 from bmcgavin/romac 
New shield : RoMac 2.1
 2020-08-25 20:44:25 -04:00
tominabox1 83ddc8a638 Merge branch 'main' of https://github.com/zmkfirmware/zmk into main 2020-08-23 16:46:04 -05: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
Pete Johanson 6225bcd73d
Merge pull request #121 from cdarwin/crd/120/bzip-dep 
[docs] Add bzip to deps
 2020-08-22 12:35:55 -04:00
crd 0c255aee84 [docs] Add bzip to deps 2020-08-22 09:29:23 -07: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 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
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
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