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

812 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Pete Johanson
819c82547d
Merge pull request #180 from CrossR/CrossR/ShellScriptTidyUp 
Shell script tidy up.
 2020-09-24 14:36:07 -04:00
Pete Johanson
d5ec32612d feat(docs): Add missing shields to hardware page. 2020-09-24 14:34:38 -04:00
Jason Chestnut
5c4705d465 Add new matrix scan flag and implementation in the gpio matrix driver. 2020-09-24 14:30:47 -04:00
CrossR
cd194dbac4 Add licenses. 2020-09-24 19:28:02 +01:00
Jason Chestnut
53425aa3c4 Rename kscan direct wired driver polling kscan flag in preparationfor addition of new matrix driver flag that enables polling. 2020-09-24 07:55:32 -04:00
Pete Johanson
1a1b9652f0
Merge pull request #207 from reizero00/romac_plus 
Remove bt_unpair_combo from romac_plus.overlay
 2020-09-23 21:17:31 -04:00
Kristoffer Onias
8e92ae3089 Remove bt_unpair_combo from romac_plus.overlay 2020-09-23 17:53:41 -07:00
Pete Johanson
6ecf62a9ed
Merge pull request #198 from reizero00/romac_plus 
RoMac+ v4 Support for nice!nano v1
 2020-09-23 20:14:49 -04:00
Kristoffer Onias
641524b1b9 Update Keymap legends for consistency 2020-09-23 17:01:40 -07:00
Kristoffer Onias
9fffebd5da Adopt new BT unpairing standards 2020-09-23 16:31:02 -07:00
Kristoffer Onias
0ce36865b2 Update keyboard name to be more user friendly 2020-09-23 16:23:54 -07:00
Kristoffer Onias
4c092044ce Adopt single authors headers 2020-09-23 16:21:42 -07:00
Jason Chestnut
31af9646e6 Adding kconfig flag for enabling matrix polling (vs interrupts) on the matrix gpio driver. 2020-09-23 16:05:29 -04:00
Kristoffer Onias
f1fd71c231 Disabled ec11 since it's an optional configuration 2020-09-23 12:39:06 -07:00
Kristoffer Onias
551756b0ec Add romac_plus to build.yml 2020-09-21 22:52:50 -07:00
Kristoffer Onias
c044fe8532 Add RoMac plus v4 support on nice nano v1 2020-09-21 22:44:00 -07:00
Pete Johanson
7b53ee51fc
Merge pull request #196 from petejohanson/blog/sotf-2 
Blog - State of the firmware #2
 2020-09-21 23:14:41 -04:00
Pete Johanson
a7ef79e3f8 feat(blog): SOTF #2 initial work.- Closes #182 2020-09-21 23:04:22 -04:00
Pete Johanson
90bfe6026d fix(boards): Flash Planck with dfu-util. 2020-09-21 09:49:56 -04:00
Pete Johanson
736c41fd19
Merge pull request #194 from petejohanson/community/initial-contributing-doc 
Initial CONTRIBUTING.md file
 2020-09-20 23:49:56 -04:00
Pete Johanson
aa1f9bad6e chore: Add initial CONTRIBUTING.md docs.* Closes #23 2020-09-20 23:36:30 -04:00
CrossR
550c35db23 Fix PR comments, add error checking for push. 2020-09-20 12:52:25 +01:00
Pete Johanson
9b89ed7be4
Merge pull request #187 from kurtis-lew/main 
Fixed Iris default build/Updated Dev Guide
 2020-09-19 23:12:17 -04:00