From 842aa5a842e117b7b00e49258ca0bde44dc0c789 Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Tue, 22 Dec 2020 15:56:00 +0000 Subject: 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 --- app/boards/arm/dz60rgb/dz60rgb_rev1.dts | 2 +- app/boards/native_posix.overlay | 2 +- .../shields/boardsource3x4/boardsource3x4.overlay | 2 +- app/boards/shields/corne/corne.dtsi | 2 +- app/boards/shields/cradio/cradio.dtsi | 2 +- app/boards/shields/crbn/crbn.overlay | 2 +- app/boards/shields/iris/iris.dtsi | 2 +- app/boards/shields/jian/jian.dtsi | 2 +- app/boards/shields/jorne/jorne.dtsi | 2 +- app/boards/shields/kyria/kyria.dtsi | 2 +- app/boards/shields/lily58/lily58.dtsi | 2 +- app/boards/shields/m60/m60.overlay | 2 +- app/boards/shields/microdox/microdox.dtsi | 2 +- app/boards/shields/nibble/nibble.overlay | 2 +- app/boards/shields/qaz/qaz.overlay | 2 +- app/boards/shields/quefrency/quefrency.dtsi | 2 +- app/boards/shields/reviung41/reviung41.overlay | 2 +- app/boards/shields/romac/romac.overlay | 2 +- app/boards/shields/romac_plus/romac_plus.dtsi | 2 +- .../shields/settings_reset/settings_reset.overlay | 2 +- app/boards/shields/sofle/sofle.dtsi | 2 +- app/boards/shields/splitreus62/splitreus62.dtsi | 2 +- app/boards/shields/tg4x/tg4x.overlay | 2 +- app/boards/shields/tidbit/tidbit.dtsi | 2 +- app/drivers/kscan/kscan_mock.c | 2 +- app/include/dt-bindings/zmk/kscan-mock.h | 9 +-- app/include/dt-bindings/zmk/kscan_mock.h | 14 ++++ app/include/dt-bindings/zmk/matrix-transform.h | 5 +- app/include/dt-bindings/zmk/matrix_transform.h | 10 +++ app/include/zmk/event-manager.h | 81 ---------------------- app/include/zmk/event_manager.h | 81 ++++++++++++++++++++++ app/include/zmk/events/activity-state-changed.h | 26 ------- app/include/zmk/events/activity_state_changed.h | 26 +++++++ app/include/zmk/events/battery-state-changed.h | 18 ----- app/include/zmk/events/battery_state_changed.h | 18 +++++ .../zmk/events/ble-active-profile-changed.h | 21 ------ .../zmk/events/ble_active_profile_changed.h | 21 ++++++ app/include/zmk/events/keycode-state-changed.h | 43 ------------ app/include/zmk/events/keycode_state_changed.h | 43 ++++++++++++ app/include/zmk/events/layer-state-changed.h | 28 -------- app/include/zmk/events/layer_state_changed.h | 28 ++++++++ app/include/zmk/events/modifiers-state-changed.h | 28 -------- app/include/zmk/events/modifiers_state_changed.h | 28 ++++++++ app/include/zmk/events/position-state-changed.h | 19 ----- app/include/zmk/events/position_state_changed.h | 19 +++++ app/include/zmk/events/sensor-event.h | 20 ------ app/include/zmk/events/sensor_event.h | 20 ++++++ app/include/zmk/events/usb-conn-state-changed.h | 20 ------ app/include/zmk/events/usb_conn_state_changed.h | 20 ++++++ app/src/activity.c | 8 +-- app/src/battery.c | 4 +- app/src/behaviors/behavior_hold_tap.c | 8 +-- app/src/behaviors/behavior_key_press.c | 4 +- .../behaviors/behavior_sensor_rotate_key_press.c | 4 +- app/src/behaviors/behavior_sticky_key.c | 8 +-- app/src/ble.c | 4 +- app/src/display/main.c | 4 +- app/src/display/widgets/battery_status.c | 6 +- app/src/display/widgets/output_status.c | 6 +- app/src/endpoints.c | 6 +- app/src/event_manager.c | 2 +- app/src/events/activity_state_changed.c | 2 +- app/src/events/battery_state_changed.c | 2 +- app/src/events/ble_active_profile_changed.c | 2 +- app/src/events/keycode_state_changed.c | 2 +- app/src/events/layer_state_changed.c | 2 +- app/src/events/modifiers_state_changed.c | 2 +- app/src/events/position_state_changed.c | 2 +- app/src/events/sensor_event.c | 2 +- app/src/events/usb_conn_state_changed.c | 2 +- app/src/hid_listener.c | 6 +- app/src/keymap.c | 8 +-- app/src/kscan.c | 4 +- app/src/matrix_transform.c | 2 +- app/src/sensors.c | 4 +- app/src/split/bluetooth/central.c | 4 +- app/src/split_listener.c | 4 +- app/src/usb.c | 4 +- .../hold-tap/balanced/1-dn-up/native_posix.keymap | 2 +- .../balanced/2-dn-timer-up/native_posix.keymap | 2 +- .../3a-moddn-dn-modup-up/native_posix.keymap | 2 +- .../3b-moddn-dn-modup-timer-up/native_posix.keymap | 2 +- .../3c-kcdn-dn-kcup-up/native_posix.keymap | 2 +- .../3d-kcdn-dn-kcup-timer-up/native_posix.keymap | 2 +- .../4a-dn-htdn-timer-htup-up/native_posix.keymap | 2 +- .../4a-dn-kcdn-timer-kcup-up/native_posix.keymap | 2 +- .../4b-dn-kcdn-kcup-timer-up/native_posix.keymap | 2 +- .../4c-dn-kcdn-kcup-up/native_posix.keymap | 2 +- .../4d-dn-kcdn-timer-up-kcup/native_posix.keymap | 2 +- app/tests/hold-tap/balanced/behavior_keymap.dtsi | 2 +- .../balanced/many-nested/native_posix.keymap | 2 +- .../hold-preferred/1-dn-up/native_posix.keymap | 2 +- .../2-dn-timer-up/native_posix.keymap | 2 +- .../3a-moddn-dn-modup-up/native_posix.keymap | 2 +- .../3b-moddn-dn-modup-timer-up/native_posix.keymap | 2 +- .../3c-kcdn-dn-kcup-up/native_posix.keymap | 2 +- .../3d-kcdn-dn-kcup-timer-up/native_posix.keymap | 2 +- .../4a-dn-htdn-timer-htup-up/native_posix.keymap | 2 +- .../4a-dn-kcdn-timer-kcup-up/native_posix.keymap | 2 +- .../4b-dn-kcdn-kcup-timer-up/native_posix.keymap | 2 +- .../4c-dn-kcdn-kcup-up/native_posix.keymap | 2 +- .../4d-dn-kcdn-timer-up-kcup/native_posix.keymap | 2 +- .../hold-tap/hold-preferred/behavior_keymap.dtsi | 2 +- .../tap-preferred/1-dn-up/native_posix.keymap | 2 +- .../2-dn-timer-up/native_posix.keymap | 2 +- .../3a-moddn-dn-modup-up/native_posix.keymap | 2 +- .../3b-moddn-dn-modup-timer-up/native_posix.keymap | 2 +- .../3c-kcdn-dn-kcup-up/native_posix.keymap | 2 +- .../3d-kcdn-dn-kcup-timer-up/native_posix.keymap | 2 +- .../4a-dn-htdn-timer-htup-up/native_posix.keymap | 2 +- .../4a-dn-kcdn-timer-kcup-up/native_posix.keymap | 2 +- .../4b-dn-kcdn-kcup-timer-up/native_posix.keymap | 2 +- .../4c-dn-kcdn-kcup-up/native_posix.keymap | 2 +- .../4d-dn-kcdn-timer-up-kcup/native_posix.keymap | 2 +- .../hold-tap/tap-preferred/behavior_keymap.dtsi | 2 +- app/tests/keypress/behavior_keymap.dtsi | 2 +- .../native_posix.keymap | 2 +- .../kp-lctl-dn-lctl-up/native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../momentary-layer/1-normal/native_posix.keymap | 2 +- .../2-early-key-release/native_posix.keymap | 2 +- .../momentary-layer/3-covered/native_posix.keymap | 2 +- .../momentary-layer/4-nested/native_posix.keymap | 2 +- .../5-nested-early-key-release/native_posix.keymap | 2 +- app/tests/momentary-layer/behavior_keymap.dtsi | 2 +- app/tests/none/behavior_keymap.dtsi | 2 +- app/tests/none/layered/native_posix.keymap | 2 +- app/tests/none/normal/native_posix.keymap | 2 +- .../sticky-keys/1-os-dn-up/native_posix.keymap | 2 +- .../2-os-dn-up-kcdn-kcup/native_posix.keymap | 2 +- .../3a-os-dn-kcdn-kcup-up/native_posix.keymap | 2 +- .../3b-os-dn-kcdn-up-kcup/native_posix.keymap | 2 +- .../4-os-dn-up-kcdn-timer-kcup/native_posix.keymap | 2 +- .../5-os-kcdn-dn-kcup-up/native_posix.keymap | 2 +- .../native_posix.keymap | 2 +- .../8-lsk-osk-combination/native_posix.keymap | 2 +- .../9-sk-dn-up-dn-up/native_posix.keymap | 2 +- app/tests/sticky-keys/behavior_keymap.dtsi | 2 +- app/tests/toggle-layer/behavior_keymap.dtsi | 2 +- .../early-key-release/native_posix.keymap | 2 +- app/tests/toggle-layer/normal/native_posix.keymap | 2 +- app/tests/transparent/behavior_keymap.dtsi | 2 +- app/tests/transparent/layered/native_posix.keymap | 2 +- app/tests/transparent/normal/native_posix.keymap | 2 +- 149 files changed, 487 insertions(+), 469 deletions(-) create mode 100644 app/include/dt-bindings/zmk/kscan_mock.h create mode 100644 app/include/dt-bindings/zmk/matrix_transform.h delete mode 100644 app/include/zmk/event-manager.h create mode 100644 app/include/zmk/event_manager.h delete mode 100644 app/include/zmk/events/activity-state-changed.h create mode 100644 app/include/zmk/events/activity_state_changed.h delete mode 100644 app/include/zmk/events/battery-state-changed.h create mode 100644 app/include/zmk/events/battery_state_changed.h delete mode 100644 app/include/zmk/events/ble-active-profile-changed.h create mode 100644 app/include/zmk/events/ble_active_profile_changed.h delete mode 100644 app/include/zmk/events/keycode-state-changed.h create mode 100644 app/include/zmk/events/keycode_state_changed.h delete mode 100644 app/include/zmk/events/layer-state-changed.h create mode 100644 app/include/zmk/events/layer_state_changed.h delete mode 100644 app/include/zmk/events/modifiers-state-changed.h create mode 100644 app/include/zmk/events/modifiers_state_changed.h delete mode 100644 app/include/zmk/events/position-state-changed.h create mode 100644 app/include/zmk/events/position_state_changed.h delete mode 100644 app/include/zmk/events/sensor-event.h create mode 100644 app/include/zmk/events/sensor_event.h delete mode 100644 app/include/zmk/events/usb-conn-state-changed.h create mode 100644 app/include/zmk/events/usb_conn_state_changed.h (limited to 'app') 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 -#include +#include / { 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 #include -#include +#include / { 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 +#include / { 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 +#include / { 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 + #include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include / { 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 +#include 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 deleted file mode 100644 index 31c5322..0000000 --- a/app/include/zmk/event-manager.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include - -struct zmk_event_type { - const char *name; -}; - -struct zmk_event_header { - const struct zmk_event_type *event; - uint8_t last_listener_index; -}; - -#define ZMK_EV_EVENT_HANDLED 1 -#define ZMK_EV_EVENT_CAPTURED 2 - -typedef int (*zmk_listener_callback_t)(const struct zmk_event_header *eh); -struct zmk_listener { - zmk_listener_callback_t callback; -}; - -struct zmk_event_subscription { - const struct zmk_event_type *event_type; - const struct zmk_listener *listener; -}; - -#define ZMK_EVENT_DECLARE(event_type) \ - struct event_type *new_##event_type(); \ - bool is_##event_type(const struct zmk_event_header *eh); \ - struct event_type *cast_##event_type(const struct zmk_event_header *eh); \ - extern const struct zmk_event_type zmk_event_##event_type; - -#define ZMK_EVENT_IMPL(event_type) \ - const struct zmk_event_type zmk_event_##event_type = {.name = STRINGIFY(event_type)}; \ - const struct zmk_event_type *zmk_event_ref_##event_type __used \ - __attribute__((__section__(".event_type"))) = &zmk_event_##event_type; \ - struct event_type *new_##event_type() { \ - struct event_type *ev = (struct event_type *)k_malloc(sizeof(struct event_type)); \ - ev->header.event = &zmk_event_##event_type; \ - return ev; \ - }; \ - bool is_##event_type(const struct zmk_event_header *eh) { \ - return eh->event == &zmk_event_##event_type; \ - }; \ - struct event_type *cast_##event_type(const struct zmk_event_header *eh) { \ - return (struct event_type *)eh; \ - }; - -#define ZMK_LISTENER(mod, cb) const struct zmk_listener zmk_listener_##mod = {.callback = cb}; - -#define ZMK_SUBSCRIPTION(mod, ev_type) \ - const Z_DECL_ALIGN(struct zmk_event_subscription) \ - _CONCAT(_CONCAT(zmk_event_sub_, mod), ev_type) __used \ - __attribute__((__section__(".event_subscription"))) = { \ - .event_type = &zmk_event_##ev_type, \ - .listener = &zmk_listener_##mod, \ - }; - -#define ZMK_EVENT_RAISE(ev) zmk_event_manager_raise((struct zmk_event_header *)ev); - -#define ZMK_EVENT_RAISE_AFTER(ev, mod) \ - zmk_event_manager_raise_after((struct zmk_event_header *)ev, &zmk_listener_##mod); - -#define ZMK_EVENT_RAISE_AT(ev, mod) \ - zmk_event_manager_raise_at((struct zmk_event_header *)ev, &zmk_listener_##mod); - -#define ZMK_EVENT_RELEASE(ev) zmk_event_manager_release((struct zmk_event_header *)ev); - -int zmk_event_manager_raise(struct zmk_event_header *event); -int zmk_event_manager_raise_after(struct zmk_event_header *event, - const struct zmk_listener *listener); -int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_listener *listener); -int zmk_event_manager_release(struct zmk_event_header *event); diff --git a/app/include/zmk/event_manager.h b/app/include/zmk/event_manager.h new file mode 100644 index 0000000..31c5322 --- /dev/null +++ b/app/include/zmk/event_manager.h @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include + +struct zmk_event_type { + const char *name; +}; + +struct zmk_event_header { + const struct zmk_event_type *event; + uint8_t last_listener_index; +}; + +#define ZMK_EV_EVENT_HANDLED 1 +#define ZMK_EV_EVENT_CAPTURED 2 + +typedef int (*zmk_listener_callback_t)(const struct zmk_event_header *eh); +struct zmk_listener { + zmk_listener_callback_t callback; +}; + +struct zmk_event_subscription { + const struct zmk_event_type *event_type; + const struct zmk_listener *listener; +}; + +#define ZMK_EVENT_DECLARE(event_type) \ + struct event_type *new_##event_type(); \ + bool is_##event_type(const struct zmk_event_header *eh); \ + struct event_type *cast_##event_type(const struct zmk_event_header *eh); \ + extern const struct zmk_event_type zmk_event_##event_type; + +#define ZMK_EVENT_IMPL(event_type) \ + const struct zmk_event_type zmk_event_##event_type = {.name = STRINGIFY(event_type)}; \ + const struct zmk_event_type *zmk_event_ref_##event_type __used \ + __attribute__((__section__(".event_type"))) = &zmk_event_##event_type; \ + struct event_type *new_##event_type() { \ + struct event_type *ev = (struct event_type *)k_malloc(sizeof(struct event_type)); \ + ev->header.event = &zmk_event_##event_type; \ + return ev; \ + }; \ + bool is_##event_type(const struct zmk_event_header *eh) { \ + return eh->event == &zmk_event_##event_type; \ + }; \ + struct event_type *cast_##event_type(const struct zmk_event_header *eh) { \ + return (struct event_type *)eh; \ + }; + +#define ZMK_LISTENER(mod, cb) const struct zmk_listener zmk_listener_##mod = {.callback = cb}; + +#define ZMK_SUBSCRIPTION(mod, ev_type) \ + const Z_DECL_ALIGN(struct zmk_event_subscription) \ + _CONCAT(_CONCAT(zmk_event_sub_, mod), ev_type) __used \ + __attribute__((__section__(".event_subscription"))) = { \ + .event_type = &zmk_event_##ev_type, \ + .listener = &zmk_listener_##mod, \ + }; + +#define ZMK_EVENT_RAISE(ev) zmk_event_manager_raise((struct zmk_event_header *)ev); + +#define ZMK_EVENT_RAISE_AFTER(ev, mod) \ + zmk_event_manager_raise_after((struct zmk_event_header *)ev, &zmk_listener_##mod); + +#define ZMK_EVENT_RAISE_AT(ev, mod) \ + zmk_event_manager_raise_at((struct zmk_event_header *)ev, &zmk_listener_##mod); + +#define ZMK_EVENT_RELEASE(ev) zmk_event_manager_release((struct zmk_event_header *)ev); + +int zmk_event_manager_raise(struct zmk_event_header *event); +int zmk_event_manager_raise_after(struct zmk_event_header *event, + const struct zmk_listener *listener); +int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_listener *listener); +int zmk_event_manager_release(struct zmk_event_header *event); diff --git a/app/include/zmk/events/activity-state-changed.h b/app/include/zmk/events/activity-state-changed.h deleted file mode 100644 index cd4c618..0000000 --- a/app/include/zmk/events/activity-state-changed.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include - -struct activity_state_changed { - struct zmk_event_header header; - enum zmk_activity_state state; -}; - -ZMK_EVENT_DECLARE(activity_state_changed); - -static inline struct activity_state_changed * -create_activity_state_changed(enum zmk_activity_state state) { - struct activity_state_changed *ev = new_activity_state_changed(); - ev->state = state; - - return ev; -} \ No newline at end of file diff --git a/app/include/zmk/events/activity_state_changed.h b/app/include/zmk/events/activity_state_changed.h new file mode 100644 index 0000000..511fbad --- /dev/null +++ b/app/include/zmk/events/activity_state_changed.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include + +struct activity_state_changed { + struct zmk_event_header header; + enum zmk_activity_state state; +}; + +ZMK_EVENT_DECLARE(activity_state_changed); + +static inline struct activity_state_changed * +create_activity_state_changed(enum zmk_activity_state state) { + struct activity_state_changed *ev = new_activity_state_changed(); + ev->state = state; + + return ev; +} \ No newline at end of file diff --git a/app/include/zmk/events/battery-state-changed.h b/app/include/zmk/events/battery-state-changed.h deleted file mode 100644 index a983820..0000000 --- a/app/include/zmk/events/battery-state-changed.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include - -struct battery_state_changed { - struct zmk_event_header header; - // TODO: Other battery channels - uint8_t state_of_charge; -}; - -ZMK_EVENT_DECLARE(battery_state_changed); \ No newline at end of file diff --git a/app/include/zmk/events/battery_state_changed.h b/app/include/zmk/events/battery_state_changed.h new file mode 100644 index 0000000..47e44ba --- /dev/null +++ b/app/include/zmk/events/battery_state_changed.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +struct battery_state_changed { + struct zmk_event_header header; + // TODO: Other battery channels + uint8_t state_of_charge; +}; + +ZMK_EVENT_DECLARE(battery_state_changed); \ No newline at end of file diff --git a/app/include/zmk/events/ble-active-profile-changed.h b/app/include/zmk/events/ble-active-profile-changed.h deleted file mode 100644 index 4491dfc..0000000 --- a/app/include/zmk/events/ble-active-profile-changed.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include - -#include - -struct ble_active_profile_changed { - struct zmk_event_header header; - uint8_t index; - struct zmk_ble_profile *profile; -}; - -ZMK_EVENT_DECLARE(ble_active_profile_changed); diff --git a/app/include/zmk/events/ble_active_profile_changed.h b/app/include/zmk/events/ble_active_profile_changed.h new file mode 100644 index 0000000..fa16126 --- /dev/null +++ b/app/include/zmk/events/ble_active_profile_changed.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include + +#include + +struct ble_active_profile_changed { + struct zmk_event_header header; + uint8_t index; + struct zmk_ble_profile *profile; +}; + +ZMK_EVENT_DECLARE(ble_active_profile_changed); diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h deleted file mode 100644 index 7dc87e2..0000000 --- a/app/include/zmk/events/keycode-state-changed.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include -#include -#include - -struct keycode_state_changed { - struct zmk_event_header header; - uint8_t usage_page; - uint32_t keycode; - uint8_t implicit_modifiers; - bool state; - int64_t timestamp; -}; - -ZMK_EVENT_DECLARE(keycode_state_changed); - -static inline struct keycode_state_changed * -keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) { - uint16_t page = HID_USAGE_PAGE(encoded) & 0xFF; - uint16_t id = HID_USAGE_ID(encoded); - zmk_mod_flags implicit_mods = SELECT_MODS(encoded); - - if (!page) { - page = HID_USAGE_KEY; - } - - struct keycode_state_changed *ev = new_keycode_state_changed(); - ev->usage_page = page; - ev->keycode = id; - ev->implicit_modifiers = implicit_mods; - ev->state = pressed; - ev->timestamp = timestamp; - return ev; -} diff --git a/app/include/zmk/events/keycode_state_changed.h b/app/include/zmk/events/keycode_state_changed.h new file mode 100644 index 0000000..28282b6 --- /dev/null +++ b/app/include/zmk/events/keycode_state_changed.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include +#include +#include + +struct keycode_state_changed { + struct zmk_event_header header; + uint8_t usage_page; + uint32_t keycode; + uint8_t implicit_modifiers; + bool state; + int64_t timestamp; +}; + +ZMK_EVENT_DECLARE(keycode_state_changed); + +static inline struct keycode_state_changed * +keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) { + uint16_t page = HID_USAGE_PAGE(encoded) & 0xFF; + uint16_t id = HID_USAGE_ID(encoded); + zmk_mod_flags implicit_mods = SELECT_MODS(encoded); + + if (!page) { + page = HID_USAGE_KEY; + } + + struct keycode_state_changed *ev = new_keycode_state_changed(); + ev->usage_page = page; + ev->keycode = id; + ev->implicit_modifiers = implicit_mods; + ev->state = pressed; + ev->timestamp = timestamp; + return ev; +} diff --git a/app/include/zmk/events/layer-state-changed.h b/app/include/zmk/events/layer-state-changed.h deleted file mode 100644 index 352c602..0000000 --- a/app/include/zmk/events/layer-state-changed.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include - -struct layer_state_changed { - struct zmk_event_header header; - uint8_t layer; - bool state; - int64_t timestamp; -}; - -ZMK_EVENT_DECLARE(layer_state_changed); - -static inline struct layer_state_changed *create_layer_state_changed(uint8_t layer, bool state) { - struct layer_state_changed *ev = new_layer_state_changed(); - ev->layer = layer; - ev->state = state; - ev->timestamp = k_uptime_get(); - - return ev; -} diff --git a/app/include/zmk/events/layer_state_changed.h b/app/include/zmk/events/layer_state_changed.h new file mode 100644 index 0000000..cf24002 --- /dev/null +++ b/app/include/zmk/events/layer_state_changed.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +struct layer_state_changed { + struct zmk_event_header header; + uint8_t layer; + bool state; + int64_t timestamp; +}; + +ZMK_EVENT_DECLARE(layer_state_changed); + +static inline struct layer_state_changed *create_layer_state_changed(uint8_t layer, bool state) { + struct layer_state_changed *ev = new_layer_state_changed(); + ev->layer = layer; + ev->state = state; + ev->timestamp = k_uptime_get(); + + return ev; +} diff --git a/app/include/zmk/events/modifiers-state-changed.h b/app/include/zmk/events/modifiers-state-changed.h deleted file mode 100644 index d2e02f8..0000000 --- a/app/include/zmk/events/modifiers-state-changed.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include - -struct modifiers_state_changed { - struct zmk_event_header header; - zmk_mod_flags modifiers; - bool state; -}; - -ZMK_EVENT_DECLARE(modifiers_state_changed); - -inline struct modifiers_state_changed *create_modifiers_state_changed(zmk_mod_flags modifiers, - bool state) { - struct modifiers_state_changed *ev = new_modifiers_state_changed(); - ev->modifiers = modifiers; - ev->state = state; - - return ev; -} \ No newline at end of file diff --git a/app/include/zmk/events/modifiers_state_changed.h b/app/include/zmk/events/modifiers_state_changed.h new file mode 100644 index 0000000..c4daede --- /dev/null +++ b/app/include/zmk/events/modifiers_state_changed.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include + +struct modifiers_state_changed { + struct zmk_event_header header; + zmk_mod_flags modifiers; + bool state; +}; + +ZMK_EVENT_DECLARE(modifiers_state_changed); + +inline struct modifiers_state_changed *create_modifiers_state_changed(zmk_mod_flags modifiers, + bool state) { + struct modifiers_state_changed *ev = new_modifiers_state_changed(); + ev->modifiers = modifiers; + ev->state = state; + + return ev; +} \ No newline at end of file diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position-state-changed.h deleted file mode 100644 index 7058276..0000000 --- a/app/include/zmk/events/position-state-changed.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include - -struct position_state_changed { - struct zmk_event_header header; - uint32_t position; - bool state; - int64_t timestamp; -}; - -ZMK_EVENT_DECLARE(position_state_changed); \ No newline at end of file diff --git a/app/include/zmk/events/position_state_changed.h b/app/include/zmk/events/position_state_changed.h new file mode 100644 index 0000000..0f1ac1b --- /dev/null +++ b/app/include/zmk/events/position_state_changed.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +struct position_state_changed { + struct zmk_event_header header; + uint32_t position; + bool state; + int64_t timestamp; +}; + +ZMK_EVENT_DECLARE(position_state_changed); \ No newline at end of file diff --git a/app/include/zmk/events/sensor-event.h b/app/include/zmk/events/sensor-event.h deleted file mode 100644 index 0bd3ccf..0000000 --- a/app/include/zmk/events/sensor-event.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include -#include - -struct sensor_event { - struct zmk_event_header header; - uint8_t sensor_number; - const struct device *sensor; - int64_t timestamp; -}; - -ZMK_EVENT_DECLARE(sensor_event); \ No newline at end of file diff --git a/app/include/zmk/events/sensor_event.h b/app/include/zmk/events/sensor_event.h new file mode 100644 index 0000000..14fb2d3 --- /dev/null +++ b/app/include/zmk/events/sensor_event.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include +#include + +struct sensor_event { + struct zmk_event_header header; + uint8_t sensor_number; + const struct device *sensor; + int64_t timestamp; +}; + +ZMK_EVENT_DECLARE(sensor_event); \ No newline at end of file diff --git a/app/include/zmk/events/usb-conn-state-changed.h b/app/include/zmk/events/usb-conn-state-changed.h deleted file mode 100644 index d6cc698..0000000 --- a/app/include/zmk/events/usb-conn-state-changed.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#pragma once - -#include -#include - -#include -#include - -struct usb_conn_state_changed { - struct zmk_event_header header; - enum zmk_usb_conn_state conn_state; -}; - -ZMK_EVENT_DECLARE(usb_conn_state_changed); \ No newline at end of file diff --git a/app/include/zmk/events/usb_conn_state_changed.h b/app/include/zmk/events/usb_conn_state_changed.h new file mode 100644 index 0000000..b38fb9f --- /dev/null +++ b/app/include/zmk/events/usb_conn_state_changed.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#include +#include + +#include +#include + +struct usb_conn_state_changed { + struct zmk_event_header header; + enum zmk_usb_conn_state conn_state; +}; + +ZMK_EVENT_DECLARE(usb_conn_state_changed); \ No newline at end of file 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 -#include -#include -#include +#include +#include +#include +#include #include 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 -#include +#include +#include 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 #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include 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 #include -#include -#include +#include +#include #include 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 #include -#include -#include +#include +#include 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 #include -#include -#include -#include -#include +#include +#include +#include +#include #include 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 #include #include -#include -#include +#include +#include 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 #include -#include -#include +#include +#include #include #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 #include -#include -#include -#include +#include +#include +#include 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 -#include -#include -#include +#include +#include +#include #include #include #include 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 #include #include -#include -#include -#include +#include +#include +#include #include 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 +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include +#include 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 -#include -#include +#include +#include +#include #include #include #include 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 #include -#include -#include -#include -#include +#include +#include +#include +#include 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 -#include -#include +#include +#include #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 #include #include -#include +#include #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 -#include -#include +#include +#include #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 #include -#include -#include +#include +#include #include 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 -#include +#include +#include #include #include 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 #include -#include -#include +#include +#include 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include &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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include /* 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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include / { 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include / { 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 #include -#include +#include #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 #include -#include +#include #include "../behavior_keymap.dtsi" &kscan { -- cgit v1.2.3