Commit graph

228 commits

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
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
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
6ca8e673ac fix(bluetooth): Typo for closed conditional. 2020-08-20 00:01:59 -04:00
Pete Johanson
a65b746a86 fix(bluetooth): Add unpair combo if DT node exists 2020-08-19 23:34:34 -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
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
Jared Giles
4085145b85 Working on corne default keymap 2020-08-19 18:37:47 +01: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
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
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
05235ca96d fix(bluetooth): Stop peripheral half advertising once connected. 2020-08-18 16:18:16 -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
Cody McGinnis
50643b2c56 fix(keymap): add brackets around if statement body 2020-08-18 14:21:39 -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
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
064323b667 fix(build): Remove more unused west modules. 2020-08-17 22:49:15 -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
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
CrossR
eff6934066 Update pins. 2020-08-16 19:15:47 +01:00
Derek
6ef2102af9 Update board.cmake 2020-08-16 08:48:34 -04:00
Derek
75f4adb101 Update arduino_pro_micro_pins.dtsi 2020-08-16 08:46:16 -04:00
CrossR
892394d9e6 Update to include missing encoder config. 2020-08-16 12:44:18 +01:00