tgrosinger/zmk
1
0
Fork 0
Code Actions Packages

fix(kscan): Adjust composite kscan priority

Browse Source 
* Composite kscan needs a dedicated priority to be sure it is
  initialized after the other kscan instances.
This commit is contained in:
Peter Johanson 2023-11-10 03:51:42 +00:00 committed by Pete Johanson
parent a81a2d37a8
commit 552347b8a4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/module/drivers/kscan/Kconfig
View File

@ -14,6 +14,14 @@ config ZMK_KSCAN_COMPOSITE_DRIVER
bool bool
default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_COMPOSITE)) 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 config ZMK_KSCAN_GPIO_DRIVER
bool bool
select GPIO select GPIO

2
app/module/drivers/kscan/kscan_composite.c
View File

@ -109,4 +109,4 @@ static const struct kscan_composite_config kscan_composite_config = {};
static struct kscan_composite_data kscan_composite_data; static struct kscan_composite_data kscan_composite_data;
DEVICE_DT_INST_DEFINE(0, kscan_composite_init, NULL, &kscan_composite_data, &kscan_composite_config, 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);