Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• ac3e4af1ce Add QAZ shield tominabox1 2020-08-27 19:09:40 -05:00
• 79f0ecf8b5 Correct number of rows in Lily58 shield jrhe 2020-08-28 01:02:50 +01:00
• 7d8c0411d5 Merge pull request #123 from okke-formsma/bugfix-modtap Pete Johanson 2020-08-27 04:03:58 -04:00
• 3cbe4d4218 Merge pull request #127 from bmcgavin/romac-cleanup Pete Johanson 2020-08-26 17:09:50 -04:00
• e5da5ea40d add romac to build Richard Jones 2020-08-26 21:31:46 +01:00
• b8fbc3784d Not needed Richard Jones 2020-08-26 21:25:46 +01:00
• 6ac1a324e0 Typo Richard Jones 2020-08-26 21:25:26 +01:00
• f4f265c57e Merge pull request #122 from bmcgavin/romac Pete Johanson 2020-08-25 20:44:25 -04:00
• 83ddc8a638 Merge branch 'main' of https://github.com/zmkfirmware/zmk into main tominabox1 2020-08-23 16:46:04 -05:00
• 979a5bffff fix(rgb): check if settings enabled Nick 2020-08-23 15:56:18 -05:00
• 3affd45f0d Formatting Richard Jones 2020-08-23 20:08:00 +01:00
• cafd5c1fe2 Oops comment format Richard Jones 2020-08-23 20:05:56 +01:00
• 3ce9459365 Add license / copyright Richard Jones 2020-08-23 20:02:28 +01:00
• 9b5af05f16 Make the shield name on-brand Richard Jones 2020-08-23 19:59:41 +01:00
• 221535fdc1 refactor to remove SPI; no need for shared DTSI Richard Jones 2020-08-23 19:28:03 +01:00
• 7abcae6949 Update License info. CrossR 2020-08-23 18:48:28 +01:00
• c5c21022a2 Move settings load Nick 2020-08-23 10:33:19 -05:00
• ebc3542aa6 fix bug in modtap bahavior which cleared the wrong keycode events Okke Formsma 2020-08-23 14:46:52 +02:00
• 6806cd2a55 Merge pull request #113 from megamind4089/dev/nrfmicro_charger Pete Johanson 2020-08-23 07:09:20 -04:00
• bc023baa7d Incorporate comments - Change config name to nrfmicro specific Mega Mind 2020-08-23 12:59:39 +08:00
• a0a4b8a2f5 Romac (#1) Richard Jones 2020-08-22 21:47:29 +01:00
• 6225bcd73d Merge pull request #121 from cdarwin/crd/120/bzip-dep Pete Johanson 2020-08-22 12:35:55 -04:00
• 0c255aee84 [docs] Add bzip to deps crd 2020-08-22 09:29:23 -07:00
• c84516bfcf Fix PR issues. CrossR 2020-08-22 09:51:01 +01:00
• 760de7d3c6 Merge pull request #92 from Na-Cly/shields/splitreus62 Pete Johanson 2020-08-21 22:37:50 -04:00
• 796b2dddd9 Remove erroneous key. CrossR 2020-08-21 22:41:57 +01:00
• 39fd982367 Swap central back to left hand Derek 2020-08-21 17:29:18 -04:00
• d848034c81 Add keycodes properly. CrossR 2020-08-21 22:15:27 +01:00
• 84761fc589 Merge branch 'main' into CrossR/Sofle CrossR 2020-08-21 22:03:52 +01:00
• 5c29259fed Remove unpair combo config option. CrossR 2020-08-21 17:10:29 +01:00
• d4e8312db6 Mute is a consumer keypress. CrossR 2020-08-21 17:08:43 +01:00
• c619fb9c58 Merge pull request #116 from petejohanson/behaviors/reset-uf2-reset-node Pete Johanson 2020-08-21 11:30:40 -04:00
• 805ea77005 feat(behaviors): Add &bootloader behavior. Pete Johanson 2020-08-21 00:33:48 -04:00
• 6b23c7f554 Merge branch 'main' of https://github.com/zmkfirmware/zmk into main tjcampie 2020-08-21 06:37:04 -05:00
• 5b76179bf6 Accidentally added these to main branch. tjcampie 2020-08-21 06:31:08 -05:00
• 1ff13676f7 fix(docs): Better behavior sidebar label/titles. Pete Johanson 2020-08-21 00:31:28 -04:00
• 74fd4fc997 fix(rgb): fix underglow settings location Nick 2020-08-20 21:13:17 -05:00
• bee5f7c350 fix(rgb): add missing Kconfig docs Nick 2020-08-20 21:13:05 -05:00
• f3361e79ce Add QAZ to zmk tjcampie 2020-08-20 20:22:55 -05:00
• 3b71c4311b Update Kconfig.defconfig Derek 2020-08-20 17:27:41 -04:00
• 94c7d27f04 Updated files as per request Derek 2020-08-20 15:13:51 -04:00
• 7aea57328c Add KConfig for board battery charger Mega Mind 2020-08-21 03:12:06 +08:00
• 63a408d2a0 Merge pull request #112 from Nicell/actions/cache-west-timeout Pete Johanson 2020-08-20 14:58:10 -04:00
• dc1bb36639 fix(actions): continue build on failed west cache Nick 2020-08-20 13:54:58 -05:00
• 8aae2231e2 fix(actions): timeout stuck cache west modules Nick 2020-08-20 13:43:03 -05:00
• 3e7bb6dc76 Merge pull request #111 from petejohanson/shields/load-out-of-tree-shield-kconfig-files Pete Johanson 2020-08-20 11:57:52 -04:00
• 9730876393 fix(shields): Load Kconfig for out-of-tree shields Pete Johanson 2020-08-20 10:51:35 -04:00
• 1797cfb5c5 Merge pull request #110 from megamind4089/bug/nrfmicro_charger_fix Pete Johanson 2020-08-20 07:47:21 -04:00
• fb3dadba87 fix(bluetooth): disable BT_SETTINGS for now. Pete Johanson 2020-08-20 07:39:14 -04:00
• 4efce4223a Use correct macro for board Mega Mind 2020-08-20 18:59:41 +08:00
• 3ee2d1196b feat(rgb): underglow state Kconfig and settings Nick 2020-08-20 00:07:04 -05:00
• 11e3566277 fix(docs): Link to 2.3.0 docs, macOS toolchain fix Pete Johanson 2020-08-20 00:11:07 -04:00
• 6ca8e673ac fix(bluetooth): Typo for closed conditional. Pete Johanson 2020-08-20 00:01:59 -04:00
• b8b25f0c03 Merge pull request #108 from petejohanson/bluetooth/unpair-combo-build-fixes Pete Johanson 2020-08-19 23:38:08 -04:00
• a65b746a86 fix(bluetooth): Add unpair combo if DT node exists Pete Johanson 2020-08-19 23:34:34 -04:00
• 3576738ab4 Merge pull request #103 from BrainWart/bond-clearing Pete Johanson 2020-08-19 21:02:03 -04:00
• f2724ada38 Merge pull request #107 from epid/main Pete Johanson 2020-08-19 21:00:30 -04:00
• 6da6d7397f Fixed arrows on default keymap Jared Giles 2020-08-20 00:41:31 +01:00
• e6ed051ff4 Merge pull request #106 from petejohanson/boards/bluemicro840-naming-refactor Pete Johanson 2020-08-19 19:00:27 -04:00
• 0d7bf03158 Fix BT unpair combo. CrossR 2020-08-19 21:52:31 +01:00
• 506c3b031e refactor(boards): Rename to bluemicro840_v1. Pete Johanson 2020-08-19 16:35:18 -04:00
• 2a0e35c11f Merge pull request #101 from okke-formsma/nrfmicro Pete Johanson 2020-08-19 16:05:51 -04:00
• f8a635aaa0 Merge remote-tracking branch 'upstream/main' into CrossR/Sofle CrossR 2020-08-19 20:53:40 +01:00
• dcd36f12e0 Add BT clear bind. CrossR 2020-08-19 20:53:22 +01:00
• aa187a54d4 Fix keymap. CrossR 2020-08-19 20:18:27 +01:00
• 93b1e0ac44 Add nrfmicro 1.1, 1.1 flipped and 1.3 boards. Okke Formsma 2020-08-18 21:27:19 +02:00
• ebd6fbb225 Merge pull request #105 from epid/main Pete Johanson 2020-08-19 13:59:15 -04:00
• 4085145b85 Working on corne default keymap Jared Giles 2020-08-19 18:37:47 +01:00
• f9163f7a7c Merge pull request #104 from Nicell/boards/cleanup-nn-bm Pete Johanson 2020-08-19 06:57:57 -04:00
• cab34d835f fix(board): Fix status LED on BlueMicro Nick 2020-08-18 23:28:34 -05:00
• 674c230dbb fix(board): Cleanup nice!nano DT Nick 2020-08-18 23:28:06 -05:00
• 02f541969c fix(docs): make time to clear explicit Cody McGinnis 2020-08-19 00:11:44 -04:00
• feadfc93dc feat(docs): create a bond clearing page Cody McGinnis 2020-08-19 00:07:08 -04:00
• 307e2b3e63 fix(shields): OLED fixes for Corne, add anchors. Pete Johanson 2020-08-18 23:24:53 -04:00
• 3c4a9686f8 fix(boards): Proper last col transform for Corne. Pete Johanson 2020-08-18 21:56:22 -04:00
• 0d3cfa8596 Merge pull request #99 from petejohanson/core/bluetooth-unpair-magic-combo Pete Johanson 2020-08-18 19:21:43 -04:00
• 1ae9e9d817 Merge pull request #96 from petejohanson/core/usb-hid-error-release-semaphore Pete Johanson 2020-08-18 17:55:06 -04:00
• 66c4b7ebb0 fix(usb): Restore write semaphore, release it on write failures. Pete Johanson 2020-08-17 22:17:59 -04:00
• 59f85c93cd fix(boards): Remove dup uart0 overrides for nano Pete Johanson 2020-08-18 16:33:24 -04:00
• a982985f66 Merge pull request #102 from petejohanson/bluetooth/stop-peripheral-advertising-on-connect Pete Johanson 2020-08-18 16:24:25 -04:00
• 05235ca96d fix(bluetooth): Stop peripheral half advertising once connected. Pete Johanson 2020-08-18 16:18:16 -04:00
• d2d9fc86cf feat(docs): Basic mod-tap behavior docs. Pete Johanson 2020-08-18 15:24:38 -04:00
• c054feb3c9 Merge pull request #100 from petejohanson/behaviors/add-none Pete Johanson 2020-08-18 14:31:20 -04:00
• 63e02d60dc feat(behaviors): Add &none behavior Pete Johanson 2020-08-18 14:14:28 -04:00
• c667be1404 Merge pull request #98 from BrainWart/layer-toggle Pete Johanson 2020-08-18 14:25:03 -04:00
• 50643b2c56 fix(keymap): add brackets around if statement body Cody McGinnis 2020-08-18 14:21:39 -04:00
• 2ffe09b617 fix(docs): Fix typo in key press behavior doc. Pete Johanson 2020-08-18 14:11:48 -04:00
• bb4f45a57a fix(docs): add another example to toggle layer Cody McGinnis 2020-08-18 14:02:25 -04:00
• 7facb6eee8 fix(keymap): move the toggle layer logic to keymap.c Cody McGinnis 2020-08-18 14:02:25 -04:00
• ae104374c0 feat(docs): document the toggle layer behavior Cody McGinnis 2020-08-18 14:02:24 -04:00
• a82f990d4c feat(keymap): allow users to toggle layers Cody McGinnis 2020-08-18 14:02:24 -04:00
• 4402e4fbc7 feeature(bt): Add "unpair combo" on startup. Pete Johanson 2020-08-18 11:20:15 -04:00
• d7dee20e8d Add missing license header. Pete Johanson 2020-08-18 09:56:25 -04:00
• e5ba03f088 Revert "Merge pull request #93 from careyk007/main" Pete Johanson 2020-08-17 23:23:30 -04:00
• f04da714a9 Merge pull request #97 from petejohanson/core/exclude-more-west-modules Pete Johanson 2020-08-17 23:04:19 -04:00
• 064323b667 fix(build): Remove more unused west modules. Pete Johanson 2020-08-17 22:34:06 -04:00
• 1607656c53 Note the fixed showstoppers. Pete Johanson 2020-08-16 23:16:50 -04:00
• 24836cdde8 Merge pull request #94 from Nicell/split/default-conn-fix Pete Johanson 2020-08-16 23:00:19 -04:00
• 8cd8933c87 Merge pull request #93 from careyk007/main Pete Johanson 2020-08-16 22:39:26 -04:00
• 3f1dfbaad1 Merge pull request #91 from Na-Cly/boards/bluemicro52840_v1 Pete Johanson 2020-08-16 22:32:04 -04:00