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

872 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joel Spadin
425ea441c4 fix: allow nested zmk-config for dev container 
VS Code can't share two folders with a Docker container at the same time, so
to build with -DZMK_CONFIG the zmk-config repo needs to be a subfolder of the
zmk repo. Added zmk-config to .gitignore to allow this.
 2020-10-10 23:14:38 +00:00
Okke Formsma
d38740cebf
Add timestamps to position and behavior events (#147) 
* Add timestamps to position events and behaviors.

- Take original event timestamps into consideration so nested tap-holds have proper timing.
- Add position and timestamp to keycode state changed event so the one-shot behavior can properly identify other keypresses and timings.
- Add timestamp to position events received from peripheral

* reduce number of arguments to behaviors
 2020-10-10 17:32:53 -04:00
Kurtis Lew
fc6c01fd69
-DZMK_CONFIG Documentation (#255) 
feat(docs): `-DZMK_CONFIG` Documentation
 2020-10-09 23:56:52 -04:00
Pete Johanson
0e6bea03f2
Merge pull request #209 from idan/containerize-development 
Add VSCode devcontainer configuration
 2020-10-09 23:40:10 -04:00
Idan Gazit
5401afc002
Skip toolchain for docker 2020-10-09 19:10:07 -07:00
Idan Gazit
5c00c97e9a
Wrap up documentation 2020-10-09 19:09:11 -07:00
Idan Gazit
63ad5b7c08
Inject $WORKSPACE_DIR into container 
This permits users to check ZMK out into arbitrarily-named directories
 2020-10-09 19:09:11 -07:00
Idan Gazit
db40fbad59
Conditionally source zephyr-env.sh in .bashrc 2020-10-09 19:09:11 -07:00
Idan Gazit
63931a7068
Accept suggestions 
Co-authored-by: Pete Johanson <peter@peterjohanson.com>
 2020-10-09 19:09:11 -07:00
Idan Gazit
15614a946f
WIP docs for docker development 2020-10-09 19:09:08 -07:00
Idan Gazit
42d1915ced
Use spaces, not tabs 2020-10-09 18:54:27 -07:00
Idan Gazit
9b29f9b861
Install SSH and GPG into container 
Brings back the dockerfile so we can install SSH and GPG into it.
This fixes git actions with SSH remotes, and GPG signing now
works out of the box.

This commit was made from inside the container!
 2020-10-09 18:54:27 -07:00
Idan Gazit
5bd09b586e
Remove Dockerfile in favor of image 
Per the docs, we can directly specify an image in devcontainer.json:
https://code.visualstudio.com/docs/remote/devcontainerjson-reference
 2020-10-09 18:54:27 -07:00
Idan Gazit
9231f6c57b
Add VSCode devcontainer configuration 2020-10-09 18:54:27 -07:00
Pete Johanson
e1dcf1514f
Merge pull request #242 from megamind4089/feature/ext-power 
[RDY] Driver to control the external power output
 2020-10-09 20:40:48 -04:00
Mega Mind
4d81b10ba7 Added driver to control the external power output 
This PR adds support to control the external power output from controllers like nice!nano, nRFMicro etc

I have implemented based on my understanding of Pete suggestion on this feature.

Testing done:

    Tested by enabling and disabling the ext_power from application and verified
    Verified the application does not crash with boards that does not have ext_power support
    Note:
    I did not test this in nice!nano since I don't have the boards. Will get help from others once the behavior PR is up

Next Steps:

    Create a behavior PR to control enable/disable ext_power
 2020-10-10 08:11:46 +08:00
Pete Johanson
405ca7267f
Merge pull request #254 from kurtis-lew/docissue220 
Documented Issue #220
 2020-10-09 16:02:25 -04:00
kurtis-lew
1f2bdf639f Adjusted Wording, Added link to GH Actions 2020-10-09 12:57:07 -07:00
Pete Johanson
81a4ffef7e feat(setup): Add Microdox to setup scripts. 2020-10-09 15:44:39 -04:00
Pete Johanson
05af21a334
Merge pull request #245 from careyk007/microdox-shield 
Add Microdox Shield
 2020-10-09 15:40:50 -04:00
Kellen Carey
a695d0d359 oops 2020-10-09 12:18:57 -07:00
Kellen Carey
0b125c028c address pr comments 2020-10-09 11:48:06 -07:00
Pete Johanson
e53320a687 fix(docs): Remove hanging footnote. 2020-10-09 11:57:34 -04:00
kurtis-lew
7128808bba Revert "Added -DZMK_CONFIG Documentation" 
This reverts commit a9ec1148e5.
 2020-10-09 08:19:50 -07:00
kurtis-lew
e03b51fe2e Revert "Addressing Issue #181" 
This reverts commit 49315c2f6d.
 2020-10-09 08:19:46 -07:00
kurtis-lew
429c9dc464 Revert "Addressed Issue #181" 
This reverts commit dbda99a378.
 2020-10-09 08:19:40 -07:00
kurtis-lew
aca801d90f Revert "Removed blank space" 
This reverts commit c27d3c66f1.
 2020-10-09 08:19:08 -07:00
kurtis-lew
a58a8412c7 Documented Issue #220 2020-10-09 08:15:38 -07:00
kurtis-lew
c27d3c66f1 Removed blank space 2020-10-08 22:21:49 -07:00
kurtis-lew
dbda99a378 Addressed Issue #181 2020-10-08 22:19:26 -07:00
kurtis-lew
49315c2f6d Addressing Issue #181 2020-10-08 22:18:53 -07:00
kurtis-lew
a9ec1148e5 Added -DZMK_CONFIG Documentation 2020-10-08 22:16:53 -07:00
Pete Johanson
6902511c65
Merge pull request #252 from petejohanson/actions/upload-uf2-except-proton-c 
Upload all UF2 images on GH action build
 2020-10-09 01:11:59 -04:00
Pete Johanson
59a804f751 fix(actions): Upload UF2 for all compatible boards 2020-10-09 01:05:50 -04:00
Pete Johanson
f602b9517c
Merge pull request #251 from chenkevinh/docs/encoder_update 
docs: Added link to clarify where to add sensor-bindings code
 2020-10-09 00:52:18 -04:00
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
Kellen Carey
ca29c40206 clean up keymap 2020-10-07 21:22:08 -07:00
Kellen Carey
f3eaa7e424 working shield, need to improve default keymap 2020-10-07 20:40:04 -07: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