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
2020-12-22 15:56:00 +00:00 · 2020-12-22 15:56:00 +00:00 · 842aa5a842
parent 6927abee6e
commit 842aa5a842
140 changed files with 195 additions and 177 deletions
--- 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";
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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;
--- 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"
--- a/app/include/dt-bindings/zmk/kscan_mock.h
+++ 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)
--- 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))
+#include "matrix_transform.h"
--- a/app/include/dt-bindings/zmk/matrix_transform.h
+++ 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))
--- a/app/include/zmk/event_manager.h
+++ b/app/include/zmk/event_manager.h
--- 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 {
--- 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;
--- 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>
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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 {
--- 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 {
--- 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>

--- 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;

--- 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);
--- 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);
--- 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);

--- 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);
--- 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};
--- 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
--- 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;
--- 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>
--- 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);
--- 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[];
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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>
--- 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;
--- 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
--- 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

--- 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

--- 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);
--- 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>

--- 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);

--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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>



--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- a/Show More
+++ b/Show More