Commit graph

  • f6f8abe055 fix(ec11): allow more than one encoder Joel Spadin 2020-09-26 18:39:13 -05:00
  • d3cd791769 Merge branch 'main' of github.com:zmkfirmware/zmk into main Pete Johanson 2020-10-02 23:17:55 -04:00
  • dfb4f1277d fix(docs): Proper emphasis of MUST NOT. Pete Johanson 2020-10-02 23:17:53 -04:00
  • 260044ae5e
    Delete default.keymap David Barr 2020-10-02 14:17:35 +01:00
  • 38a418a1d1
    updates as per PR changes (i hope) David Barr 2020-10-02 14:16:59 +01:00
  • 091ac414e3
    Merge pull request from DevMashru/main Pete Johanson 2020-10-02 08:53:44 -04:00
  • c68e3d3e42 Add missing licensing header Dev 2020-10-01 11:26:54 +05:30
  • e2ce9c34b5
    Merge pull request from petejohanson/core/usb-status-api Pete Johanson 2020-10-01 17:29:16 -04:00
  • 307a8d09db feat(usb): Function to access latest USB status. Pete Johanson 2020-10-01 17:18:01 -04:00
  • 4f494ac5f9
    Merge pull request from petejohanson/docs/nice-nano-product-link-fix Pete Johanson 2020-10-01 15:43:19 -04:00
  • 9a3d515583 fix(docs): Link to nice!nano product page itself. Pete Johanson 2020-10-01 15:40:39 -04:00
  • c9d53ffe34 Merge with main. Jason Chestnut 2020-10-01 12:39:47 -04:00
  • ffb42281e9
    Merge pull request from petejohanson/test/clang-format-fix-test Pete Johanson 2020-10-01 11:55:39 -04:00
  • 028dfae92e chore: Fix remaining formatting issues. Pete Johanson 2020-10-01 11:40:49 -04:00
  • 694b24ca86 fix(ci): Lint detected changes to drivers dir. Pete Johanson 2020-10-01 11:31:02 -04:00
  • e993378b2a chore: Fix some accidental formatting issues. Pete Johanson 2020-10-01 11:24:57 -04:00
  • 91b66593f0 Fix a broken link to the dts file. Jason Chestnut 2020-10-01 10:22:14 -04:00
  • 633859b1ac Merge branch 'main' into add_preonic Jason Chestnut 2020-10-01 10:15:07 -04:00
  • ca20c6b2a4 Merge branch 'add_preonic' of github.com:shurikai/zmk into add_preonic Jason Chestnut 2020-10-01 10:09:28 -04:00
  • 05d4c08a0f Update copyright statement. Jason Chestnut 2020-10-01 10:06:58 -04:00
  • 300b753ced
    Merge pull request from shurikai/zmk-202 Pete Johanson 2020-10-01 00:36:29 -04:00
  • 16df1522c2 Add TG4X rev 2.1 shield Mubeen Khan 2020-09-30 21:35:51 -05:00
  • 17bee0223a remove ds_store files David Barr 2020-09-30 17:12:39 +01:00
  • 85af75c7f6 remove .ds_store junk David Barr 2020-09-30 17:10:29 +01:00
  • a3d0c03726 rename cradios to cradio David Barr 2020-09-30 16:20:41 +01:00
  • d50c371b30
    Merge pull request from petejohanson/bluetooth/fix-max-paired-kconfig Pete Johanson 2020-09-29 12:28:51 -04:00
  • 182a6dca1f fix(bluetooth): Proper max paired/conns. Pete Johanson 2020-09-29 12:21:06 -04:00
  • 357bee6c72 Update to dts and keymap. Jason Chestnut 2020-09-29 10:18:26 -04:00
  • 2a11b0218e Merge branch 'add_preonic' of github.com:shurikai/zmk into add_preonic jason 2020-09-28 19:45:25 -04:00
  • c2a861c0e6 Modify preprocessor directives to use basic #if !defined() rather than Zephyr macros where appropriate. Jason Chestnut 2020-09-28 08:24:51 -04:00
  • 812dd39edd Fix preprocessor define statements in matrix scan driver. Was originally written using the Zephyr macros, when a simple #if !defined() would have sufficed. Jason Chestnut 2020-09-28 08:17:02 -04:00
  • 7ec7102db2 Merge branch 'zmk-202' into add_preonic Jason Chestnut 2020-09-28 07:56:06 -04:00
  • 9392c4f9ff Fix preprocessor flag issues for pull request. jason 2020-09-27 21:27:30 -04:00
  • d1deb3e57e
    Merge pull request from noar-t/main Pete Johanson 2020-09-26 23:53:02 -04:00
  • 9afd44b9d4 Provide context on Quefrency physical PCB layouts Noah Thornton 2020-09-26 22:10:14 -05:00
  • 24b638dfa3
    Apply suggestions from code review Noah Thornton 2020-09-26 21:09:19 -05:00
  • 820147c7bd Add new layers and mappings. jason 2020-09-26 20:16:41 -04:00
  • 7f7c7037b0 Add quefrency shield Noah Thornton 2020-09-26 11:59:12 -07:00
  • fae6711311 Fix merge conflicts. Jason Chestnut 2020-09-25 16:04:01 -04:00
  • 0b43d68610 Add new keymap and transforms for default preonic layout. Jason Chestnut 2020-09-25 16:00:58 -04:00
  • 6eaf384d99 Add matrix polling config default to y. Jason Chestnut 2020-09-25 11:27:38 -04:00
  • a8fb772281 Initial commit of Preonic rev3 board definition. Awaiting ticket before it can be tested. Jason Chestnut 2020-09-23 15:45:54 -04:00
  • cfc75a118e Fix merge error. Jason Chestnut 2020-09-25 11:51:14 -04:00
  • 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. Jason Chestnut 2020-09-23 16:05:29 -04:00
  • b1dce208f8 Add matrix polling logic to matrix GPIO driver. Jason Chestnut 2020-09-25 11:29:21 -04:00
  • bf6ffdce3a Merge branch 'add_preonic' of github.com:shurikai/zmk into add_preonic Jason Chestnut 2020-09-25 11:28:30 -04:00
  • 8dcce84635 Add matrix polling config default to y. Jason Chestnut 2020-09-25 11:27:38 -04:00
  • 5d8bf62891 Initial commit of Preonic rev3 board definition. Awaiting ticket before it can be tested. Jason Chestnut 2020-09-23 15:45:54 -04:00
  • 9668305621 Restore original matrix driver to correct implementation errors. Jason Chestnut 2020-09-24 17:35:51 -04:00
  • 819c82547d
    Merge pull request from CrossR/CrossR/ShellScriptTidyUp Pete Johanson 2020-09-24 14:36:07 -04:00
  • d5ec32612d feat(docs): Add missing shields to hardware page. Pete Johanson 2020-09-24 14:34:38 -04:00
  • 5c4705d465 Add new matrix scan flag and implementation in the gpio matrix driver. Jason Chestnut 2020-09-24 14:30:47 -04:00
  • cd194dbac4 Add licenses. CrossR 2020-09-24 17:42:34 +01:00
  • 53425aa3c4 Rename kscan direct wired driver polling kscan flag in preparationfor addition of new matrix driver flag that enables polling. Jason Chestnut 2020-09-24 07:55:32 -04:00
  • 1a1b9652f0
    Merge pull request from reizero00/romac_plus Pete Johanson 2020-09-23 21:17:31 -04:00
  • 8e92ae3089 Remove bt_unpair_combo from romac_plus.overlay Kristoffer Onias 2020-09-23 17:49:13 -07:00
  • 6ecf62a9ed
    Merge pull request from reizero00/romac_plus Pete Johanson 2020-09-23 20:14:49 -04:00
  • 641524b1b9 Update Keymap legends for consistency Kristoffer Onias 2020-09-23 16:37:46 -07:00
  • 9fffebd5da Adopt new BT unpairing standards Kristoffer Onias 2020-09-23 16:31:02 -07:00
  • 0ce36865b2 Update keyboard name to be more user friendly Kristoffer Onias 2020-09-23 16:23:54 -07:00
  • 4c092044ce Adopt single authors headers Kristoffer Onias 2020-09-23 16:21:42 -07:00
  • 31af9646e6 Adding kconfig flag for enabling matrix polling (vs interrupts) on the matrix gpio driver. Jason Chestnut 2020-09-23 16:05:29 -04:00
  • aad447758e Initial commit of Preonic rev3 board definition. Awaiting ticket before it can be tested. Jason Chestnut 2020-09-23 15:45:54 -04:00
  • f1fd71c231 Disabled ec11 since it's an optional configuration Kristoffer Onias 2020-09-23 12:39:06 -07:00
  • 551756b0ec Add romac_plus to build.yml Kristoffer Onias 2020-09-21 22:52:50 -07:00
  • c044fe8532 Add RoMac plus v4 support on nice nano v1 Kristoffer Onias 2020-09-21 22:29:54 -07:00
  • 7b53ee51fc
    Merge pull request from petejohanson/blog/sotf-2 Pete Johanson 2020-09-21 23:14:41 -04:00
  • a7ef79e3f8 feat(blog): SOTF initial work.- Closes Pete Johanson 2020-09-21 01:25:37 -04:00
  • 90bfe6026d fix(boards): Flash Planck with dfu-util. Pete Johanson 2020-09-21 09:49:56 -04:00
  • 736c41fd19
    Merge pull request from petejohanson/community/initial-contributing-doc Pete Johanson 2020-09-20 23:49:56 -04:00
  • aa1f9bad6e chore: Add initial CONTRIBUTING.md docs.* Closes Pete Johanson 2020-09-19 23:18:48 -04:00
  • 550c35db23 Fix PR comments, add error checking for push. CrossR 2020-09-20 12:52:25 +01:00
  • 9b89ed7be4
    Merge pull request from kurtis-lew/main Pete Johanson 2020-09-19 23:12:17 -04:00
  • f5909f9c26 fix(clang-format) Nick 2020-09-19 19:18:03 -05:00
  • da0fb965f6 Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting Nick 2020-09-19 19:15:05 -05:00
  • 844f2c7674 Voltage divider driver initial implementation Nick 2020-09-19 19:14:59 -05:00
  • ed5d3646fe
    Add files via upload David Barr 2020-09-19 10:56:40 +01:00
  • 2855ba75f5
    Actually really working David Barr 2020-09-19 10:55:07 +01:00
  • 76257066e8 docs: Fixes . Change "C:\Python38\Scripts" to "%USERPROFILE%\AppData\Roaming\Python\Python38\Scripts". innovaker 2020-09-18 21:41:56 +01:00
  • 608ae0df6d fix lint with clang-format Nick 2020-09-15 14:47:19 -05:00
  • 18d21b0362 Merge remote-tracking branch 'upstream/main' into underglow/state-persistence Nick 2020-09-15 14:41:59 -05:00
  • 81bc157f53 Fix underglow not working by default Nick 2020-09-15 14:31:59 -05:00
  • 0548e0ff4e one-shot keys Okke Formsma 2020-09-09 21:45:21 +02:00
  • bd771ae3e1 Add timestamps to position events and behaviors. Okke Formsma 2020-09-01 20:34:36 +02:00
  • ec86500524
    Update dev-guide-new-shield.md Kurtis Lew 2020-09-14 20:53:26 -07:00
  • d86e571757
    Update iris.keymap Kurtis Lew 2020-09-14 20:47:55 -07:00
  • 0f8561daa1
    Update dev-guide-new-shield.md Kurtis Lew 2020-09-14 20:46:42 -07:00
  • f6932992d2 Revert "Revert "Merge pull request from zmkfirmware/main"" kurtis-lew 2020-09-14 20:39:30 -07:00
  • 5383bdd4df Revert "Merge pull request from zmkfirmware/main" kurtis-lew 2020-09-14 20:38:58 -07:00
  • 1a492f0f98 Updated dev guide kurtis-lew 2020-09-14 20:37:26 -07:00
  • 98098dbe21 Updated build.yml to check default iris keymaps kurtis-lew 2020-09-14 20:20:29 -07:00
  • 64c11f15b0 Removed Copyright Header causing Parse Error kurtis-lew 2020-09-14 20:19:54 -07:00
  • c0806d27f1
    Merge pull request from BrainWart/tests/fix-build-error-fail Pete Johanson 2020-09-14 10:50:52 -04:00
  • 1cf0bad792
    Merge pull request from tominabox1/qaz_update Pete Johanson 2020-09-14 10:41:35 -04:00
  • 0bf4467729 Update Kconfig.shield tominabox1 2020-09-14 09:35:57 -05:00
  • f6269df5fc fix(tests): return error code when build fails Cody McGinnis 2020-09-14 10:34:05 -04:00
  • 42c42ccbbd Fixed some space/tab issues as well as updated copyright statements tominabox1 2020-09-14 09:25:31 -05:00
  • 676288fef2
    Merge pull request from okke-formsma/docs-update Pete Johanson 2020-09-14 10:14:15 -04:00
  • 9110335142
    Merge pull request from petejohanson/ops/clang-format-checks Pete Johanson 2020-09-14 09:46:35 -04:00
  • 62c47b1981 Remove duplicate include tominabox1 2020-09-14 08:46:07 -05:00