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

74 lines
3.6 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)
Lots of clean up, basic kscan working, remove zephyr-rust.
2020-05-02 04:58:00 +10:00
list(APPEND BOARD_ROOT ${CMAKE_SOURCE_DIR})
Get *basic* USB report sending working.
2020-05-06 06:09:05 +10:00
list(APPEND DTS_ROOT ${CMAKE_SOURCE_DIR})
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)
list(APPEND ZEPHYR_EXTRA_MODULES
${CMAKE_CURRENT_SOURCE_DIR}/drivers
)
list(APPEND SYSCALL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/drivers/zephyr)
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
include(cmake/zmk_config.cmake)
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)
feat(power): Initial deep sleep work. * New ZMK_SLEEP Kconfig symbol to enable the functionality. * Switch to PORT events that allows wake from deep sleep. * Initial basic power management policy, with idle ms, and ignoring deep sleep if we detect a USB connection.
2020-10-02 16:09:38 +10:00
target_sources_ifdef(CONFIG_ZMK_SLEEP app PRIVATE src/power.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)
Some initial BEL HoG support.
2020-05-15 23:41:06 +10:00
target_sources(app PRIVATE src/hid.c)
Initial behavior for key presses on encoder rotate
2020-07-23 01:08:52 +10:00
target_sources(app PRIVATE src/sensors.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)
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)
Modifier event, tweaks for linker script.
2020-07-01 00:43:09 +10:00
target_sources(app PRIVATE src/events/keycode_state_changed.c)
target_sources(app PRIVATE src/events/modifiers_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(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_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c)
refactor(battery): Fire event on battery event.
2020-11-02 16:10:21 +11:00
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
feat: only send HID reports to one endpoint Added some utility functions and an event for tracking the state of the USB connection. Updated endpoints.c to select a single endpoint to send HID reports to based on the status of the USB and BLE connections. Partially fixes #206. Future commits will add a user setting to control which endpoint is used if both USB and BLE are ready.
2020-10-12 09:03:21 +11:00
target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.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
if (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL)
target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
target_sources(app PRIVATE src/behaviors/behavior_reset.c)
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(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(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)
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)
New behavior for ext power control
2020-10-10 12:29:07 +11:00
target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.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)
endif()
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(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
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/behaviors/behavior_bt.c)
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
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.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)
Lots of work on split peripheral/central logic.
2020-07-03 13:34:11 +10:00
target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split_listener.c)
target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split/bluetooth/service.c)
target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL app PRIVATE src/split/bluetooth/central.c)
Add a mock kscan driver, working native_posix. * Unified logging to one module. * Mock kscan driver that simulates events. * Working native_posix board target for testing.
2020-05-25 08:22:16 +10:00
target_sources_ifdef(CONFIG_ZMK_KSCAN_MOCK_DRIVER app PRIVATE src/kscan_mock.c)
Initial composite kscan driver. * For now, to be used for FrankenKyria, where both matrix halves will be attached to the same MCU, but should be a stepping stone to proper split support once we have a kscan driver over a split transport. * Implement multiple instances for mock kscan driver.
2020-05-27 14:48:03 +10:00
target_sources_ifdef(CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER app PRIVATE src/kscan_composite.c)
refactor(usb): Report USB status w/o HID output.
2020-10-05 09:18:44 +11:00
target_sources_ifdef(CONFIG_USB app PRIVATE src/usb.c)
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
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.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)
Some refactoring to prep for BLE support.
2020-05-13 04:15:33 +10:00
target_sources(app PRIVATE src/endpoints.c)
Initial stab at mod-tap improvements. * Not working: Roll over + mod-tap with multiple mod-tap bindings!
2020-07-31 14:07:16 +10:00
target_sources(app PRIVATE src/hid_listener.c)
fix(rgb): check if settings enabled
2020-08-24 06:56:18 +10:00
target_sources_ifdef(CONFIG_SETTINGS app PRIVATE src/settings.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