diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 367f41e0..ff57b59f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -24,9 +24,9 @@ target_sources(app PRIVATE src/stdlib.c) target_sources(app PRIVATE src/activity.c) target_sources(app PRIVATE src/kscan.c) target_sources(app PRIVATE src/matrix_transform.c) -target_sources(app PRIVATE src/mouse/key_listener.c) -target_sources(app PRIVATE src/mouse/main.c) -target_sources(app PRIVATE src/mouse/tick_listener.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/key_listener.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/main.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/tick_listener.c) target_sources(app PRIVATE src/sensors.c) target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c) target_sources(app PRIVATE src/event_manager.c) @@ -34,10 +34,10 @@ target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/ext_power_generic.c) target_sources(app PRIVATE src/events/activity_state_changed.c) target_sources(app PRIVATE src/events/position_state_changed.c) target_sources(app PRIVATE src/events/sensor_event.c) -target_sources(app PRIVATE src/events/mouse_button_state_changed.c) -target_sources(app PRIVATE src/events/mouse_move_state_changed.c) -target_sources(app PRIVATE src/events/mouse_tick.c) -target_sources(app PRIVATE src/events/mouse_scroll_state_changed.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/events/mouse_button_state_changed.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/events/mouse_move_state_changed.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/events/mouse_tick.c) +target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/events/mouse_scroll_state_changed.c) target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c) target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) @@ -61,9 +61,9 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL) target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE app PRIVATE src/behaviors/behavior_sensor_rotate.c) target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_VAR app PRIVATE src/behaviors/behavior_sensor_rotate_var.c) target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON app PRIVATE src/behaviors/behavior_sensor_rotate_common.c) - target_sources(app PRIVATE src/behaviors/behavior_mouse_key_press.c) - target_sources(app PRIVATE src/behaviors/behavior_mouse_move.c) - target_sources(app PRIVATE src/behaviors/behavior_mouse_scroll.c) + target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/behaviors/behavior_mouse_key_press.c) + target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/behaviors/behavior_mouse_move.c) + target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/behaviors/behavior_mouse_scroll.c) target_sources(app PRIVATE src/combo.c) target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c) target_sources(app PRIVATE src/behavior_queue.c) diff --git a/app/src/endpoints.c b/app/src/endpoints.c index 4beeb971..9b4cec45 100644 --- a/app/src/endpoints.c +++ b/app/src/endpoints.c @@ -193,6 +193,7 @@ int zmk_endpoints_send_report(uint16_t usage_page) { return -ENOTSUP; } +#if IS_ENABLED(CONFIG_ZMK_MOUSE) int zmk_endpoints_send_mouse_report() { struct zmk_hid_mouse_report *mouse_report = zmk_hid_get_mouse_report(); @@ -226,6 +227,7 @@ int zmk_endpoints_send_mouse_report() { return -ENOTSUP; } } +#endif /* IS_ENABLED(CONFIG_ZMK_MOUSE) */ #if IS_ENABLED(CONFIG_SETTINGS) @@ -331,7 +333,9 @@ static int zmk_endpoints_init(const struct device *_arg) { static void disconnect_current_endpoint() { zmk_hid_keyboard_clear(); zmk_hid_consumer_clear(); +#if IS_ENABLED(CONFIG_ZMK_MOUSE) zmk_hid_mouse_clear(); +#endif zmk_endpoints_send_report(HID_USAGE_KEY); zmk_endpoints_send_report(HID_USAGE_CONSUMER); diff --git a/app/src/hid.c b/app/src/hid.c index 27e1ae91..3232a704 100644 --- a/app/src/hid.c +++ b/app/src/hid.c @@ -16,8 +16,10 @@ static struct zmk_hid_keyboard_report keyboard_report = { static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body = {.keys = {0}}}; +#if IS_ENABLED(CONFIG_ZMK_MOUSE) static struct zmk_hid_mouse_report mouse_report = { .report_id = 4, .body = {.buttons = 0, .x = 0, .y = 0, .scroll_x = 0, .scroll_y = 0}}; +#endif // Keep track of how often a modifier was pressed. // Only release the modifier if the count is 0. @@ -267,6 +269,7 @@ bool zmk_hid_is_pressed(uint32_t usage) { return false; } +#if IS_ENABLED(CONFIG_ZMK_MOUSE) // Keep track of how often a button was pressed. // Only release the button if the count is 0. static int explicit_button_counts[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -345,6 +348,7 @@ void zmk_hid_mouse_scroll_update(int8_t x, int8_t y) { mouse_report.body.scroll_y); } void zmk_hid_mouse_clear() { memset(&mouse_report.body, 0, sizeof(mouse_report.body)); } +#endif /* IS_ENABLED(CONFIG_ZMK_MOUSE) */ struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report() { return &keyboard_report; @@ -354,6 +358,8 @@ struct zmk_hid_consumer_report *zmk_hid_get_consumer_report() { return &consumer_report; } +#if IS_ENABLED(CONFIG_ZMK_MOUSE) struct zmk_hid_mouse_report *zmk_hid_get_mouse_report() { return &mouse_report; } +#endif diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c index 199deeea..2b847082 100644 --- a/app/src/hid_listener.c +++ b/app/src/hid_listener.c @@ -11,6 +11,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include +#include #include #include #include @@ -85,14 +86,13 @@ static int hid_listener_keycode_released(const struct zmk_keycode_state_changed } int hid_listener(const zmk_event_t *eh) { - const struct zmk_keycode_state_changed *kc_ev = as_zmk_keycode_state_changed(eh); - if (kc_ev) { - if (kc_ev->state) { - hid_listener_keycode_pressed(kc_ev); + const struct zmk_keycode_state_changed *ev = as_zmk_keycode_state_changed(eh); + if (ev) { + if (ev->state) { + hid_listener_keycode_pressed(ev); } else { - hid_listener_keycode_released(kc_ev); + hid_listener_keycode_released(ev); } - return 0; } return 0; } diff --git a/app/src/hog.c b/app/src/hog.c index 4d0cb498..d6de7290 100644 --- a/app/src/hog.c +++ b/app/src/hog.c @@ -56,10 +56,13 @@ static struct hids_report consumer_input = { .type = HIDS_INPUT, }; + +#if IS_ENABLED(CONFIG_ZMK_MOUSE) static struct hids_report mouse_input = { .id = 0x04, .type = HIDS_INPUT, }; +#endif static bool host_requests_notification = false; static uint8_t ctrl_point; @@ -98,12 +101,14 @@ static ssize_t read_hids_consumer_input_report(struct bt_conn *conn, sizeof(struct zmk_hid_consumer_report_body)); } +#if IS_ENABLED(CONFIG_ZMK_MOUSE) static ssize_t read_hids_mouse_input_report(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, uint16_t len, uint16_t offset) { struct zmk_hid_mouse_report_body *report_body = &zmk_hid_get_mouse_report()->body; return bt_gatt_attr_read(conn, attr, buf, len, offset, report_body, sizeof(struct zmk_hid_mouse_report_body)); } +#endif // static ssize_t write_proto_mode(struct bt_conn *conn, // const struct bt_gatt_attr *attr, @@ -152,11 +157,13 @@ BT_GATT_SERVICE_DEFINE( BT_GATT_DESCRIPTOR(BT_UUID_HIDS_REPORT_REF, BT_GATT_PERM_READ_ENCRYPT, read_hids_report_ref, NULL, &consumer_input), +#if IS_ENABLED(CONFIG_ZMK_MOUSE) BT_GATT_CHARACTERISTIC(BT_UUID_HIDS_REPORT, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_READ_ENCRYPT, read_hids_mouse_input_report, NULL, NULL), BT_GATT_CCC(input_ccc_changed, BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT), BT_GATT_DESCRIPTOR(BT_UUID_HIDS_REPORT_REF, BT_GATT_PERM_READ_ENCRYPT, read_hids_report_ref, NULL, &mouse_input), +#endif BT_GATT_CHARACTERISTIC(BT_UUID_HIDS_CTRL_POINT, BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_WRITE, NULL, write_ctrl_point, &ctrl_point)); @@ -280,6 +287,7 @@ int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *report) { return 0; }; +#if IS_ENABLED(CONFIG_ZMK_MOUSE) K_MSGQ_DEFINE(zmk_hog_mouse_msgq, sizeof(struct zmk_hid_mouse_report_body), CONFIG_ZMK_BLE_MOUSE_REPORT_QUEUE_SIZE, 4); @@ -349,6 +357,7 @@ int zmk_hog_send_mouse_report_direct(struct zmk_hid_mouse_report_body *report) { return 0; }; +#endif /* IS_ENABLED(CONFIG_ZMK_MOUSE) */ int zmk_hog_init(const struct device *_arg) { static const struct k_work_queue_config queue_config = {.name = "HID Over GATT Send Work"}; diff --git a/app/src/main.c b/app/src/main.c index a420f969..b62cd596 100644 --- a/app/src/main.c +++ b/app/src/main.c @@ -21,8 +21,6 @@ LOG_MODULE_REGISTER(zmk, CONFIG_ZMK_LOG_LEVEL); #include #endif /* CONFIG_ZMK_MOUSE */ -#define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID) - void main(void) { LOG_INF("Welcome to ZMK!\n");