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

284 commits

Author SHA1 Message Date
Okke Formsma
200c6cabea refactor(hold-tap): use enum for hold-tap status 2021-02-24 07:24:27 -05:00
Okke Formsma
6b7026cdd1 refactor(hold-tap): simplify flavor enum 2021-02-24 07:24:27 -05:00
Nick Winans
57661362ea refactor(ext-power): Add init-delay-ms option 
Co-authored-by: Pete Johanson <peter@peterjohanson.com>
 2021-02-16 14:51:32 -05:00
Nick Winans
b43fb8502e fix(ext-power): Initialize as soon as settings are available 2021-02-16 14:51:32 -05:00
Pete Johanson
ff7891c097 fix(display): Check for display in idle handler. 
* Closes #679
 2021-02-16 14:21:46 -05:00
Okke Formsma
af9d6e9b05 style(hold-tap)!: Write hold-tap params with dashes 
tapping_term_ms -> tapping-term-ms
quick_tap_ms -> quick-tap-ms

The old style works, although it's deprecated.
 2021-02-10 07:55:12 -05:00
Pete Johanson
2af794eed3 feat(underglow): Convert HSB changes to absolute. 
* Public type for HSB led color.
* New API for calculating "next" HSB based on current
  state.
* Update behavior to convert the increment/decrement
  commands to absolute command as well.
 2021-02-09 01:27:50 -05:00
Pete Johanson
e6f168d6df refactor(behaviors): Convert state dependent params. 
* Allow each behavior to map a relative binding, e.g. "toggle",
  to an absolute one, e.g. "on", before being invoked.
 2021-02-09 01:27:50 -05:00
Pete Johanson
bb2c478af9 refactor(rgb): Expose explicit on/off command/API. 2021-02-09 01:27:50 -05:00
Pete Johanson
b84d29c384 refactor(core): Use /omit-if-no-ref/ for behaviors. 
* Use lesser-known DT features to skip behaviors not referenced
  in the user keymap
* Update the behaviors to skip code if no nodes found.
* Remove some empty config/data structs where unused in
  behaviors.
 2021-02-04 00:52:25 -05:00
KemoNine
cd503ed17b
Feat combo layers (#661) 
feat(combos): add layer filtering

Co-authored-by: KemoNine <mcrosson@kemonine.info>
 2021-02-03 23:33:09 -05:00
Okke Formsma
9a7908b632 behaviors(hold-tap): Implement quick_tap_ms (TAPPING_FORCE_HOLD) 
Tap-and-hold a hold-tap to hold the tap behavior so it can repeat.
After a tap, if the same key is pressed within `quick_tap_ms`, the
tap behavior is always picked.

This is useful for things like `&ht LSHFT BACKSPACE` where holding
the backspace is required.

Implements #288.
 2021-02-02 15:28:16 -05:00
Nick Winans
82173f354e fix(core): Assert BLE device name is correct length 2021-02-02 00:59:17 -05:00
Okke Formsma
4e20bf5de1 refactor(behaviors): simplify hold-taps by not using _TRANSFORM_ENTRY 2021-02-02 00:43:26 -05:00
Okke Formsma
84d19fe79b refactor(behaviors): factor out multiple uses of _TRANSFORM_ENTRY 2021-02-02 00:43:26 -05:00
Jeff Rizzo
4f040fecdf Add a missing log_strdup() 2021-01-30 00:31:07 -05:00
Okke Formsma
c925cf02dd feature(sticky_keys): add quick-release 
when quick-release is enabled, the sticky key is released immediately after another key is pressed
 2021-01-28 17:10:04 -05:00
Okke Formsma
7b7701ae90 feature(modifiers): add explicit modifiers 
this makes LS(LEFT_CONTROL) work as if shift and control were both
pressed explicitly. Previously, the left shift would have been released
as soon as another key was pressed. The implicit behavior is useful in
case of LS(NUMBER_1) when rolling over to other keys.

Also see #361.
 2021-01-24 23:30:41 -05:00
Okke Formsma
0c30b49063 refactor(modifiers): define is_mods function 2021-01-24 23:30:41 -05:00
Okke Formsma
df4a5c8613 refactor(hid_listener): pass event struct instead of parameters 2021-01-24 23:30:41 -05:00
Ally Parker
a4aaa73f06 feat: Add WPM calculator and display widget 2021-01-23 18:38:31 -05:00
Okke Formsma
5eeb310b2f feat(grave-escape): implement grave-escape 
closes #85
 2021-01-22 19:27:18 -05:00
Pete Johanson
3368a81057 refactor(core): Combine is_ and cast_ event functions. 
* Use a single `as_foo` generated function to conditionally
  return a certain event type from a generic `zmk_event_t*`
  pointer.
 2021-01-20 07:06:11 -05:00
Pete Johanson
3fe2acc2d1 refactor(core): Extra event payloads to own types, refactor API. 
* Make it easier to use *just* event payloads by defining the data,
  and then having event manager macros generate "wrapper structs"
* Improve is_*/cast_* APIs to hide details of full event struct.
* Create `zmk_event_t` typedef to pass to event handlers.
* Bring event names inline w/ consistent `zmk_` prefix.
 2021-01-20 07:06:11 -05:00
Pete Johanson
003db892ad refactor(core): Extra position state change data struct. 
* Separate header and data struct for the event.
* Remove duplicate struct in split code.
 2021-01-20 07:06:11 -05:00
Pete Johanson
65e476df3e fix(splits): Send pos notify from dedicated thread 
* Avoid deadlocks by using a deadicated workqueue for sending
  position state notifications from peripherals.
 2021-01-15 13:50:36 -05:00
Pete Johanson
c11759bc79 fix(hid): Clear all matching usages, not just first. 
* If various events get dropped, we can end up with duplicate
  codes in our report, so tweak to ensure we look for all matches
  and clear them when we have a keycode released.
 2021-01-15 13:50:36 -05:00
Pete Johanson
a0c32bb47e fix(bluetooth): improve LE param update logging 2021-01-15 13:50:36 -05:00
Pete Johanson
a5c39dfa76 fix(ble): Perform GATT notifies from dedicated queue. 
* Zephyr BT stack frees TX buffers from system workqueue,
  and to avoid blocking waiting to allocate, perform notify
  from a dedicated queue.
 2021-01-15 13:50:36 -05:00
Pete Johanson
4aa78a6f8d fix(split): Use queue/work for peripheral events. 
* Avoid corruption by using work to process
  peripheral key position events on the main
  work thread, like local kscan events are.
* Fixes #221
 2021-01-15 13:50:36 -05:00
innovaker
1d18900a99 refactor(core): define usage page as uint16_t 
Aligns with the HID specification.

Usage page values were sometimes declared as uint8_t and sometimes uint16_t.  This commit aligns all instances with the HID specification for consistency.

PR: #521
 2021-01-15 01:48:39 -05:00
Okke Formsma
feb0d5b90c feat(combos): initial implementation 
closes #45
 2021-01-13 21:07:41 -05:00
KemoNine
6345bd5468 Remove setting the animation/effect when setting hsv ; some of the effects like glowing will use the hsv color specified 2021-01-08 16:08:13 -05:00
KemoNine
99f932a47d (feat) Allow setting underglow color by key press 2021-01-08 16:08:13 -05:00
Pete Johanson
992cee1bac feat(display): Show layer label in widget. 2021-01-04 13:02:38 -05:00
Pete Johanson
a55b1397c9 feat(keymap): API for retrieving label for a layer 2021-01-04 13:02:38 -05:00
Okke Formsma
319ce30270 chore(behavior): use ZMK_BEHAVIOR_OPAQUE in to-layer behavior 2021-01-02 08:08:51 -05:00
Okke Formsma
fa07ba9d32 refactor(behaviors): use ZMK_BEHAVIOR_OPAQUE and ZMK_BEHAVIOR_TRANSPARENT 
Use these instead of the magic return values 0 and 1 for
behavior_driver_api return values.
 2021-01-01 23:07:54 -05:00
Okke Formsma
caa285852a refactor(events): return 'ZMK_EV_EVENT_BUBBLE' instead of magic number 0 2021-01-01 23:07:54 -05:00
Pete Johanson
d698847769 fix(power): Fix for 2.4 API changes. 2020-12-30 09:29:57 -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
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
innovaker
2233f457b2 chore(display): add header to CMakeLists.txt 
PR: #533
 2020-12-21 23:42:55 -05:00
innovaker
aa8efa7078 chore(display): add header to Kconfig 
PR: #534
 2020-12-21 23:30:25 -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
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
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
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
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
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
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
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
Nick
177b28f01d refactor(settings): Add Kconfig option for settings debounce 2020-12-02 19:54:48 -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
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
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
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
ae924b3594 refactor(hid): replace kp_report with keyboard_report 
Aligns with other existing conventions.
 2020-11-22 10:04:35 -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
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
Xudong Zheng
51ca4fbc18 Fix connection to incorrect peripheral 2020-11-11 13:16:31 -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
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
eff1b8223b refactor(keys): Unify usage page. 
* Remove need for separate `&cp` behavior, but
  keep it for now for backward compat.
* Refactor sensor inc/dec as well.
 2020-11-05 14:55:40 -05:00
innovaker
d748d8a749 refactor: Replace superseded key names 
Replace deprecated key names (LCTL, NUM_0, NUM_1).

Replace abbreviated names with fully qualified names (LCTL, RGUI, NUM_0, NUM_1).

Follow-up to #21.
 2020-11-03 23:50:54 -05:00
innovaker
e925319e4c refactor(hid): Replace deprecated HID usage page references 
Deprecate `USAGE_KEYPAD` and replace with `HID_USAGE_KEY`.

Deprecate `USAGE_CONSUMER` and replace with `HID_USAGE_CONSUMER`.

Closes #217.
 2020-11-03 23:50:54 -05:00
Nick
1af4221908 feat(underglow): Debounce state settings save 2020-11-03 22:08:20 -05:00
Pete Johanson
32e7159373 refactor(hid): Mod defines in dedicated header. 2020-11-03 00:21:20 -05:00
Okke Formsma
4f258efbf1 initial implementation for modifiers 
https://github.com/zmkfirmware/zmk/issues/86
 2020-11-03 00:19:37 -05:00