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

675 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Pete Johanson
59f85c93cd fix(boards): Remove dup uart0 overrides for nano 2020-08-18 16:33:24 -04:00
Pete Johanson
a982985f66
Merge pull request #102 from petejohanson/bluetooth/stop-peripheral-advertising-on-connect 
fix(bluetooth): Stop peripheral half advertising once connected.
 2020-08-18 16:24:25 -04:00
Pete Johanson
05235ca96d fix(bluetooth): Stop peripheral half advertising once connected. 2020-08-18 16:18:16 -04:00
Pete Johanson
d2d9fc86cf feat(docs): Basic mod-tap behavior docs. 2020-08-18 15:24:38 -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
Pete Johanson
c667be1404
Merge pull request #98 from BrainWart/layer-toggle 
Feature: Layer toggle
 2020-08-18 14:25:03 -04:00
Cody McGinnis
50643b2c56 fix(keymap): add brackets around if statement body 2020-08-18 14:21:39 -04:00
Pete Johanson
2ffe09b617 fix(docs): Fix typo in key press behavior doc. 2020-08-18 14:11:48 -04:00
Cody McGinnis
bb4f45a57a fix(docs): add another example to toggle layer 2020-08-18 14:02:25 -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
ae104374c0 feat(docs): document the toggle layer behavior 2020-08-18 14:02:24 -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
f04da714a9
Merge pull request #97 from petejohanson/core/exclude-more-west-modules 
fix(build): Remove more unused west modules.
 2020-08-17 23:04:19 -04:00
Pete Johanson
064323b667 fix(build): Remove more unused west modules. 2020-08-17 22:49:15 -04:00
Pete Johanson
1607656c53 Note the fixed showstoppers. 2020-08-16 23:16:50 -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
15405f351a Add BlueMicro52840 to build matrix. 2020-08-16 21:34:48 -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
Kellen Carey
a2603d106a
Merge pull request #1 from zmkfirmware/main 
Get up to speed
 2020-08-16 12:05:05 -07:00