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

656 commits

Author SHA1 Message Date
Pete Johanson
d698847769 fix(power): Fix for 2.4 API changes. 2020-12-30 09:29:57 -05:00
Pete Johanson
1c822754c0 fix(west): Restore atmel west module. 2020-12-29 23:30:30 -05:00
KemoNine
d207c3c30f
(feature) Add &to keycode/behavior (#489) 
feat(behaviors): Add `&to` behavior to switch to a layer.
 2020-12-29 11:57:49 -05:00
Nick Winans
43f6d798be feat(ext-power): Cut power when PM is sleeping 2020-12-29 08:30:57 -05:00
KemoNine
87dbd4ca28
Add uppermost, current layer status widget to oled (#493) 
* Add uppermost, current layer status widget to oled

* Run clang format

* Fixup display widget source includes in CMakeLists

* Update layer widget to only be enabled on primary half of a split keyboard and shuffle some of the options specific to the widget to be enabled via the widget

* Update to latest lvgl/zmk/zephyr ; remove version text from oled per PR

* Fixup file names

* Remove last remenants of the version display text from the oled

* Fixup clang-format

Co-authored-by: KemoNine <mcrosson@kemonine.info>
 2020-12-28 20:17:32 -05:00
innovaker
0e71dbc860 refactor(app): replace zmk_keymap_layers_state with zmk_keymap_layers_state_t 
Aligns with typedef _t convention.

PR: #531
 2020-12-28 10:20:12 -05:00
innovaker
87e7c04b00 refactor(app): replace zmk_mod_flags with zmk_mod_flags_t 
Aligns with typedef _t convention.

PR: #531
 2020-12-28 10:20:12 -05:00
innovaker
05b0d185a8 refactor(app): replace zmk_mod with zmk_mod_t 
Aligns with typedef _t convention.

PR: #531
 2020-12-28 10:20:12 -05:00
innovaker
87179698b4 refactor(app): replace zmk_key with zmk_key_t 
Aligns with typedef _t convention.

PR: #531
 2020-12-28 10:20:12 -05:00
Pete Johanson
4fc17e0b3a fix(shields): Enable USB by default on right side. 
* Ensures USB power detection for sleep/charging
  is properly detected on the right side by deafult.
 2020-12-28 10:16:24 -05:00
Pete Johanson
4db5b169bf refactor(splits): Ability to override split role. 
* Move central/peripheral setting to Kconfig.defconfig
  files to allow left/right .conf files to override
  central/peripheral role for splits.
 2020-12-28 10:16:24 -05:00
innovaker
842aa5a842 refactor: replace filename hyphens with underscores 
Aligns *.h and *.c to underscore naming convention.

These were kept (with warnings) for backwards compatibility with external boards/shields:
- kscan-mock.h
- matrix-transform.h
They should be removed in the future.

PR: #523
 2020-12-28 01:15:35 -05:00
Okke Formsma
6927abee6e chore(tests): remove useless &cp test 2020-12-28 00:39:53 -05:00
innovaker
2233f457b2 chore(display): add header to CMakeLists.txt 
PR: #533
 2020-12-21 23:42:55 -05:00
innovaker
f8e43932ba refactor(app): remove zmk_action 
zmk_action isn't referenced anywhere.

PR: #530
 2020-12-21 23:34:40 -05:00
innovaker
aa8efa7078 chore(display): add header to Kconfig 
PR: #534
 2020-12-21 23:30:25 -05:00
innovaker
1f5680f0df refactor(app): remove handlers.h 
handlers.h isn't referenced elsewhere.

PR: #526
 2020-12-21 23:26:52 -05:00
innovaker
0d52915756 chore(display): align status_screen copyright 
PR: #535
 2020-12-21 23:15:53 -05:00
innovaker
89532eadeb fix(sticky keys): add 0xFF mask to usage_page 
Aligns unpacking of usage_page with its equivalent line in keycode-state-changed.h

PR: #520
 2020-12-17 16:52:15 -05:00
innovaker
e2aef89d99 refactor(endpoints): rename usage_report parameter to usage_page 
Aligns zmk_endpoints_send_report function declaration with its definition.

PR: #522
 2020-12-17 16:40:59 -05:00
KemoNine
565a72bf95 feat(shields): add tidbit and tidbit_19key shields 2020-12-17 10:57:06 +00:00
Okke Formsma
b115f16f4c refactor(sticky keys): use DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) instead of DT_NODE_EXISTS(DT_DRV_INST(0)) 2020-12-15 13:59:03 -05:00
Okke Formsma
1c2796d1c9 refactor(sticky keys): use pointer to avoid repetition in store_sticky_key 2020-12-15 13:59:03 -05:00
Okke Formsma
bc8803ba50 refactor(sticky keys): rename ZMK_BHV_STICKY_KEY_POSITION_NOT_USED to ZMK_BHV_STICKY_KEY_POSITION_FREE 2020-12-15 13:59:03 -05:00
Okke Formsma
26af11b390 refactor(sticky keys): rename timer_is_started to timer_started 2020-12-15 13:59:03 -05:00
Nick
ae63ce5ee7 fix(settings): Add missing err handlers on settings_register 2020-12-14 22:46:49 -05:00
Nick
2204a5dce4 refactor(settings): Debounce BLE/endpoint settings saves 2020-12-14 22:46:49 -05:00
Nick Winans
69d48c5715 refactor(settings): Only load used subtrees 2020-12-14 22:46:49 -05:00
Pete Johanson
b5e17e3b0f feature(display): Blank display on idle/sleep. 
* Set display blanking, and stop refresh timer for displays
  when the activity state goes to idle/sleep, and resume
  when transitioning to active again.
 2020-12-14 15:31:10 -05:00
Pete Johanson
f7c16dfe69 refactor(power): Extract activity/idle detection. 
* Refactor power to extract more general purpose
  activity detection/events.
* Use activity state to implement PM callback.
 2020-12-14 15:31:10 -05:00
innovaker
95a2927098 fix(tests): convert ZMK_CONFIG to an absolute path 
Zephyr 2.4.0 requires ...
  set(DTS_ROOT)
  list(APPEND DTS_ROOT)
... to use absolute paths.
And therefore ZMK_CONFIG as well.

See: zephyrproject-rtos/zephyr#28180
PR: #467
 2020-12-14 12:41:25 -05:00
Pete Johanson
5ec1eefb2c refactor(display): Update to new LVGL v7.x API. 
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
0d4476d148 refactor(app): remove _gatt_ infixes from BT DIS and BAS services 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
250cc07749 refactor(app): replace LVGL_VER_RES with LVGL_HOR_VER_MAX 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
edba0d44a3 refactor(app): replace LVGL_HOR_RES with LVGL_HOR_RES_MAX 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
f7d9d52221 refactor(app): replace void with const struct device *dev in ISR CBs 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
00ca0d2f1c refactor(app): replace struct device * with const struct device * 
Replaced with RegExp: /(?<!const )(struct device \*)/g

See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
1411092a7b refactor(app): replace driver_data with data 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
33c959d031 refactor(app): replace driver_api with api 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
3d7376d2e5 refactor(app): replace config_info with config 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
090b5d4c13 feat(app): upgrade to Zephyr v2.4.0 + ZMK fixes 
PR: #467
 2020-12-14 12:41:25 -05:00
innovaker
bac1f17cf6 refactor(app): replace Zephyr integer types with C99 integer types 
u8_t → uint8_t
u16_t → uint16_t
u32_t → uint32_t
u64_t → uint64_t
s8_t → int8_t
s16_t → int16_t
s32_t → int32_t
s64_t → int64_t

Prerequisite for #223
See: https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v2.4.0
PR: #467
 2020-12-14 12:41:25 -05:00
Okke Formsma
b4c0967645 fix(west) test command should not swallow errors. 2020-12-10 11:41:42 -05:00
Joel Spadin
77c16b020e improvement: upgrade default keymaps 
Ran all the default keymaps through the keymap upgrader and manually adjusted
alignment.
 2020-12-10 12:05:21 +00:00
KemoNine
2427a4ab33
feature(keymaps): Keymap layer state event, highest layer API 
* Fire an event w/ layer number, state, and timestamp
  when a layer is activated/deactivated.
* Add `zmk_keymap_highest_layer_active()` query.

Co-authored-by: KemoNine <mcrosson@kemonine.info>
 2020-12-09 09:35:57 -05:00
Pete Johanson
e6a27b15c1 fix(kscan): Fix building kscan for tests. 2020-12-08 22:20:12 -05:00
ReFil
b0c525df72
feat(shields): add CRBN shield 
Co-authored-by: innovaker <66737976+innovaker@users.noreply.github.com>
PR: #483
 2020-12-07 16:49:37 +00:00
Pete Johanson
7ea1892bbb fix(display): All display updates in work thread. 
* Make sure all LVGL access is from main work thread.
 2020-12-06 22:47:21 -05:00
Pete Johanson
0d80220e14 fix(ble): Raise profile events from work thread. 
* Make sure we don't raise events from BLE
  host thread.
 2020-12-06 22:47:21 -05:00
Okke Formsma
e00eceb508 fix(sticky keys): fix tapping-sticky-keys bug. 
Sticky keys should be cleared when they were tapped in rapid succession before the timer runs out.
 2020-12-06 00:33:20 -05:00
Okke Formsma
f86e0fff14 fix(sticky keys): always clear sticky key when releasing the behavior 2020-12-06 00:33:20 -05:00
Okke Formsma
2ba16c2f3d fix(sticky keys): use correct timestamp when clearing sticky key in timer 2020-12-06 00:33:20 -05:00
Okke Formsma
37946ff57b fix(sticky keys): simplify timer management 2020-12-06 00:33:20 -05:00
innovaker
a5bddcedbe build(west): migrate to zmkfirmware/zephyr fork 
Replaces `petejohanson` with `zmkfirmware` for ZMK's fork of Zephyr (branch `zmk-v2.3.0-with-fixes`)

PR: #468
 2020-12-04 17:00:38 -05:00
innovaker
82625c6bb5 build(cmake): remove unnecessary SYSCALL_INCLUDE_DIRS for drivers 
PR: #406
 2020-12-04 16:53:52 -05:00
Pete Johanson
ca38894e07 fix(drivers): Remove conditional from directories. 2020-12-04 16:25:32 -05:00
innovaker
8d9ae1fdf3 refactor: Align drivers with Zephyr file system conventions 
PR: #400
 2020-12-03 21:06:01 -05:00
Nick
177b28f01d refactor(settings): Add Kconfig option for settings debounce 2020-12-02 19:54:48 -05:00
Pete Johanson
8b91918352 refactor(shields): Cradio to use interrupts now. 2020-12-02 16:46:05 -05:00
Pete Johanson
e0fede4aa5 refactor(kscan): Use PORT events for direct driver 
* Switch interrupt configuration so nRF52 uses
  PORT events for lower power use, and wake
  from deep sleep.
* Closes #272
 2020-12-02 16:46:05 -05:00
Pete Johanson
b3f3362b50 feat(display): Initial widget/status screen work. 
* Battery and output status widgets
* Built in status screen combining them.
* Ability to define a custom status screen factory
  function.
 2020-12-02 16:04:56 -05:00
Pete Johanson
d5ea426975 refactor(battery): Fire event on battery event. 2020-12-02 16:04:56 -05:00
innovaker
7b3a55cf50 refactor(ble): silence warning auth_passkey_display not used 
Silences the following build warning ...

../src/ble.c:407:13: warning: 'auth_passkey_display' defined but not used [-Wunused-function]
  407 | static void auth_passkey_display(struct bt_conn *conn, unsigned int passkey) {
 2020-12-01 07:21:45 -05:00
4pplet
924a598920 Updated function calls with missing reference. GPIO missing. 
Updated function calls with missing reference. GPIO missing.

To my understanding:
DT_INST_GPIO_PIN() should be called instead if DT_INST_PIN()
DT_INST_GPIO_FLAGS() should be called instead if DT_INST_GPIO_FLAGS()

Current implementation does not compile when using control pin.
 2020-11-29 21:12:26 -05:00
Okke Formsma
3bf770a364 bugfix(sticky keys): release active sticky keys properly 
see https://github.com/zmkfirmware/zmk/issues/445
 2020-11-29 20:16:51 -05:00
innovaker
307fd5d250 chore(build): format west.yml 
Realigns with Prettier formatting.

Discrepancy introduced by c067629c83

PR: #440
 2020-11-28 12:21:19 -05:00
innovaker
90123caa4c build(west): add clone-depth = 1 to zephyr and uf2 
This reduces zephyr's footprint to 33% and dramatically reduces the cloning times (west update).

PR: #441
 2020-11-28 12:16:17 -05:00
Nick
093719a3b8 feat: Add settings support for external power 
fix: clang-format and setting state variable

fix: Fix startup settings configuration

fix(ext_power): Add static to state


fix(ext_power): Set default settings value


Use driver data status instead of global file state
 2020-11-28 01:44:35 -05:00
Okke Formsma
76a6d7b4c5 feat(sticky keys): initial implementation 2020-11-28 00:58:24 -05:00
Okke Formsma
bee45f9b3a feat(events): add timestamp to keycode_state_changed and sensor_event 
These timestamps are necessary to correctly deal with delayed events due to hold-tap shenanigans.
 2020-11-28 00:58:24 -05:00
Okke Formsma
db10931439 fix(tests): fix testrunner for 'all' 2020-11-23 15:57:55 -05:00
Nick
248b360f47 fix(ug): Start tick without settings state available 2020-11-23 12:42:27 -05:00
Nick
076fcc1f70 fix(underglow): Fix error on release of rgb_ug 2020-11-22 21:23:29 -05:00
Nick
a1d3230eef feat(underglow): RGB toggle controls ext_power 
fix(ug): Don't return if finding ext power fails

fix(ug): Move ext_power to a static variable

Add #if defs
 2020-11-22 21:23:29 -05:00
innovaker
3bf01200f7 refactor(scripts): capitalize ZMK in west test script 2020-11-22 10:05:21 -05:00
innovaker
ae924b3594 refactor(hid): replace kp_report with keyboard_report 
Aligns with other existing conventions.
 2020-11-22 10:04:35 -05:00
Okke Formsma
2f1170c01a feat(tests): run subdirectory of tests 
example: `west test tests/hold-tap` will run all hold-tap tests.
 2020-11-22 10:03:56 -05:00
innovaker
3ac1a11a37 refactor: change keypad to keyboard 
The application usage used by report 1 is `HID_USAGE_GD_KEYBOARD`.  Moreover, the `keys` usage page (0x07) that primarily feeds into this report is predominantly keyboard codes.  The rest of the system should align with this naming convention.
 2020-11-21 15:52:16 -05:00
Okke Formsma
c067629c83 Create west test command to run zmk testsuite. 2020-11-21 14:47:01 -05:00
innovaker
b6e63683d4 refactor(hid): Replace modifier usage values with their cpp definitions 
Improves readability of the HID reports.
 2020-11-20 22:26:42 -05:00
innovaker
67a6646cd7 chore: add copyright to core Kconfig 2020-11-20 22:25:28 -05:00
innovaker
d50f4afc7e build: set zmk_config.cmake cmake_minimum_required to VERSION 3.15 
3.15 is the minimum version required to facilitate list(PREPEND) used within zmk_config.cmake.

https://cmake.org/cmake/help/v3.15/command/list.html

Fixes #402
 2020-11-20 22:24:29 -05:00
innovaker
1c8321566a fix(drivers): rename module.yaml to module.yml 
module.yaml is not a valid module filename.

See Zephyr `scripts/zephyr_module.py`
 2020-11-20 22:23:20 -05:00
krikun98
f60439802d Jian shield 2020-11-17 16:23:39 +00:00
krikun98
3d030ec2ab Jorne shield 2020-11-17 16:23:39 +00:00
Okke Formsma
6dcd06bd46 add license headers to behavior dtsi files 2020-11-16 17:26:42 -05:00
Okke Formsma
e48a6b659c fix momentary layer bug when top layer is not &trans 
Key release events released keys on the wrong layer if the 'top layer'
was not &trans above the &mo key.

base    <&mo 1>
layer 1 <&kp B>

This was caused by overwriting
`zmk_keymap_active_behavior_layer[position]` after the &mo key was
handled.
 2020-11-16 17:19:27 -05:00
Pete Johanson
11a85f651a refactor(shield): Formatting tweaks for QAZ. 2020-11-16 11:22:29 -05:00
Xudong Zheng
51ca4fbc18 Fix connection to incorrect peripheral 2020-11-11 13:16:31 -05:00
Nick
91e3a7d75a boards: Cleanup and standardize features 2020-11-10 23:14:38 -05:00
Nick
ae51000d60 fix(underglow): Switch from legacy SPI to SPIM 2020-11-10 23:06:29 -05:00
innovaker
c21897856b refactor(app): Replace HID_EXT_USAGE with HID_USAGE 
Simplifies terminology and improves readability.
 2020-11-10 21:00:20 +00:00
Pete Johanson
0031f9bd4d
Merge pull request #357 from petejohanson/ble/remove-unpair-combo 
fix(ble): Remove unpair combo code.
 2020-11-10 15:04:28 -05:00
Pete Johanson
7d16186b7a fix(ble): Remove unpair combo code. 
* Favor the settings reset images for this.
 2020-11-10 14:53:03 -05:00
Nick Winans
413a917d14
Merge branch 'main' into underglow/add-config_ 2020-11-10 13:31:11 -06:00
innovaker
348a44a8a3 refactor(app): Remove obsolete include's of hid_usage_pages.h 
This should've been done in eff1b8223b.
 2020-11-10 14:22:53 -05:00
Pete Johanson
972158181d fix(shields): Replace Corne w/ Microdox. 2020-11-10 11:20:17 -05:00
Nick
0be904c34f fix(underglow): Add CONFIG_ to underglow Kconfigs 2020-11-08 10:33:56 -06:00
innovaker
194854ff7b refactor(hid): Replace 0x01 with HID_USAGE_CONSUMER_CONSUMER_CONTROL 
This should've changed alongside: 711658206f
 2020-11-06 09:53:23 -05:00
Pete Johanson
a4dc92a2b9 refactor: Replace use of cp with kp for shields. 2020-11-05 14:55:40 -05:00