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

1108 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pete Johanson f35d9f8f69
Merge pull request #258 from megamind4089/dev/ext-power-behavior 
New behavior for ext power control
 2020-10-13 00:01:32 -04:00
Caleb Lightfoot e475260664 Revert "Increased Comprehension of Oled Footnote" 
This reverts commit d4b83c3ebf.
 2020-10-12 19:06:40 -05:00
Caleb Lightfoot d4b83c3ebf Increased Comprehension of Oled Footnote 2020-10-12 18:52:29 -05:00
Pete Johanson 409d180de9
Merge pull request #274 from idan/codespaces-config 
Tweak devcontainer setups for GitHub Codespaces
 2020-10-12 17:48:38 -04:00
Idan Gazit 737283bcbc
Behave properly in GH Codespaces 2020-10-12 14:23:34 -07:00
Pete Johanson eee8eb6e77 fix: Single author file copyright header fix. 2020-10-12 13:04:24 -04:00
Pete Johanson 6d9aa4f5ea fix: Updated copyright headers to single author file. 2020-10-12 13:03:10 -04:00
Mega Mind 2e649b7fd4 Fix compilation errors and minor tweaks 2020-10-13 00:09:57 +08:00
Mega Mind 4adcb396ff Rebased and fixed nasty code 2020-10-12 23:54:56 +08:00
Pete Johanson a2b4a08ddc
Merge pull request #226 from mubeenkhan94/tg4x-shield-dev 
Add TG4X rev 2.1 shield
 2020-10-12 11:49:54 -04:00
Mega Mind 5d1c083959 Added toggle and removed a param 2020-10-12 23:42:01 +08:00
Mega Mind b5e1c8a7ad New behavior for ext power control 2020-10-12 23:42:01 +08:00
Pete Johanson d0c6310434
Merge pull request #259 from Tsquash/DFU 
Issue: #197 Added Setup Instructions for `dfu-util`
 2020-10-12 11:08:21 -04:00
Pete Johanson 0d893e5fd2
Merge pull request #260 from Tsquash/PSscript 
Issue #210 Document Setup.ps
 2020-10-12 10:50:31 -04:00
Pete Johanson 367dcd4820
Merge pull request #267 from nuxiom/fix-matrix-polling 
Fix matrix polling conditional macro
 2020-10-12 10:38:34 -04:00
Pete Johanson 51533751ef
Merge pull request #268 from joelspadin/fix-conn-ref-leak 
fix: don't leak bt_conn refs
 2020-10-12 10:03:16 -04:00
Kellen Carey 26057c0200 update build.yml 2020-10-12 06:48:35 -07:00
Mubeen Khan d45e7b3c11
Merge pull request #7 from zmkfirmware/main 
Update to stay even with upstream main
 2020-10-11 23:17:04 -05:00
Kellen Carey 8b9b247592 allow ble to be enabled if split transport is ble 2020-10-11 20:11:19 -07:00
Kellen Carey 8e298ec701 happy with layout, need to improve interactions 2020-10-11 18:05:27 -07:00
Kellen Carey 7a2314ef59 refactor kconfig to look nicer 2020-10-11 17:36:32 -07:00
Joel Spadin 7798c974f6 fix: don't leak bt_conn refs 
bt_conn_lookup_addr_le() gives us a new reference that must be released
with bt_conn_unref()
 2020-10-11 17:04:34 -05:00
Pete Johanson ba73e5d4ac
Merge pull request #262 from joelspadin/windows-docker-fix 
fix: check out Bash scripts with LF
 2020-10-11 07:52:17 -04:00
Nuxiom 1c0c02e097
Reformatted according to clang-format lint 2020-10-11 17:51:06 +11:00
Nuxiom 78cb6c8b21
Fix kscan_gpio_irq_callback_handler_##n conditional macro 2020-10-11 17:33:07 +11:00
Caleb Lightfoot 1ef21c57ea added links to see progress of features. 2020-10-10 23:03:07 -05:00
Caleb Lightfoot 593d7ff781 made table completely visual; changed feature sentence 2020-10-10 22:40:14 -05:00
Tsquash 56ab812a67 fixed BLE part of table 2020-10-10 22:18:18 -05:00
Tsquash 229c8b4358 Added BlueMicro Collumn 2020-10-10 22:18:18 -05:00
Tsquash 21987d3385 update intro.md 2020-10-10 22:18:18 -05:00
Tsquash d7bfe979c9 Fixed Footnote and added user config repo 2020-10-10 22:18:18 -05:00
Caleb Lightfoot eb9dc37f00 fix table 2020-10-10 22:18:18 -05:00
Caleb Lightfoot e2a845b2eb removed checkmark from zmk oled 2020-10-10 22:18:18 -05:00
Caleb Lightfoot 93c5ae17ac Uniformed Capitals, Added footnotes 2020-10-10 22:18:18 -05:00
Caleb Lightfoot 910e207dbc Update Intro 
changed intro wording and link to layer tap
Update intro.md
 2020-10-10 22:18:18 -05:00
Tsquash e740a83d68 Made columns wider 2020-10-10 22:17:52 -05:00
Tsquash 90b56a1941 added in dev 2020-10-10 22:17:52 -05:00
Tsquash 23e9cbcaf9 Added Table and fixed Feature sentence 
added feature table

new feature sentence
 2020-10-10 22:17:52 -05:00
kurtis-lew 677746014c Addressing #138 - ZMK Config Folders 2020-10-10 19:33:47 -07:00
Kellen Carey b738cc9d75 add option to use wget 2020-10-10 19:16:07 -07:00
Kellen Carey f9e8866a52 add support for wget to setup.sh 2020-10-10 18:28:16 -07:00
Pete Johanson a7e8655287
Merge pull request #256 from careyk007/check_directory_write_permissions_in_setup_script 
Exit setup if no write permissions in directory
 2020-10-10 20:09:55 -04:00
Kellen Carey 4aa45c6f40
update setup.ps1 2020-10-10 17:00:13 -07:00
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
Joel Spadin 5f58193cde fix: check out Bash scripts with LF 
Always check out Bashs scripts with Unix-style line endings so they work if you
run them inside Docker on Windows.
 2020-10-10 17:43:52 -05:00
Mubeen Khan 7fc7a35117 Revised keymap to Qwerty 2020-10-10 16:51:17 -05: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
Mubeen Khan 4fd6c14ae9
Merge pull request #4 from zmkfirmware/main 
make even with main
 2020-10-10 16:32:16 -05:00
Tsquash d79811dd61 Changed setup script url 2020-10-10 14:39:12 -05:00
Tsquash 45f4ffc03a added PowerShell setup Command 2020-10-10 13:03:34 -05:00