diff options
| author | innovaker <66737976+innovaker@users.noreply.github.com> | 2020-12-22 15:56:00 +0000 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-28 01:15:35 -0500 |
| commit | 842aa5a842e117b7b00e49258ca0bde44dc0c789 (patch) | |
| tree | 5202f081b9af5480610645aa53eab11d45a09105 | |
| parent | 6927abee6ef0c604fae1c8544fc933a56be14e77 (diff) | |
refactor: replace filename hyphens with underscores
Aligns *.h and *.c to underscore naming convention.
These were kept (with warnings) for backwards compatibility with external boards/shields:
- kscan-mock.h
- matrix-transform.h
They should be removed in the future.
PR: #523
140 files changed, 195 insertions, 177 deletions
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts index 85c4ca5..1e2755d 100644 --- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts +++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts @@ -7,7 +7,7 @@ /dts-v1/; #include <st/f3/stm32f303Xc.dtsi> -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { model = "DZ60RGB, Rev 1"; diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay index bbb23b6..2c1ed79 100644 --- a/app/boards/native_posix.overlay +++ b/app/boards/native_posix.overlay @@ -1,6 +1,6 @@ #include <behaviors.dtsi> #include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { chosen { diff --git a/app/boards/shields/boardsource3x4/boardsource3x4.overlay b/app/boards/shields/boardsource3x4/boardsource3x4.overlay index ad51794..0b8f849 100644 --- a/app/boards/shields/boardsource3x4/boardsource3x4.overlay +++ b/app/boards/shields/boardsource3x4/boardsource3x4.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/corne/corne.dtsi b/app/boards/shields/corne/corne.dtsi index 4360aea..bb37d67 100644 --- a/app/boards/shields/corne/corne.dtsi +++ b/app/boards/shields/corne/corne.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index 43f9049..a99a8e5 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ - #include <dt-bindings/zmk/matrix-transform.h> + #include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/crbn/crbn.overlay b/app/boards/shields/crbn/crbn.overlay index 137e685..0f7cd45 100644 --- a/app/boards/shields/crbn/crbn.overlay +++ b/app/boards/shields/crbn/crbn.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/iris/iris.dtsi b/app/boards/shields/iris/iris.dtsi index 9ea1dd6..eb06573 100644 --- a/app/boards/shields/iris/iris.dtsi +++ b/app/boards/shields/iris/iris.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/jian/jian.dtsi b/app/boards/shields/jian/jian.dtsi index 331624e..88bac83 100644 --- a/app/boards/shields/jian/jian.dtsi +++ b/app/boards/shields/jian/jian.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/jorne/jorne.dtsi b/app/boards/shields/jorne/jorne.dtsi index 7e6cfd8..67ea9d1 100644 --- a/app/boards/shields/jorne/jorne.dtsi +++ b/app/boards/shields/jorne/jorne.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi index bbead84..c0bec79 100644 --- a/app/boards/shields/kyria/kyria.dtsi +++ b/app/boards/shields/kyria/kyria.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/lily58/lily58.dtsi b/app/boards/shields/lily58/lily58.dtsi index eb69fa7..db54cf4 100644 --- a/app/boards/shields/lily58/lily58.dtsi +++ b/app/boards/shields/lily58/lily58.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay index 0824f1c..18d0651 100644 --- a/app/boards/shields/m60/m60.overlay +++ b/app/boards/shields/m60/m60.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi index 55c67dd..ee2114d 100644 --- a/app/boards/shields/microdox/microdox.dtsi +++ b/app/boards/shields/microdox/microdox.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/nibble/nibble.overlay b/app/boards/shields/nibble/nibble.overlay index 7975c3c..fd1b2f6 100644 --- a/app/boards/shields/nibble/nibble.overlay +++ b/app/boards/shields/nibble/nibble.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/qaz/qaz.overlay b/app/boards/shields/qaz/qaz.overlay index 4e73370..205f7c2 100644 --- a/app/boards/shields/qaz/qaz.overlay +++ b/app/boards/shields/qaz/qaz.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/quefrency/quefrency.dtsi b/app/boards/shields/quefrency/quefrency.dtsi index 5f1e908..411d365 100644 --- a/app/boards/shields/quefrency/quefrency.dtsi +++ b/app/boards/shields/quefrency/quefrency.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/reviung41/reviung41.overlay b/app/boards/shields/reviung41/reviung41.overlay index 06270ca..5336853 100644 --- a/app/boards/shields/reviung41/reviung41.overlay +++ b/app/boards/shields/reviung41/reviung41.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/romac/romac.overlay b/app/boards/shields/romac/romac.overlay index f6b0f72..e0880d3 100644 --- a/app/boards/shields/romac/romac.overlay +++ b/app/boards/shields/romac/romac.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/romac_plus/romac_plus.dtsi b/app/boards/shields/romac_plus/romac_plus.dtsi index 9b148ca..48f7341 100644 --- a/app/boards/shields/romac_plus/romac_plus.dtsi +++ b/app/boards/shields/romac_plus/romac_plus.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT
*/
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
/ {
chosen {
diff --git a/app/boards/shields/settings_reset/settings_reset.overlay b/app/boards/shields/settings_reset/settings_reset.overlay index a2b5799..7a6629f 100644 --- a/app/boards/shields/settings_reset/settings_reset.overlay +++ b/app/boards/shields/settings_reset/settings_reset.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index b4edb5f..9c55fc3 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/splitreus62/splitreus62.dtsi b/app/boards/shields/splitreus62/splitreus62.dtsi index c2bfbc4..d88d06c 100644 --- a/app/boards/shields/splitreus62/splitreus62.dtsi +++ b/app/boards/shields/splitreus62/splitreus62.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/tg4x/tg4x.overlay b/app/boards/shields/tg4x/tg4x.overlay index 10ce524..4b9d4f5 100644 --- a/app/boards/shields/tg4x/tg4x.overlay +++ b/app/boards/shields/tg4x/tg4x.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { diff --git a/app/boards/shields/tidbit/tidbit.dtsi b/app/boards/shields/tidbit/tidbit.dtsi index 7a2b3de..004de31 100644 --- a/app/boards/shields/tidbit/tidbit.dtsi +++ b/app/boards/shields/tidbit/tidbit.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { kscan0: kscan { diff --git a/app/drivers/kscan/kscan_mock.c b/app/drivers/kscan/kscan_mock.c index 8b40ab4..fc0c9c5 100644 --- a/app/drivers/kscan/kscan_mock.c +++ b/app/drivers/kscan/kscan_mock.c @@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> struct kscan_mock_data { kscan_callback_t callback; diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h index eff218b..4ed666c 100644 --- a/app/include/dt-bindings/zmk/kscan-mock.h +++ b/app/include/dt-bindings/zmk/kscan-mock.h @@ -4,11 +4,6 @@ * SPDX-License-Identifier: MIT */ -#pragma once +#warning "kscan-mock.h has been deprecated and superseded by kscan_mock.h" -#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) -#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31)) -#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16)) -#define ZMK_MOCK_ROW(v) (v & 0xFF) -#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF) -#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16) +#include "kscan_mock.h"
\ No newline at end of file diff --git a/app/include/dt-bindings/zmk/kscan_mock.h b/app/include/dt-bindings/zmk/kscan_mock.h new file mode 100644 index 0000000..eff218b --- /dev/null +++ b/app/include/dt-bindings/zmk/kscan_mock.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) +#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31)) +#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16)) +#define ZMK_MOCK_ROW(v) (v & 0xFF) +#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF) +#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16) diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h index 2989cb6..223b142 100644 --- a/app/include/dt-bindings/zmk/matrix-transform.h +++ b/app/include/dt-bindings/zmk/matrix-transform.h @@ -4,7 +4,6 @@ * SPDX-License-Identifier: MIT */ -#define KT_ROW(item) (item >> 8) -#define KT_COL(item) (item & 0xFF) +#warning "matrix-transform.h has been deprecated and superseded by matrix_transform.h" -#define RC(row, col) (((row) << 8) + (col))
\ No newline at end of file +#include "matrix_transform.h"
\ No newline at end of file diff --git a/app/include/dt-bindings/zmk/matrix_transform.h b/app/include/dt-bindings/zmk/matrix_transform.h new file mode 100644 index 0000000..2989cb6 --- /dev/null +++ b/app/include/dt-bindings/zmk/matrix_transform.h @@ -0,0 +1,10 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#define KT_ROW(item) (item >> 8) +#define KT_COL(item) (item & 0xFF) + +#define RC(row, col) (((row) << 8) + (col))
\ No newline at end of file diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event_manager.h index 31c5322..31c5322 100644 --- a/app/include/zmk/event-manager.h +++ b/app/include/zmk/event_manager.h diff --git a/app/include/zmk/events/activity-state-changed.h b/app/include/zmk/events/activity_state_changed.h index cd4c618..511fbad 100644 --- a/app/include/zmk/events/activity-state-changed.h +++ b/app/include/zmk/events/activity_state_changed.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> #include <zmk/activity.h> struct activity_state_changed { diff --git a/app/include/zmk/events/battery-state-changed.h b/app/include/zmk/events/battery_state_changed.h index a983820..47e44ba 100644 --- a/app/include/zmk/events/battery-state-changed.h +++ b/app/include/zmk/events/battery_state_changed.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> struct battery_state_changed { struct zmk_event_header header; diff --git a/app/include/zmk/events/ble-active-profile-changed.h b/app/include/zmk/events/ble_active_profile_changed.h index 4491dfc..fa16126 100644 --- a/app/include/zmk/events/ble-active-profile-changed.h +++ b/app/include/zmk/events/ble_active_profile_changed.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> #include <device.h> #include <zmk/ble/profile.h> diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode_state_changed.h index 7dc87e2..28282b6 100644 --- a/app/include/zmk/events/keycode-state-changed.h +++ b/app/include/zmk/events/keycode_state_changed.h @@ -9,7 +9,7 @@ #include <zephyr.h> #include <dt-bindings/zmk/modifiers.h> #include <dt-bindings/zmk/hid_usage_pages.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> #include <zmk/keys.h> struct keycode_state_changed { diff --git a/app/include/zmk/events/layer-state-changed.h b/app/include/zmk/events/layer_state_changed.h index 352c602..cf24002 100644 --- a/app/include/zmk/events/layer-state-changed.h +++ b/app/include/zmk/events/layer_state_changed.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> struct layer_state_changed { struct zmk_event_header header; diff --git a/app/include/zmk/events/modifiers-state-changed.h b/app/include/zmk/events/modifiers_state_changed.h index d2e02f8..c4daede 100644 --- a/app/include/zmk/events/modifiers-state-changed.h +++ b/app/include/zmk/events/modifiers_state_changed.h @@ -8,7 +8,7 @@ #include <zephyr.h> #include <zmk/keys.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> struct modifiers_state_changed { struct zmk_event_header header; diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position_state_changed.h index 7058276..0f1ac1b 100644 --- a/app/include/zmk/events/position-state-changed.h +++ b/app/include/zmk/events/position_state_changed.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> struct position_state_changed { struct zmk_event_header header; diff --git a/app/include/zmk/events/sensor-event.h b/app/include/zmk/events/sensor_event.h index 0bd3ccf..14fb2d3 100644 --- a/app/include/zmk/events/sensor-event.h +++ b/app/include/zmk/events/sensor_event.h @@ -7,7 +7,7 @@ #pragma once #include <zephyr.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> #include <device.h> struct sensor_event { diff --git a/app/include/zmk/events/usb-conn-state-changed.h b/app/include/zmk/events/usb_conn_state_changed.h index d6cc698..b38fb9f 100644 --- a/app/include/zmk/events/usb-conn-state-changed.h +++ b/app/include/zmk/events/usb_conn_state_changed.h @@ -9,7 +9,7 @@ #include <zephyr.h> #include <usb/usb_device.h> -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> #include <zmk/usb.h> struct usb_conn_state_changed { diff --git a/app/src/activity.c b/app/src/activity.c index c441fa9..8fe912a 100644 --- a/app/src/activity.c +++ b/app/src/activity.c @@ -12,10 +12,10 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <zmk/event-manager.h> -#include <zmk/events/activity-state-changed.h> -#include <zmk/events/position-state-changed.h> -#include <zmk/events/sensor-event.h> +#include <zmk/event_manager.h> +#include <zmk/events/activity_state_changed.h> +#include <zmk/events/position_state_changed.h> +#include <zmk/events/sensor_event.h> #include <zmk/activity.h> diff --git a/app/src/battery.c b/app/src/battery.c index 7a09ad7..917af9c 100644 --- a/app/src/battery.c +++ b/app/src/battery.c @@ -14,8 +14,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <zmk/event-manager.h> -#include <zmk/events/battery-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/battery_state_changed.h> const struct device *battery; diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c index 556273e..d303960 100644 --- a/app/src/behaviors/behavior_hold_tap.c +++ b/app/src/behaviors/behavior_hold_tap.c @@ -14,10 +14,10 @@ #include <zmk/behavior.h> #include <zmk/matrix.h> #include <zmk/endpoints.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> -#include <zmk/events/keycode-state-changed.h> -#include <zmk/events/modifiers-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> +#include <zmk/events/keycode_state_changed.h> +#include <zmk/events/modifiers_state_changed.h> #include <zmk/behavior.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c index aa19ca9..df0828a 100644 --- a/app/src/behaviors/behavior_key_press.c +++ b/app/src/behaviors/behavior_key_press.c @@ -10,8 +10,8 @@ #include <drivers/behavior.h> #include <logging/log.h> -#include <zmk/event-manager.h> -#include <zmk/events/keycode-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/keycode_state_changed.h> #include <zmk/behavior.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c index a0e0acc..1e659a1 100644 --- a/app/src/behaviors/behavior_sensor_rotate_key_press.c +++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c @@ -11,8 +11,8 @@ #include <logging/log.h> #include <drivers/sensor.h> -#include <zmk/event-manager.h> -#include <zmk/events/keycode-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/keycode_state_changed.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c index 4695c7a..643ae48 100644 --- a/app/src/behaviors/behavior_sticky_key.c +++ b/app/src/behaviors/behavior_sticky_key.c @@ -13,10 +13,10 @@ #include <zmk/matrix.h> #include <zmk/endpoints.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> -#include <zmk/events/keycode-state-changed.h> -#include <zmk/events/modifiers-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> +#include <zmk/events/keycode_state_changed.h> +#include <zmk/events/modifiers_state_changed.h> #include <zmk/hid.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/ble.c b/app/src/ble.c index 9cfef4b..4d42287 100644 --- a/app/src/ble.c +++ b/app/src/ble.c @@ -32,8 +32,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/ble.h> #include <zmk/keys.h> #include <zmk/split/bluetooth/uuid.h> -#include <zmk/event-manager.h> -#include <zmk/events/ble-active-profile-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/ble_active_profile_changed.h> static struct bt_conn *auth_passkey_entry_conn; static uint8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0}; diff --git a/app/src/display/main.c b/app/src/display/main.c index ea1e21a..0bef656 100644 --- a/app/src/display/main.c +++ b/app/src/display/main.c @@ -14,8 +14,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <drivers/display.h> #include <lvgl.h> -#include <zmk/event-manager.h> -#include <zmk/events/activity-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/activity_state_changed.h> #include <zmk/display/status_screen.h> #define ZMK_DISPLAY_NAME CONFIG_LVGL_DISPLAY_DEV_NAME diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c index b412da2..346c519 100644 --- a/app/src/display/widgets/battery_status.c +++ b/app/src/display/widgets/battery_status.c @@ -11,9 +11,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/display/widgets/battery_status.h> #include <zmk/usb.h> -#include <zmk/events/usb-conn-state-changed.h> -#include <zmk/event-manager.h> -#include <zmk/events/battery-state-changed.h> +#include <zmk/events/usb_conn_state_changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/battery_state_changed.h> static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets); static lv_style_t label_style; diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c index 143c778..9a72511 100644 --- a/app/src/display/widgets/output_status.c +++ b/app/src/display/widgets/output_status.c @@ -10,9 +10,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/display/widgets/output_status.h> -#include <zmk/event-manager.h> -#include <zmk/events/usb-conn-state-changed.h> -#include <zmk/events/ble-active-profile-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/usb_conn_state_changed.h> +#include <zmk/events/ble_active_profile_changed.h> #include <zmk/usb.h> #include <zmk/ble.h> #include <zmk/endpoints.h> diff --git a/app/src/endpoints.c b/app/src/endpoints.c index b126f33..9f32f19 100644 --- a/app/src/endpoints.c +++ b/app/src/endpoints.c @@ -13,9 +13,9 @@ #include <dt-bindings/zmk/hid_usage_pages.h> #include <zmk/usb.h> #include <zmk/hog.h> -#include <zmk/event-manager.h> -#include <zmk/events/ble-active-profile-changed.h> -#include <zmk/events/usb-conn-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/ble_active_profile_changed.h> +#include <zmk/events/usb_conn_state_changed.h> #include <logging/log.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/src/event_manager.c b/app/src/event_manager.c index 8c454e9..872f5c8 100644 --- a/app/src/event_manager.c +++ b/app/src/event_manager.c @@ -9,7 +9,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <zmk/event-manager.h> +#include <zmk/event_manager.h> extern struct zmk_event_type *__event_type_start[]; extern struct zmk_event_type *__event_type_end[]; diff --git a/app/src/events/activity_state_changed.c b/app/src/events/activity_state_changed.c index 47aefea..001e6a1 100644 --- a/app/src/events/activity_state_changed.c +++ b/app/src/events/activity_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/activity-state-changed.h> +#include <zmk/events/activity_state_changed.h> ZMK_EVENT_IMPL(activity_state_changed);
\ No newline at end of file diff --git a/app/src/events/battery_state_changed.c b/app/src/events/battery_state_changed.c index 4b937e3..ed6147a 100644 --- a/app/src/events/battery_state_changed.c +++ b/app/src/events/battery_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/battery-state-changed.h> +#include <zmk/events/battery_state_changed.h> ZMK_EVENT_IMPL(battery_state_changed);
\ No newline at end of file diff --git a/app/src/events/ble_active_profile_changed.c b/app/src/events/ble_active_profile_changed.c index 06988e2..e2d172f 100644 --- a/app/src/events/ble_active_profile_changed.c +++ b/app/src/events/ble_active_profile_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/ble-active-profile-changed.h> +#include <zmk/events/ble_active_profile_changed.h> ZMK_EVENT_IMPL(ble_active_profile_changed);
\ No newline at end of file diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c index 9a1984a..d46126b 100644 --- a/app/src/events/keycode_state_changed.c +++ b/app/src/events/keycode_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/keycode-state-changed.h> +#include <zmk/events/keycode_state_changed.h> ZMK_EVENT_IMPL(keycode_state_changed); diff --git a/app/src/events/layer_state_changed.c b/app/src/events/layer_state_changed.c index e456711..e7f8039 100644 --- a/app/src/events/layer_state_changed.c +++ b/app/src/events/layer_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/layer-state-changed.h> +#include <zmk/events/layer_state_changed.h> ZMK_EVENT_IMPL(layer_state_changed);
\ No newline at end of file diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c index 8becd02..4143796 100644 --- a/app/src/events/modifiers_state_changed.c +++ b/app/src/events/modifiers_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/modifiers-state-changed.h> +#include <zmk/events/modifiers_state_changed.h> ZMK_EVENT_IMPL(modifiers_state_changed);
\ No newline at end of file diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c index f8f1a26..b80314b 100644 --- a/app/src/events/position_state_changed.c +++ b/app/src/events/position_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/position-state-changed.h> +#include <zmk/events/position_state_changed.h> ZMK_EVENT_IMPL(position_state_changed);
\ No newline at end of file diff --git a/app/src/events/sensor_event.c b/app/src/events/sensor_event.c index c6b80cd..6811e7d 100644 --- a/app/src/events/sensor_event.c +++ b/app/src/events/sensor_event.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/sensor-event.h> +#include <zmk/events/sensor_event.h> ZMK_EVENT_IMPL(sensor_event);
\ No newline at end of file diff --git a/app/src/events/usb_conn_state_changed.c b/app/src/events/usb_conn_state_changed.c index d845f6d..c299da7 100644 --- a/app/src/events/usb_conn_state_changed.c +++ b/app/src/events/usb_conn_state_changed.c @@ -5,6 +5,6 @@ */ #include <kernel.h> -#include <zmk/events/usb-conn-state-changed.h> +#include <zmk/events/usb_conn_state_changed.h> ZMK_EVENT_IMPL(usb_conn_state_changed);
\ No newline at end of file diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c index 534831c..cf8835a 100644 --- a/app/src/hid_listener.c +++ b/app/src/hid_listener.c @@ -9,9 +9,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <zmk/event-manager.h> -#include <zmk/events/keycode-state-changed.h> -#include <zmk/events/modifiers-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/keycode_state_changed.h> +#include <zmk/events/modifiers_state_changed.h> #include <zmk/hid.h> #include <dt-bindings/zmk/hid_usage_pages.h> #include <zmk/endpoints.h> diff --git a/app/src/keymap.c b/app/src/keymap.c index cab6d47..cafe2ff 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -14,10 +14,10 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <drivers/behavior.h> #include <zmk/behavior.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> -#include <zmk/events/layer-state-changed.h> -#include <zmk/events/sensor-event.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> +#include <zmk/events/layer_state_changed.h> +#include <zmk/events/sensor_event.h> static zmk_keymap_layers_state _zmk_keymap_layer_state = 0; static uint8_t _zmk_keymap_layer_default = 0; diff --git a/app/src/kscan.c b/app/src/kscan.c index c22d71b..6b84490 100644 --- a/app/src/kscan.c +++ b/app/src/kscan.c @@ -12,8 +12,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/matrix_transform.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> #define ZMK_KSCAN_EVENT_STATE_PRESSED 0 #define ZMK_KSCAN_EVENT_STATE_RELEASED 1 diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c index 33be93d..8f54f31 100644 --- a/app/src/matrix_transform.c +++ b/app/src/matrix_transform.c @@ -7,7 +7,7 @@ #include <zephyr.h> #include <zmk/matrix_transform.h> #include <zmk/matrix.h> -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> #ifdef ZMK_KEYMAP_TRANSFORM_NODE diff --git a/app/src/sensors.c b/app/src/sensors.c index 5b4f683..5e9ef15 100644 --- a/app/src/sensors.c +++ b/app/src/sensors.c @@ -13,8 +13,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/sensors.h> -#include <zmk/event-manager.h> -#include <zmk/events/sensor-event.h> +#include <zmk/event_manager.h> +#include <zmk/events/sensor_event.h> #if ZMK_KEYMAP_HAS_SENSORS diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c index c41894f..5ad83ad 100644 --- a/app/src/split/bluetooth/central.c +++ b/app/src/split/bluetooth/central.c @@ -19,8 +19,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/ble.h> #include <zmk/split/bluetooth/uuid.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> #include <init.h> static int start_scan(void); diff --git a/app/src/split_listener.c b/app/src/split_listener.c index b2adfb2..153ed99 100644 --- a/app/src/split_listener.c +++ b/app/src/split_listener.c @@ -14,8 +14,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/position_state_changed.h> #include <zmk/hid.h> #include <zmk/endpoints.h> diff --git a/app/src/usb.c b/app/src/usb.c index 2b3de78..7900ace 100644 --- a/app/src/usb.c +++ b/app/src/usb.c @@ -12,8 +12,8 @@ #include <zmk/hid.h> #include <zmk/keymap.h> -#include <zmk/event-manager.h> -#include <zmk/events/usb-conn-state-changed.h> +#include <zmk/event_manager.h> +#include <zmk/events/usb_conn_state_changed.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); diff --git a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap index 10336ef..040cdd3 100644 --- a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap index aa93b86..11d033f 100644 --- a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap index 6f08689..abb31b4 100644 --- a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap index 392d328..38575e9 100644 --- a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap index 77306cd..21baa44 100644 --- a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap index 1441331..cd7ff38 100644 --- a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap index c10c6d6..b84aa62 100644 --- a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap index ce163f5..bdfaf9d 100644 --- a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap index 7abda41..c0fd1bd 100644 --- a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap index ce030af..69c1967 100644 --- a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap index 5467660..301ef0a 100644 --- a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap +++ b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/balanced/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/behavior_keymap.dtsi index 7d18bb6..34a4d45 100644 --- a/app/tests/hold-tap/balanced/behavior_keymap.dtsi +++ b/app/tests/hold-tap/balanced/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { behaviors { diff --git a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap b/app/tests/hold-tap/balanced/many-nested/native_posix.keymap index f51ffb5..7941e4d 100644 --- a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap +++ b/app/tests/hold-tap/balanced/many-nested/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { behaviors { diff --git a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap index 10336ef..040cdd3 100644 --- a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap index aa93b86..11d033f 100644 --- a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap index 6f08689..abb31b4 100644 --- a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap index 392d328..38575e9 100644 --- a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap index 77306cd..21baa44 100644 --- a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap index 1441331..cd7ff38 100644 --- a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap index c10c6d6..b84aa62 100644 --- a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap index ce163f5..bdfaf9d 100644 --- a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap index 7abda41..c0fd1bd 100644 --- a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap index ce030af..69c1967 100644 --- a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap index 5467660..301ef0a 100644 --- a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap +++ b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi index 64847a5..e614319 100644 --- a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi +++ b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> diff --git a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap index 10336ef..040cdd3 100644 --- a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap index aa93b86..11d033f 100644 --- a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap index 6f08689..abb31b4 100644 --- a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap index 392d328..38575e9 100644 --- a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap index 77306cd..21baa44 100644 --- a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap index 1441331..cd7ff38 100644 --- a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap index c10c6d6..b84aa62 100644 --- a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap index ce163f5..bdfaf9d 100644 --- a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap index 7abda41..c0fd1bd 100644 --- a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap index ce030af..69c1967 100644 --- a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap index 5467660..301ef0a 100644 --- a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap +++ b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi index 6e91466..e6d33c0 100644 --- a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi +++ b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { behaviors { diff --git a/app/tests/keypress/behavior_keymap.dtsi b/app/tests/keypress/behavior_keymap.dtsi index 64851a8..f0c5d0c 100644 --- a/app/tests/keypress/behavior_keymap.dtsi +++ b/app/tests/keypress/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap index 1f3502d..26af565 100644 --- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap +++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap index 9c7d7c8..9df2c15 100644 --- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap +++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap index 34bb522..5f9375f 100644 --- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap +++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap index 68e4de7..1b175d4 100644 --- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap +++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap index 73fa7cc..0e9a2d6 100644 --- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap +++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap index 109d60e..10d0dbf 100644 --- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap +++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap index 09816d9..3d6494d 100644 --- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap +++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap index 1de00a0..d5f372f 100644 --- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap +++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> &kscan { diff --git a/app/tests/momentary-layer/1-normal/native_posix.keymap b/app/tests/momentary-layer/1-normal/native_posix.keymap index 2fc24d2..b5249f7 100644 --- a/app/tests/momentary-layer/1-normal/native_posix.keymap +++ b/app/tests/momentary-layer/1-normal/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" / { diff --git a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap b/app/tests/momentary-layer/2-early-key-release/native_posix.keymap index 9ffa5f6..96e4e8d 100644 --- a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap +++ b/app/tests/momentary-layer/2-early-key-release/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" / { diff --git a/app/tests/momentary-layer/3-covered/native_posix.keymap b/app/tests/momentary-layer/3-covered/native_posix.keymap index 2484d8b..2dde6d8 100644 --- a/app/tests/momentary-layer/3-covered/native_posix.keymap +++ b/app/tests/momentary-layer/3-covered/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> /* this test verifies that the correct key is released when a layer is enabled "on top" diff --git a/app/tests/momentary-layer/4-nested/native_posix.keymap b/app/tests/momentary-layer/4-nested/native_posix.keymap index 0eb77d2..fd376d0 100644 --- a/app/tests/momentary-layer/4-nested/native_posix.keymap +++ b/app/tests/momentary-layer/4-nested/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap index a67035b..c467aea 100644 --- a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap +++ b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/momentary-layer/behavior_keymap.dtsi b/app/tests/momentary-layer/behavior_keymap.dtsi index a5b6c12..40bc31e 100644 --- a/app/tests/momentary-layer/behavior_keymap.dtsi +++ b/app/tests/momentary-layer/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/none/behavior_keymap.dtsi b/app/tests/none/behavior_keymap.dtsi index 0a4f7cb..40d863c 100644 --- a/app/tests/none/behavior_keymap.dtsi +++ b/app/tests/none/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/none/layered/native_posix.keymap b/app/tests/none/layered/native_posix.keymap index 59ea481..597ca2d 100644 --- a/app/tests/none/layered/native_posix.keymap +++ b/app/tests/none/layered/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/none/normal/native_posix.keymap b/app/tests/none/normal/native_posix.keymap index 94d7539..cbeb61d 100644 --- a/app/tests/none/normal/native_posix.keymap +++ b/app/tests/none/normal/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap b/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap index dd2e6ea..d0f26b2 100644 --- a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap +++ b/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap index c96eb9f..2d078ba 100644 --- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap +++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap index 3c33908..438880d 100644 --- a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap +++ b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap index e9290a3..067f237 100644 --- a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap +++ b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap index 84daad6..d58641b 100644 --- a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap +++ b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap index 71a0a1b..aac6725 100644 --- a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap +++ b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap index 7a9901b..66bb72d 100644 --- a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap +++ b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap index 45cef50..beedd44 100644 --- a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap +++ b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap index 2fcc3ff..d4c30fb 100644 --- a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap +++ b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/sticky-keys/behavior_keymap.dtsi b/app/tests/sticky-keys/behavior_keymap.dtsi index ae46396..f127700 100644 --- a/app/tests/sticky-keys/behavior_keymap.dtsi +++ b/app/tests/sticky-keys/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/toggle-layer/behavior_keymap.dtsi b/app/tests/toggle-layer/behavior_keymap.dtsi index 2523d86..b9c0d4a 100644 --- a/app/tests/toggle-layer/behavior_keymap.dtsi +++ b/app/tests/toggle-layer/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/toggle-layer/early-key-release/native_posix.keymap b/app/tests/toggle-layer/early-key-release/native_posix.keymap index 6b2b8f2..6c29339 100644 --- a/app/tests/toggle-layer/early-key-release/native_posix.keymap +++ b/app/tests/toggle-layer/early-key-release/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/toggle-layer/normal/native_posix.keymap b/app/tests/toggle-layer/normal/native_posix.keymap index 202c105..9df9d64 100644 --- a/app/tests/toggle-layer/normal/native_posix.keymap +++ b/app/tests/toggle-layer/normal/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/transparent/behavior_keymap.dtsi b/app/tests/transparent/behavior_keymap.dtsi index d6c5e27..2a7e783 100644 --- a/app/tests/transparent/behavior_keymap.dtsi +++ b/app/tests/transparent/behavior_keymap.dtsi @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> / { keymap { diff --git a/app/tests/transparent/layered/native_posix.keymap b/app/tests/transparent/layered/native_posix.keymap index 59ea481..597ca2d 100644 --- a/app/tests/transparent/layered/native_posix.keymap +++ b/app/tests/transparent/layered/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/app/tests/transparent/normal/native_posix.keymap b/app/tests/transparent/normal/native_posix.keymap index 94d7539..cbeb61d 100644 --- a/app/tests/transparent/normal/native_posix.keymap +++ b/app/tests/transparent/normal/native_posix.keymap @@ -1,6 +1,6 @@ #include <dt-bindings/zmk/keys.h> #include <behaviors.dtsi> -#include <dt-bindings/zmk/kscan-mock.h> +#include <dt-bindings/zmk/kscan_mock.h> #include "../behavior_keymap.dtsi" &kscan { diff --git a/docs/docs/development/new-shield.md b/docs/docs/development/new-shield.md index 306f1b3..18f8b42 100644 --- a/docs/docs/development/new-shield.md +++ b/docs/docs/development/new-shield.md @@ -163,7 +163,7 @@ It is preferred to define only the `col-gpios` or `row-gpios` in the common shie For `col2row` directed boards like the iris, the shared .dtsi file may look like this: ``` -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { @@ -315,7 +315,7 @@ Whenever that default key position mapping is insufficient, the `<shield_name>.o Here is an example for the [nice60](https://github.com/Nicell/nice60), which uses an efficient 8x8 GPIO matrix, and uses a transform: ``` -#include <dt-bindings/zmk/matrix-transform.h> +#include <dt-bindings/zmk/matrix_transform.h> / { chosen { @@ -344,7 +344,7 @@ RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7 Some important things to note: -- The `#include <dt-bindings/zmk/matrix-transform.h>` is critical. The `RC` macro is used to generate the internal storage in the matrix transform, and is actually replaced by a C preprocessor before the final devicetree is compiled into ZMK. +- The `#include <dt-bindings/zmk/matrix_transform.h>` is critical. The `RC` macro is used to generate the internal storage in the matrix transform, and is actually replaced by a C preprocessor before the final devicetree is compiled into ZMK. - `RC(row, column)` is placed sequentially to define what row and column values that position corresponds to. - If you have a keyboard with options for `2u` keys in certain positions, or break away portions, it is a good idea to set the chosen `zmk,matrix_transform` to the default arrangement, and include _other_ possible matrix transform nodes in the devicetree that users can select in their user config by overriding the chosen node. |