zmk_mf68

pwarren/zmk_mf68

Fork 0

Commit graph

3e7bb6dc76

Merge pull request #111 from petejohanson/shields/load-out-of-tree-shield-kconfig-files Pete Johanson 2020-08-20 11:57:52 -0400
9730876393 fix(shields): Load Kconfig for out-of-tree shields Pete Johanson 2020-08-20 10:51:35 -0400
1797cfb5c5

Merge pull request #110 from megamind4089/bug/nrfmicro_charger_fix Pete Johanson 2020-08-20 07:47:21 -0400
fb3dadba87

fix(bluetooth): disable BT_SETTINGS for now. Pete Johanson 2020-08-20 07:39:14 -0400
4efce4223a Use correct macro for board Mega Mind 2020-08-20 18:59:41 +0800
3ee2d1196b feat(rgb): underglow state Kconfig and settings Nick 2020-08-20 00:07:04 -0500
11e3566277 fix(docs): Link to 2.3.0 docs, macOS toolchain fix Pete Johanson 2020-08-20 00:11:07 -0400
6ca8e673ac fix(bluetooth): Typo for closed conditional. Pete Johanson 2020-08-20 00:01:59 -0400
b8b25f0c03

Merge pull request #108 from petejohanson/bluetooth/unpair-combo-build-fixes Pete Johanson 2020-08-19 23:38:08 -0400
a65b746a86 fix(bluetooth): Add unpair combo if DT node exists Pete Johanson 2020-08-19 23:34:34 -0400
3576738ab4

Merge pull request #103 from BrainWart/bond-clearing Pete Johanson 2020-08-19 21:02:03 -0400
f2724ada38

Merge pull request #107 from epid/main Pete Johanson 2020-08-19 21:00:30 -0400
6da6d7397f Fixed arrows on default keymap Jared Giles 2020-08-20 00:41:31 +0100
e6ed051ff4

Merge pull request #106 from petejohanson/boards/bluemicro840-naming-refactor Pete Johanson 2020-08-19 19:00:27 -0400
0d7bf03158 Fix BT unpair combo. CrossR 2020-08-19 21:52:31 +0100
506c3b031e refactor(boards): Rename to bluemicro840_v1. Pete Johanson 2020-08-19 16:35:18 -0400
2a0e35c11f

Merge pull request #101 from okke-formsma/nrfmicro Pete Johanson 2020-08-19 16:05:51 -0400
f8a635aaa0 Merge remote-tracking branch 'upstream/main' into CrossR/Sofle CrossR 2020-08-19 20:53:40 +0100
dcd36f12e0 Add BT clear bind. CrossR 2020-08-19 20:53:22 +0100
aa187a54d4 Fix keymap. CrossR 2020-08-19 20:18:27 +0100
93b1e0ac44 Add nrfmicro 1.1, 1.1 flipped and 1.3 boards. Okke Formsma 2020-08-18 21:27:19 +0200
ebd6fbb225

Merge pull request #105 from epid/main Pete Johanson 2020-08-19 13:59:15 -0400
4085145b85 Working on corne default keymap Jared Giles 2020-08-19 18:37:47 +0100
f9163f7a7c

Merge pull request #104 from Nicell/boards/cleanup-nn-bm Pete Johanson 2020-08-19 06:57:57 -0400
cab34d835f fix(board): Fix status LED on BlueMicro Nick 2020-08-18 23:28:34 -0500
674c230dbb fix(board): Cleanup nice!nano DT Nick 2020-08-18 23:28:06 -0500
02f541969c fix(docs): make time to clear explicit Cody McGinnis 2020-08-19 00:11:44 -0400
feadfc93dc feat(docs): create a bond clearing page Cody McGinnis 2020-08-19 00:07:08 -0400
307e2b3e63 fix(shields): OLED fixes for Corne, add anchors. Pete Johanson 2020-08-18 23:24:53 -0400
3c4a9686f8 fix(boards): Proper last col transform for Corne. Pete Johanson 2020-08-18 21:56:22 -0400
0d3cfa8596

Merge pull request #99 from petejohanson/core/bluetooth-unpair-magic-combo Pete Johanson 2020-08-18 19:21:43 -0400
1ae9e9d817

Merge pull request #96 from petejohanson/core/usb-hid-error-release-semaphore Pete Johanson 2020-08-18 17:55:06 -0400
66c4b7ebb0 fix(usb): Restore write semaphore, release it on write failures. Pete Johanson 2020-08-17 22:17:59 -0400
59f85c93cd fix(boards): Remove dup uart0 overrides for nano Pete Johanson 2020-08-18 16:33:24 -0400
a982985f66

Merge pull request #102 from petejohanson/bluetooth/stop-peripheral-advertising-on-connect Pete Johanson 2020-08-18 16:24:25 -0400
05235ca96d fix(bluetooth): Stop peripheral half advertising once connected. Pete Johanson 2020-08-18 16:18:16 -0400
d2d9fc86cf feat(docs): Basic mod-tap behavior docs. Pete Johanson 2020-08-18 15:24:38 -0400
c054feb3c9

Merge pull request #100 from petejohanson/behaviors/add-none Pete Johanson 2020-08-18 14:31:20 -0400
63e02d60dc feat(behaviors): Add &none behavior Pete Johanson 2020-08-18 14:14:28 -0400
c667be1404

Merge pull request #98 from BrainWart/layer-toggle Pete Johanson 2020-08-18 14:25:03 -0400
50643b2c56 fix(keymap): add brackets around if statement body Cody McGinnis 2020-08-18 14:21:39 -0400
2ffe09b617 fix(docs): Fix typo in key press behavior doc. Pete Johanson 2020-08-18 14:11:48 -0400
bb4f45a57a fix(docs): add another example to toggle layer Cody McGinnis 2020-08-18 14:02:25 -0400
7facb6eee8 fix(keymap): move the toggle layer logic to keymap.c Cody McGinnis 2020-08-18 14:02:25 -0400
ae104374c0 feat(docs): document the toggle layer behavior Cody McGinnis 2020-08-18 14:02:24 -0400
a82f990d4c feat(keymap): allow users to toggle layers Cody McGinnis 2020-08-18 14:02:24 -0400
4402e4fbc7 feeature(bt): Add "unpair combo" on startup. Pete Johanson 2020-08-18 11:20:15 -0400
d7dee20e8d Add missing license header. Pete Johanson 2020-08-18 09:56:25 -0400
e5ba03f088 Revert "Merge pull request #93 from careyk007/main" Pete Johanson 2020-08-17 23:23:30 -0400
f04da714a9

Merge pull request #97 from petejohanson/core/exclude-more-west-modules Pete Johanson 2020-08-17 23:04:19 -0400
064323b667 fix(build): Remove more unused west modules. Pete Johanson 2020-08-17 22:34:06 -0400
1607656c53 Note the fixed showstoppers. Pete Johanson 2020-08-16 23:16:50 -0400
24836cdde8

Merge pull request #94 from Nicell/split/default-conn-fix Pete Johanson 2020-08-16 23:00:19 -0400
8cd8933c87

Merge pull request #93 from careyk007/main Pete Johanson 2020-08-16 22:39:26 -0400
3f1dfbaad1

Merge pull request #91 from Na-Cly/boards/bluemicro52840_v1 Pete Johanson 2020-08-16 22:32:04 -0400
15405f351a Add BlueMicro52840 to build matrix. Pete Johanson 2020-08-16 21:34:48 -0400
8b4d2b6093 Add DCDC mode config. Pete Johanson 2020-08-16 21:33:01 -0400
abe40f8ef5 Various fixes. Pete Johanson 2020-08-16 21:30:45 -0400
47b219cca5 Remove duplicate uart0 node. Pete Johanson 2020-08-16 21:27:37 -0400
087574f607 Create proper fix for split default conn bug Nick 2020-08-16 15:36:43 -0500
5b4e5a30c4 remove unnecessary include Kellen Carey 2020-08-16 12:51:06 -0700
25c8a26998 wait before sending HID report Kellen Carey 2020-08-16 12:49:08 -0700
a2603d106a

Merge pull request #1 from zmkfirmware/main Kellen Carey 2020-08-16 12:05:05 -0700
eff6934066 Update pins. CrossR 2020-08-16 19:15:47 +0100
17c43881b8 Updated select block Derek 2020-08-16 13:43:59 -0400
5bb01c802b Update setup.sh Derek 2020-08-16 08:49:17 -0400
6ef2102af9 Update board.cmake Derek 2020-08-16 08:48:34 -0400
75f4adb101 Update arduino_pro_micro_pins.dtsi Derek 2020-08-16 08:46:16 -0400
e554cbcbc3 Merge branch 'boards/bluemicro52840_v1' of https://github.com/Na-Cly/zmk into boards/bluemicro52840_v1 Derek 2020-08-16 08:45:22 -0400
68da92f4dd Update setup.sh Derek 2020-08-16 08:45:03 -0400
ba1cde94a8

Update docs/static/setup.sh Derek 2020-08-16 08:43:09 -0400
892394d9e6 Update to include missing encoder config. CrossR 2020-08-16 12:44:18 +0100
e593e971ec Merge branch 'main' into CrossR/Sofle CrossR 2020-08-16 12:25:47 +0100
94549b4a07

Merge pull request #89 from Nicell/underglow/fix-configs Pete Johanson 2020-08-15 21:17:14 -0400
ee5900686b Fix the active/pull down flags for the example. Pete Johanson 2020-08-15 21:13:50 -0400
7e1942867b Doc fixes for keymaps. Pete Johanson 2020-08-15 20:20:19 -0400
23b188330f Update setup.sh Derek 2020-08-15 19:30:35 -0400
a1965204fd

Merge pull request #90 from petejohanson/boards/nice-nano-dcdc Pete Johanson 2020-08-15 17:47:28 -0400
0a23d98962 Update build.yml Derek 2020-08-15 17:09:44 -0400
c44693cd48 Update build.yml Derek 2020-08-15 16:57:06 -0400
caecce62b7 Drop OLED support. Derek 2020-08-15 16:32:14 -0400
ff3b1d3fa3 Revert "Undo build.yaml changles" Derek 2020-08-15 16:26:55 -0400
6e4101c7d6 Merge branch 'shields/splitreus62' of https://github.com/Na-Cly/zmk into shields/splitreus62 Derek 2020-08-15 16:22:27 -0400
ba136eb9ee

Update app/boards/shields/splitreus62/splitreus62_left.overlay Derek 2020-08-15 16:22:00 -0400
1fa993fca2

Update app/boards/shields/splitreus62/splitreus62_right.overlay Derek 2020-08-15 16:21:54 -0400
ce7d7cd51d Undo build.yaml changles Derek 2020-08-15 16:21:38 -0400
bb5eb51df7 Updated comment and removed display flag Derek 2020-08-15 16:11:18 -0400
3e264e46d4 Add splitreus62 shield Derek 2020-08-15 16:01:35 -0400
dd165c6829 Corrected pins for scl-pin and sda-pin Derek 2020-08-15 15:53:31 -0400
9dd8217cd4 Add bluemicro support Derek 2020-08-15 15:32:36 -0400
4acfa8d7ef Add DCDC setting for nano. Pete Johanson 2020-08-14 23:26:03 -0400
2863f15006 Fix docs typos Nick 2020-08-14 21:36:11 -0500
a03b3ab68c Fix grammar Nick 2020-08-14 21:33:33 -0500
aa4ae90fb7 Add missing configuration values for RGB underglow Nick 2020-08-14 21:31:18 -0500
7e8a07e693 Remove use of printk. Pete Johanson 2020-08-14 16:45:05 -0400
8b61beb2bb Bump max paired connections to 2 for central. Pete Johanson 2020-08-14 16:44:13 -0400
3b4049f2f6

Merge pull request #87 from BrainWart/main Pete Johanson 2020-08-13 11:13:58 -0400
c3b4525d25 Fix edit url links for the website. Cody McGinnis 2020-08-13 00:19:59 -0400
0624c6c54a State Of The Firmware #1. Pete Johanson 2020-08-12 10:20:51 -0400
45ddd4c2ae Add very basic, untested, Sofle configuration. CrossR 2020-08-11 18:07:08 +0100