aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/module
diff options
context:
space:
mode:
authorPeter Johanson <[email protected]>2023-11-10 03:51:42 +0000
committerPete Johanson <[email protected]>2024-02-09 14:32:46 -0800
commit552347b8a4945f464554c74b261433ebc8f66f43 (patch)
tree606058c4c80539fd9629deb506f4fb0e75b3faf8 /app/module
parenta81a2d37a8bacbae0dbc0aba8a8833232f7a1b39 (diff)
downloadzmk-552347b8a4945f464554c74b261433ebc8f66f43.tar.gz
zmk-552347b8a4945f464554c74b261433ebc8f66f43.zip
fix(kscan): Adjust composite kscan priority
* Composite kscan needs a dedicated priority to be sure it is initialized after the other kscan instances.
Diffstat (limited to 'app/module')
-rw-r--r--app/module/drivers/kscan/Kconfig8
-rw-r--r--app/module/drivers/kscan/kscan_composite.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/app/module/drivers/kscan/Kconfig b/app/module/drivers/kscan/Kconfig
index 6b701936d4..88848dff93 100644
--- a/app/module/drivers/kscan/Kconfig
+++ b/app/module/drivers/kscan/Kconfig
@@ -14,6 +14,14 @@ config ZMK_KSCAN_COMPOSITE_DRIVER
bool
default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_COMPOSITE))
+if ZMK_KSCAN_COMPOSITE_DRIVER
+
+config ZMK_KSCAN_COMPOSITE_INIT_PRIORITY
+ int "Init Priority for the composite kscan driver"
+ default 95
+
+endif
+
config ZMK_KSCAN_GPIO_DRIVER
bool
select GPIO
diff --git a/app/module/drivers/kscan/kscan_composite.c b/app/module/drivers/kscan/kscan_composite.c
index 97311ef8e5..2a3643245c 100644
--- a/app/module/drivers/kscan/kscan_composite.c
+++ b/app/module/drivers/kscan/kscan_composite.c
@@ -109,4 +109,4 @@ static const struct kscan_composite_config kscan_composite_config = {};
static struct kscan_composite_data kscan_composite_data;
DEVICE_DT_INST_DEFINE(0, kscan_composite_init, NULL, &kscan_composite_data, &kscan_composite_config,
- POST_KERNEL, CONFIG_KSCAN_INIT_PRIORITY, &mock_driver_api);
+ POST_KERNEL, CONFIG_ZMK_KSCAN_COMPOSITE_INIT_PRIORITY, &mock_driver_api);