Skip to content

Commit 6d0f343

Browse files
petejohansonpetejohanson
committed
feat: Add input split support.
1 parent 09deaa4 commit 6d0f343

File tree

10 files changed

+469
-64
lines changed

10 files changed

+469
-64
lines changed

‎app/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_sta
4343
target_sources(app PRIVATE src/behaviors/behavior_reset.c)
4444
target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
4545
target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SOFT_OFF app PRIVATE src/behaviors/behavior_soft_off.c)
46+
add_subdirectory_ifdef(CONFIG_ZMK_MOUSE src/mouse/)
4647
if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
4748
target_sources(app PRIVATE src/hid.c)
48-
add_subdirectory_ifdef(CONFIG_ZMK_MOUSE src/mouse/)
4949
target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
5050
target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_KEY_TOGGLE app PRIVATE src/behaviors/behavior_key_toggle.c)
5151
target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_HOLD_TAP app PRIVATE src/behaviors/behavior_hold_tap.c)

‎app/dts/bindings/zmk,input-split.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) 2024 The ZMK Contributors
2+
# SPDX-License-Identifier: MIT
3+
4+
include: [base.yaml]
5+
6+
compatible: "zmk,input-split"
7+
8+
description: Device to wire up an input device for split use.
9+
10+
properties:
11+
reg:
12+
required: true
13+
14+
device:
15+
type: phandle
16+
17+
input-processors:
18+
type: phandle-array

‎app/include/zmk/mouse/input_split.h

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* Copyright (c) 2024 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
6+
7+
#pragma once
8+
9+
int zmk_input_split_report_peripheral_event(uint8_t reg, uint8_t type, uint16_t code, int32_t value,
10+
bool sync);

‎app/include/zmk/split/bluetooth/service.h

+9
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,17 @@ struct zmk_split_run_behavior_payload {
3131
char behavior_dev[ZMK_SPLIT_RUN_BEHAVIOR_DEV_LEN];
3232
} __packed;
3333

34+
struct zmk_split_input_event_payload {
35+
uint8_t type;
36+
uint16_t code;
37+
uint32_t value;
38+
uint8_t sync;
39+
} __packed;
40+
3441
int zmk_split_bt_position_pressed(uint8_t position);
3542
int zmk_split_bt_position_released(uint8_t position);
3643
int zmk_split_bt_sensor_triggered(uint8_t sensor_index,
3744
const struct zmk_sensor_channel_data channel_data[],
3845
size_t channel_data_size);
46+
47+
int zmk_split_bt_report_input(uint8_t reg, uint8_t type, uint16_t code, int32_t value, bool sync);

‎app/include/zmk/split/bluetooth/uuid.h

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
#define ZMK_SPLIT_BT_CHAR_SENSOR_STATE_UUID ZMK_BT_SPLIT_UUID(0x00000003)
2020
#define ZMK_SPLIT_BT_UPDATE_HID_INDICATORS_UUID ZMK_BT_SPLIT_UUID(0x00000004)
2121
#define ZMK_SPLIT_BT_SELECT_PHYS_LAYOUT_UUID ZMK_BT_SPLIT_UUID(0x00000005)
22+
#define ZMK_SPLIT_BT_INPUT_EVENT_UUID ZMK_BT_SPLIT_UUID(0x00000006)

‎app/src/mouse/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Copyright (c) 2024 The ZMK Contributors
22
# SPDX-License-Identifier: MIT
33

4-
target_sources(app PRIVATE input_listener.c)
4+
target_sources_ifdef(CONFIG_ZMK_INPUT_LISTENER app PRIVATE input_listener.c)
55
target_sources_ifdef(CONFIG_ZMK_INPUT_PROCESSOR_TRANSFORM app PRIVATE input_processor_transform.c)
66
target_sources_ifdef(CONFIG_ZMK_INPUT_PROCESSOR_SCALER app PRIVATE input_processor_scaler.c)
77
target_sources_ifdef(CONFIG_ZMK_INPUT_PROCESSOR_TEMP_LAYER app PRIVATE input_processor_temp_layer.c)
88
target_sources_ifdef(CONFIG_ZMK_INPUT_PROCESSOR_CODE_MAPPER app PRIVATE input_processor_code_mapper.c)
9-
target_sources_ifdef(CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING app PRIVATE resolution_multipliers.c)
9+
target_sources_ifdef(CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING app PRIVATE resolution_multipliers.c)
10+
target_sources_ifdef(CONFIG_ZMK_INPUT_SPLIT app PRIVATE input_split.c)

‎app/src/mouse/Kconfig

+32-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,29 @@ if ZMK_MOUSE
1414
config INPUT_GPIO_KEYS
1515
default n
1616

17+
config INPUT_THREAD_STACK_SIZE
18+
default 1024 if ZMK_SPLIT && !ZMK_SPLIT_ROLE_CENTRAL
19+
20+
if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
21+
1722
config ZMK_MOUSE_SMOOTH_SCROLLING
1823
bool "Smooth Scrolling"
1924
help
2025
Enable smooth scrolling, with hosts that support HID Resolution Multipliers
2126

27+
config ZMK_INPUT_LISTENER
28+
bool "Input listener for processing input events in the system"
29+
default y
30+
depends on DT_HAS_ZMK_INPUT_LISTENER_ENABLED
31+
32+
33+
config ZMK_INPUT_PROCESSOR_TEMP_LAYER
34+
bool "Temporary Layer Input Processor"
35+
default y
36+
depends on DT_HAS_ZMK_INPUT_PROCESSOR_TEMP_LAYER_ENABLED
37+
38+
endif
39+
2240
config ZMK_INPUT_PROCESSOR_TRANSFORM
2341
bool "Transform Input Processor"
2442
default y
@@ -29,16 +47,24 @@ config ZMK_INPUT_PROCESSOR_SCALER
2947
default y
3048
depends on DT_HAS_ZMK_INPUT_PROCESSOR_SCALER_ENABLED
3149

32-
config ZMK_INPUT_PROCESSOR_TEMP_LAYER
33-
bool "Temporary Layer Input Processor"
34-
default y
35-
depends on DT_HAS_ZMK_INPUT_PROCESSOR_TEMP_LAYER_ENABLED
36-
3750
config ZMK_INPUT_PROCESSOR_CODE_MAPPER
3851
bool "Code Mapper Input Processor"
3952
default y
4053
depends on DT_HAS_ZMK_INPUT_PROCESSOR_CODE_MAPPER_ENABLED
4154

42-
endif
55+
config ZMK_INPUT_SPLIT
56+
bool "Split input support"
57+
default y
58+
depends on DT_HAS_ZMK_INPUT_SPLIT_ENABLED && ZMK_SPLIT
59+
60+
if ZMK_INPUT_SPLIT
61+
62+
config ZMK_INPUT_SPLIT_INIT_PRIORITY
63+
int "Input Split initialization priority"
64+
default INPUT_INIT_PRIORITY
65+
66+
endif # ZMK_INPUT_SPLIT
67+
68+
endif # ZMK_MOUSE
4369

4470
endmenu # Mouse Options

‎app/src/mouse/input_split.c

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* Copyright (c) 2024 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
6+
7+
#define DT_DRV_COMPAT zmk_input_split
8+
9+
#include <zephyr/kernel.h>
10+
#include <zephyr/device.h>
11+
#include <zephyr/input/input.h>
12+
#include <drivers/input_processor.h>
13+
14+
#include <zephyr/logging/log.h>
15+
16+
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
17+
18+
#if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
19+
20+
struct zis_entry {
21+
uint8_t reg;
22+
const struct device *dev;
23+
};
24+
25+
#define ZIS_ENTRY(n) {.reg = DT_INST_REG_ADDR(n), .dev = DEVICE_DT_GET(DT_DRV_INST(n))},
26+
27+
static const struct zis_entry proxy_inputs[] = {DT_INST_FOREACH_STATUS_OKAY(ZIS_ENTRY)};
28+
29+
int zmk_input_split_report_peripheral_event(uint8_t reg, uint8_t type, uint16_t code, int32_t value,
30+
bool sync) {
31+
LOG_DBG("Got peripheral event for %d!", reg);
32+
for (size_t i = 0; i < ARRAY_SIZE(proxy_inputs); i++) {
33+
if (reg == proxy_inputs[i].reg) {
34+
return input_report(proxy_inputs[i].dev, type, code, value, sync, K_NO_WAIT);
35+
}
36+
}
37+
38+
return -ENODEV;
39+
}
40+
41+
#define ZIS_INST(n) \
42+
DEVICE_DT_INST_DEFINE(n, NULL, NULL, NULL, NULL, POST_KERNEL, \
43+
CONFIG_ZMK_INPUT_SPLIT_INIT_PRIORITY, NULL);
44+
45+
#else
46+
47+
#include <zmk/split/bluetooth/service.h>
48+
49+
#define ZIS_INST(n) \
50+
static const struct zmk_input_processor_entry processors_##n[] = \
51+
COND_CODE_1(DT_INST_NODE_HAS_PROP(n, input_processors), \
52+
({LISTIFY(DT_INST_PROP_LEN(n, input_processors), \
53+
ZMK_INPUT_PROCESSOR_ENTRY_AT_IDX, (, ), DT_DRV_INST(n))}), \
54+
({})); \
55+
BUILD_ASSERT(DT_INST_NODE_HAS_PROP(n, device), \
56+
"Peripheral input splits need an `input` property set"); \
57+
void split_input_handler_##n(struct input_event *evt) { \
58+
for (size_t i = 0; i < ARRAY_SIZE(processors_##n); i++) { \
59+
zmk_input_processor_handle_event(processors_##n[i].dev, evt, processors_##n[i].param1, \
60+
processors_##n[i].param2, NULL); \
61+
} \
62+
zmk_split_bt_report_input(DT_INST_REG_ADDR(n), evt->type, evt->code, evt->value, \
63+
evt->sync); \
64+
} \
65+
INPUT_CALLBACK_DEFINE(DEVICE_DT_GET(DT_INST_PHANDLE(n, device)), split_input_handler_##n);
66+
67+
#endif
68+
69+
DT_INST_FOREACH_STATUS_OKAY(ZIS_INST)

0 commit comments

Comments
 (0)