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

835 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin
ea05df0290 docs: Added link to clarify where to add sensor-bindings code 2020-10-08 21:44:32 -07:00
Pete Johanson
2dc9f7970e
Merge pull request #248 from onebigdoor/docs/uf2-transfer-error-mac 
docs: add benign uf2 transfer error for macOS to troubleshooting
 2020-10-08 18:51:55 -04:00
Tyler Walker
a8d48b043d add benign uf2 transfer error for macOS to troubleshooting 2020-10-08 18:42:55 -04:00
Pete Johanson
00479e913f
Merge pull request #243 from BenHuddleston/patch-1 
Correct typo in previous profile behaviour binding in bluetooth.md
 2020-10-07 23:06:25 -04:00
Ben Huddleston
2300ce306a
Correct typo in previous profile behaviour binding in bluetooth.md 2020-10-07 22:25:21 +01:00
Pete Johanson
12b9a37005
Merge pull request #211 from petejohanson/core/keymap-port-event-exploration 
Use PORT events for kscan matrix interrupts, add option for deep sleep.
 2020-10-06 17:32:35 -04:00
Pete Johanson
a7496ab064 feat(power): Initial deep sleep work. 
* New ZMK_SLEEP Kconfig symbol to enable the functionality.
* Switch to PORT events that allows wake from deep sleep.
* Initial basic power management policy, with idle ms,
  and ignoring deep sleep if we detect a USB connection.
 2020-10-06 17:24:36 -04:00
Pete Johanson
ce59223efe fix(shields): Typo in makerdiary URL. 2020-10-05 23:40:29 -04:00
Pete Johanson
4de7cc45de feat(setup): Add M.2 and M60 to setup scripts. 2020-10-05 09:43:05 -04:00
Pete Johanson
febf2f485d
Merge pull request #233 from megamind4089/m60 
Shield and board definitions for M60
 2020-10-05 09:29:30 -04:00
Mega Mind
b8cb5f939a M60 keymap update and misc changes 
* Updated M60 keymap
* Make nrfjproj as default runner
* Remove the polling config
 2020-10-05 21:24:39 +08:00
Mega Mind
e2299836bc Update contributors in all keymap files 2020-10-05 21:23:38 +08:00
Mega Mind
9d06c730ba Added Makerdiary M60 keyboard 2020-10-05 21:23:38 +08:00
Mega Mind
c54decd144 Added Makerdiary M.2 module 2020-10-05 21:23:38 +08:00
Pete Johanson
7d222e1553
Merge pull request #237 from ChaosinaCan/direct-gpio-fix 
Fix direct GPIO when using interrupts
 2020-10-04 23:04:16 -04:00
Pete Johanson
9249d2f4b7
Merge pull request #240 from chenkevinh/windows_setup 
docs: Fixed Windows setup instructions
 2020-10-04 22:48:48 -04:00
Pete Johanson
9be566603e feat(kscan): Use PORT events for kscan matrix interrupts 
* Lower power usage compared to regular interrupts on nrf52.
 2020-10-04 22:03:21 -04:00
Pete Johanson
222515f091
Merge pull request #238 from petejohanson/core/usb-without-hid-refactor 
Expose USB status without having USB HID output.
 2020-10-04 22:02:25 -04:00
Pete Johanson
bbf5a5905a refactor(usb): Report USB status w/o HID output. 2020-10-04 21:56:09 -04:00
Kevin
6427e64df3 fix(docs): Reorganized section in Windows setup 2020-10-04 17:10:34 -07:00
Kevin
31e481954f fix(docs): Fixed Python environment variables and commands for Windows setup 2020-10-04 17:03:56 -07:00
Joel Spadin
4121b07f7f fix(kscan): fix direct GPIO when using interrupts 
Fixed initializing interrupts for direct GPIO when
CONFIG_ZMK_KSCAN_DIRECT_POLLING is not enabled. IS_ENABLED() is needed to map
the possibly-undefined value to 0 or 1 so COND_CODE_0() and COND_CODE_1() work.
 2020-10-04 14:07:20 -05:00
Joel Spadin
fc5915b200 improvement(kscan): use ARRAY_SIZE macro 2020-10-04 14:07:14 -05:00
Pete Johanson
e6d9134005
Merge pull request #235 from ChaosinaCan/ec11-fix 
fix(ec11): allow more than one encoder
 2020-10-03 18:32:01 -04:00
Joel Spadin
f6f8abe055 fix(ec11): allow more than one encoder 
Fixes "device.h:101:11: error: redefinition of '__device_ec11'" in firmware that
has more than one encoder.
 2020-10-03 14:05:05 -05:00
Pete Johanson
d3cd791769 Merge branch 'main' of github.com:zmkfirmware/zmk into main 2020-10-02 23:17:55 -04:00
Pete Johanson
dfb4f1277d fix(docs): Proper emphasis of MUST NOT. 2020-10-02 23:17:53 -04:00
Pete Johanson
091ac414e3
Merge pull request #227 from DevMashru/main 
Add missing licensing header
 2020-10-02 08:53:44 -04:00
Dev
c68e3d3e42 Add missing licensing header 
Fixes #205
 2020-10-02 13:14:31 +05:30
Pete Johanson
e2ce9c34b5
Merge pull request #231 from petejohanson/core/usb-status-api 
Add API to access current USB status
 2020-10-01 17:29:16 -04:00
Pete Johanson
307a8d09db feat(usb): Function to access latest USB status. 
* To be leveraged by upcoming power
  management work.
 2020-10-01 17:18:01 -04:00
Pete Johanson
4f494ac5f9
Merge pull request #230 from petejohanson/docs/nice-nano-product-link-fix 
Update nano link to actual product page
 2020-10-01 15:43:19 -04:00
Pete Johanson
9a3d515583 fix(docs): Link to nice!nano product page itself. 2020-10-01 15:40:39 -04:00
Pete Johanson
ffb42281e9
Merge pull request #229 from petejohanson/test/clang-format-fix-test 
chore: Fix remaining formatting issues.
 2020-10-01 11:55:39 -04:00
Pete Johanson
028dfae92e chore: Fix remaining formatting issues. 2020-10-01 11:43:00 -04:00
Pete Johanson
694b24ca86 fix(ci): Lint detected changes to drivers dir. 2020-10-01 11:31:02 -04:00
Pete Johanson
e993378b2a chore: Fix some accidental formatting issues. 2020-10-01 11:24:57 -04:00
Pete Johanson
300b753ced
Merge pull request #212 from shurikai/zmk-202 
Add polling (instead of interrupt) based matrix kscan detection, to avoid interrupt limits on stm32
 2020-10-01 00:36:29 -04:00
Pete Johanson
d50c371b30
Merge pull request #222 from petejohanson/bluetooth/fix-max-paired-kconfig 
Fix max paired/connected settings for all configs.
 2020-09-29 12:28:51 -04:00
Pete Johanson
182a6dca1f fix(bluetooth): Proper max paired/conns. 
* Proper max values for both split central, and
  non-split keyboards.
 2020-09-29 12:21:06 -04:00
Jason Chestnut
c2a861c0e6 Modify preprocessor directives to use basic #if !defined() rather than Zephyr macros where appropriate. 2020-09-28 08:24:51 -04:00
jason
9392c4f9ff Fix preprocessor flag issues for pull request. 2020-09-27 21:27:30 -04:00
Pete Johanson
d1deb3e57e
Merge pull request #216 from noar-t/main 
Add quefrency shield
 2020-09-26 23:53:02 -04:00
Noah Thornton
9afd44b9d4 Provide context on Quefrency physical PCB layouts 
The Quefrency board has two options for each left and right half,
resulting in 4 unique combinations. This has been noted in the
overlay and dtsi files.
 2020-09-26 22:10:14 -05:00
Noah Thornton
24b638dfa3
Apply suggestions from code review 
Revise copyright header

Co-authored-by: Pete Johanson <peter@peterjohanson.com>
 2020-09-26 21:09:19 -05:00
Noah Thornton
7f7c7037b0 Add quefrency shield 2020-09-26 11:59:12 -07:00
Jason Chestnut
cfc75a118e Fix merge error. 2020-09-25 11:51:14 -04:00
Jason Chestnut
cca8337f05 Add support to GPIO matrix driver for matrix polling, rather than interrupt-based IO. 
- Add ZMK_KSCAN_MATRIX_POLLING config flag to Kconfig
  - Update matrix driver code to use the above flag to conditionally add the handling code for polling operations.
 2020-09-25 11:49:07 -04:00
Jason Chestnut
b1dce208f8 Add matrix polling logic to matrix GPIO driver. 2020-09-25 11:29:21 -04:00
Jason Chestnut
9668305621 Restore original matrix driver to correct implementation errors. 2020-09-24 17:35:51 -04:00