pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
zmk_mf68/app/CMakeLists.txt

93 lines
4.3 KiB
Text
Raw Normal View History

Initial work.
2020-04-22 06:20:34 +10:00
cmake_minimum_required(VERSION 3.13.1)
Random progress on board + kscan ideas.
2020-04-26 12:41:20 +10:00
Some initial work on behavior bindings for keymaps
2020-06-20 05:32:33 +10:00
set(CONFIG_APPLICATION_DEFINED_SYSCALL true)
Initial work.
2020-04-22 06:20:34 +10:00
Initial import of GPIO kscan driver into ZMK.
2020-05-27 10:48:15 +10:00
# Add our custom Zephyr module for drivers w/ syscalls, etc.
list(APPEND DTS_ROOT ${CMAKE_SOURCE_DIR}/drivers/zephyr)
refactor(build): Fixes for config/overlay loading. * Move to ZephyrBuildConfig package based on Zephyr best practices. * Support multiple shields properly, e.g. -DSHIELD="foo bar", which allows using existing upstream shields like `ssd1306_128x64` along with another ZMK shield. * Properly *add* the "ZMK config" .conf file to the conf file list, so that existing board .conf files in `app/boards/<board>.conf` are properly honored still. Needed for overrides to usptream boards when combined with a local `<shield>.conf` file.
2022-05-18 11:38:59 +10:00
set(ZephyrBuildConfiguration_ROOT ${CMAKE_SOURCE_DIR}/cmake)
Initial import of GPIO kscan driver into ZMK.
2020-05-27 10:48:15 +10:00
list(APPEND ZEPHYR_EXTRA_MODULES
${CMAKE_CURRENT_SOURCE_DIR}/drivers
)
Keymap directory support.
2020-05-17 07:30:30 +10:00
Use correct macro for board
2020-08-20 20:59:41 +10:00
# Find Zephyr. This also loads Zephyr's build system.
Initial refactor to have a shield/board have one default keymap. * Start of work of focusing on out-of-tree user keymaps. Add ZMK_CONFIG support. * General external configuration supported via ZMK_CONFIG, which should point to a configuration directory. * Priority order of overlay files to select. * ${SHIELD}_${BOARD}.overlay * ${SHIELD}.overlay * ${BOARD}.overlay * default.overlay * Equivalent search order for .conf files for initial Kconfig values.
2020-06-14 06:37:31 +10:00
find_package(Zephyr REQUIRED HINTS ../zephyr)
Initial work.
2020-04-22 06:20:34 +10:00
project(zmk)
Initial event manager work, and two first events. * Add initial event manager implementation, roughly mimicking Nordic's API. * Add `position_state_changed` and `keycode_state_changed` events. * Hook up HID and keymap to new events instead of using behaviour global event crazy.
2020-06-30 14:31:09 +10:00
zephyr_linker_sources(RODATA include/linker/zmk-events.ld)
Refactor build/config/keymaps. * Move all headers to `include/zmk` directory. * Update includes to reference them properly. * Add `keymap.c` file from keymap, if found. * Toplevel CONFIG_ZMK_BLE aggregate config setting.
2020-05-18 23:11:46 +10:00
Initial work.
2020-04-22 06:20:34 +10:00
# Add your source file to the "app" target. This must come after
# find_package(Zephyr) which defines the target.
Expanded handler implementation, more key defines.
2020-05-11 07:13:24 +10:00
target_include_directories(app PRIVATE include)
refactor(splits): Minor cleanups to periph invocation * Add strlcpy from public domain version. * Leverage strlcpy to detect truncation of behavior dev strs, and log. * Use `offsetof` for cleaner detection on peripheral side.
2022-02-01 14:29:50 +11:00
target_sources(app PRIVATE src/stdlib.c)
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-01 16:52:32 +11:00
target_sources(app PRIVATE src/activity.c)
Refactor for better organization
2020-05-02 09:14:18 +10:00
target_sources(app PRIVATE src/kscan.c)
Refactor matrix transform, positions pervasively * Do mapping to positions right in kscan handler, and then surface positions throughout the API.
2020-06-21 07:54:52 +10:00
target_sources(app PRIVATE src/matrix_transform.c)
Initial behavior for key presses on encoder rotate
2020-07-23 01:08:52 +10:00
target_sources(app PRIVATE src/sensors.c)
feat: Add WPM calculator and display widget
2021-01-23 03:23:21 +11:00
target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c)
Initial event manager work, and two first events. * Add initial event manager implementation, roughly mimicking Nordic's API. * Add `position_state_changed` and `keycode_state_changed` events. * Hook up HID and keymap to new events instead of using behaviour global event crazy.
2020-06-30 14:31:09 +10:00
target_sources(app PRIVATE src/event_manager.c)
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-06 18:52:21 +11:00
target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/ext_power_generic.c)
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-01 16:52:32 +11:00
target_sources(app PRIVATE src/events/activity_state_changed.c)
Initial event manager work, and two first events. * Add initial event manager implementation, roughly mimicking Nordic's API. * Add `position_state_changed` and `keycode_state_changed` events. * Hook up HID and keymap to new events instead of using behaviour global event crazy.
2020-06-30 14:31:09 +10:00
target_sources(app PRIVATE src/events/position_state_changed.c)
Initial behavior for key presses on encoder rotate
2020-07-23 01:08:52 +10:00
target_sources(app PRIVATE src/events/sensor_event.c)
feat: Add WPM calculator and display widget
2021-01-23 03:23:21 +11:00
target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c)
refactor: Move to USB_DEVICE_STACK symbol. See: https://docs.zephyrproject.org/latest/releases/release-notes-2.7.html#changes-in-this-release
2021-11-05 15:21:30 +11:00
target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c)
feature(split): behavior locality support. * GATT characteristic allowing passng data + behavior label to invoke the behavior on the peripheral side. * Behaviors have a locality setting to specify where they run. * Build reset/power/RGB on peripheral.
2020-12-21 01:49:42 +11:00
target_sources(app PRIVATE src/behaviors/behavior_reset.c)
target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
refactor(split): Clean up Kconfig organization. * Seperated configs for split role (central/peripheral) and transport (BLE only for now). * Split the configs to align on structure.
2022-05-23 13:11:45 +10:00
if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
feat(display): Add new peripheral status/display * Add new API/status to track state of the peripheral connection to the central. * Add new peripheral status widget for displaying the current status of the connection to the central.
2022-04-26 15:00:46 +10:00
target_sources(app PRIVATE src/hid.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
feat(behavior): Add key toggle
2022-04-30 04:31:21 +10:00
target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_KEY_TOGGLE app PRIVATE src/behaviors/behavior_key_toggle.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)
feat(sticky keys): initial implementation
2020-11-12 08:09:08 +11:00
target_sources(app PRIVATE src/behaviors/behavior_sticky_key.c)
feat(behaviors): Add caps word (`&caps_word`). * Add new `&caps_word` behavior that acts like caps lock, but releases automatically when any "break" keycode is pressed.
2021-06-09 16:10:20 +10:00
target_sources(app PRIVATE src/behaviors/behavior_caps_word.c)
feat(behaviors): `&key_repeat` behavior + tests. * Add new `&key_repeat` behavior that captures and re-sends the most recently triggered keycode. Closes: #853
2021-11-29 15:26:22 +11:00
target_sources(app PRIVATE src/behaviors/behavior_key_repeat.c)
feat(behaviors): Add macro support. * Fine grainted press/release/tap actions. * TIming between actions can be controlled. * Processed async, to avoid blocking.
2022-03-13 02:15:39 +11:00
target_sources(app PRIVATE src/behaviors/behavior_macro.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
feat(grave-escape): implement grave-escape closes #85
2020-12-27 00:46:56 +11:00
target_sources(app PRIVATE src/behaviors/behavior_mod_morph.c)
feat(endpoints): rename behavior to outputs "Outputs" is probably easier for most people to understand than "endpoints".
2020-10-28 05:49:28 +11:00
target_sources(app PRIVATE src/behaviors/behavior_outputs.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/behaviors/behavior_toggle_layer.c)
(feature) Add &to keycode/behavior (#489) feat(behaviors): Add `&to` behavior to switch to a layer.
2020-12-30 03:57:49 +11:00
target_sources(app PRIVATE src/behaviors/behavior_to_layer.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
target_sources(app PRIVATE src/behaviors/behavior_none.c)
target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c)
feat(combos): initial implementation closes #45
2020-12-12 09:24:44 +11:00
target_sources(app PRIVATE src/combo.c)
fix(behaviors): make tap dances work on a combo * Tap dance event handler goes after combos * Add test
2022-11-02 07:13:19 +11:00
target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
feat(behaviors): Add macro support. * Fine grainted press/release/tap actions. * TIming between actions can be controlled. * Processed async, to avoid blocking.
2022-03-13 02:15:39 +11:00
target_sources(app PRIVATE src/behavior_queue.c)
feat(conditional-layers): Implement feature This is a generalization of the existing concept of tri-layer support that's already well known. Essentially, a conditional-layer configuration activates a particular layer (the then-layer) when one or more other layers (the if-layers) are activated. This is commonly used on ortho keyboards to activate a third "adjust" layer while the primary two layers ("lower" and "raise") are active.
2021-06-10 09:51:28 +10:00
target_sources(app PRIVATE src/conditional_layer.c)
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
target_sources(app PRIVATE src/endpoints.c)
feat(display): Add new peripheral status/display * Add new API/status to track state of the peripheral connection to the central. * Add new peripheral status widget for displaying the current status of the connection to the central.
2022-04-26 15:00:46 +10:00
target_sources(app PRIVATE src/events/endpoint_selection_changed.c)
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
target_sources(app PRIVATE src/hid_listener.c)
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
target_sources(app PRIVATE src/keymap.c)
feat(display): Add new peripheral status/display * Add new API/status to track state of the peripheral connection to the central. * Add new peripheral status widget for displaying the current status of the connection to the central.
2022-04-26 15:00:46 +10:00
target_sources(app PRIVATE src/events/layer_state_changed.c)
target_sources(app PRIVATE src/events/modifiers_state_changed.c)
target_sources(app PRIVATE src/events/keycode_state_changed.c)
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
if (CONFIG_ZMK_BLE)
feat(display): Add new peripheral status/display * Add new API/status to track state of the peripheral connection to the central. * Add new peripheral status widget for displaying the current status of the connection to the central.
2022-04-26 15:00:46 +10:00
target_sources(app PRIVATE src/events/ble_active_profile_changed.c)
target_sources(app PRIVATE src/behaviors/behavior_bt.c)
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
target_sources(app PRIVATE src/ble.c)
target_sources(app PRIVATE src/hog.c)
endif()
feat(bluetooth): Add back profiles, split fixes. * Add back in profiles, not using Zephyr BT identity infrastructure. * Restore additional `&bt` commands for profile operations. * Fix for split pairing and subscriptions, since Zephyr persists subscriptions across connects. * Remove keymap from peripheral builds, reduces firmware size, and avoids unneeded attempts to send HID data.
2020-09-09 13:26:00 +10:00
endif()
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
Only include behavior if feature enabled
2020-07-25 13:48:48 +10:00
target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
feat(lighting): add backlight behavior
2021-10-10 03:24:37 +11:00
target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/behaviors/behavior_backlight.c)
feat(display): Add new peripheral status/display * Add new API/status to track state of the peripheral connection to the central. * Add new peripheral status widget for displaying the current status of the connection to the central.
2022-04-26 15:00:46 +10:00
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
feat(battery): Add BAS GATT reporting
2020-10-28 07:10:59 +11:00
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/battery.c)
refactor(split): Seperate peripheral BLE handling. * Move foundational BLE code for split peripherals to a dedicated file to avoid tons of conditionals and awkward code.
2022-04-25 07:22:20 +10:00
refactor(split): cmake split clean up. * Cleaner cmake setup for split build.
2022-05-23 13:44:30 +10:00
target_sources_ifdef(CONFIG_ZMK_SPLIT app PRIVATE src/events/split_peripheral_status_changed.c)
add_subdirectory(src/split)
refactor: Move to USB_DEVICE_STACK symbol. See: https://docs.zephyrproject.org/latest/releases/release-notes-2.7.html#changes-in-this-release
2021-11-05 15:21:30 +11:00
target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
fix(usb): Split HID from core USB, logging fix. * Split core USB init from USB HID init. * Tweak logging to avoid "log loop" causing spurious buffer messages on startup.
2022-04-13 13:20:35 +10:00
target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
Add base files and configuration for RGB underglow
2020-07-24 16:06:56 +10:00
target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
feat(lighting): add backlight behavior
2021-10-10 03:24:37 +11:00
target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c)
Initial work.
2020-04-22 06:20:34 +10:00
target_sources(app PRIVATE src/main.c)
stop on fatal errors
2020-09-01 06:24:36 +10:00
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-09-01 00:18:19 +10:00
add_subdirectory(src/display/)
feat(bluetooth): Proper bond management, identity support for non-splits * Add `bt` behavior that can be used to perform certain actions, such as next/prev identity, reset identity, etc. NOTE: Multiple identities is only supported for non-split shields, due to missing Zephyr identity functionality for dual central/peripheral devices. * Proper bond reset tied to action, that honors peripheral bonds, so folks can reset and pair to other hosts, without breaking bonds between splt halves.
2020-08-29 04:15:16 +10:00
zephyr_cc_option(-Wfatal-errors)
Reference in a new issue Copy permalink