From 2fe1fbb526d9190e478999f36adbcfcf4a8847b2 Mon Sep 17 00:00:00 2001 From: Joel Spadin Date: Tue, 27 Oct 2020 13:49:28 -0500 Subject: feat(endpoints): rename behavior to outputs "Outputs" is probably easier for most people to understand than "endpoints". --- app/CMakeLists.txt | 2 +- app/dts/behaviors.dtsi | 2 +- app/dts/behaviors/endpoints.dtsi | 9 ----- app/dts/behaviors/outputs.dtsi | 9 +++++ .../bindings/behaviors/zmk,behavior-endpoints.yaml | 10 ----- .../bindings/behaviors/zmk,behavior-outputs.yaml | 10 +++++ app/include/dt-bindings/zmk/endpoints.h | 13 ------- app/include/dt-bindings/zmk/outputs.h | 13 +++++++ app/src/behaviors/behavior_endpoints.c | 44 ---------------------- app/src/behaviors/behavior_outputs.c | 44 ++++++++++++++++++++++ 10 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 app/dts/behaviors/endpoints.dtsi create mode 100644 app/dts/behaviors/outputs.dtsi delete mode 100644 app/dts/bindings/behaviors/zmk,behavior-endpoints.yaml create mode 100644 app/dts/bindings/behaviors/zmk,behavior-outputs.yaml delete mode 100644 app/include/dt-bindings/zmk/endpoints.h create mode 100644 app/include/dt-bindings/zmk/outputs.h delete mode 100644 app/src/behaviors/behavior_endpoints.c create mode 100644 app/src/behaviors/behavior_outputs.c (limited to 'app') diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 0c43b91..f76effc 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -39,11 +39,11 @@ target_sources(app PRIVATE src/events/sensor_event.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c) target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.c) if (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL) - target_sources(app PRIVATE src/behaviors/behavior_endpoints.c) target_sources(app PRIVATE src/behaviors/behavior_key_press.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c) target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c) + target_sources(app PRIVATE src/behaviors/behavior_outputs.c) target_sources(app PRIVATE src/behaviors/behavior_toggle_layer.c) target_sources(app PRIVATE src/behaviors/behavior_transparent.c) target_sources(app PRIVATE src/behaviors/behavior_none.c) diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi index 4a50761..a120b84 100644 --- a/app/dts/behaviors.dtsi +++ b/app/dts/behaviors.dtsi @@ -10,4 +10,4 @@ #include #include #include -#include +#include diff --git a/app/dts/behaviors/endpoints.dtsi b/app/dts/behaviors/endpoints.dtsi deleted file mode 100644 index f6cb64c..0000000 --- a/app/dts/behaviors/endpoints.dtsi +++ /dev/null @@ -1,9 +0,0 @@ -/ { - behaviors { - end: behavior_endpoints { - compatible = "zmk,behavior-endpoints"; - label = "ENDPOINTS"; - #binding-cells = <1>; - }; - }; -}; diff --git a/app/dts/behaviors/outputs.dtsi b/app/dts/behaviors/outputs.dtsi new file mode 100644 index 0000000..a534cbf --- /dev/null +++ b/app/dts/behaviors/outputs.dtsi @@ -0,0 +1,9 @@ +/ { + behaviors { + out: behavior_outputs { + compatible = "zmk,behavior-outputs"; + label = "OUTPUTS"; + #binding-cells = <1>; + }; + }; +}; diff --git a/app/dts/bindings/behaviors/zmk,behavior-endpoints.yaml b/app/dts/bindings/behaviors/zmk,behavior-endpoints.yaml deleted file mode 100644 index fdd76bb..0000000 --- a/app/dts/bindings/behaviors/zmk,behavior-endpoints.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2020, The ZMK Contributors -# SPDX-License-Identifier: MIT -# - -description: Endpoints Behavior - -compatible: "zmk,behavior-endpoints" - -include: one_param.yaml diff --git a/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml b/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml new file mode 100644 index 0000000..8bcefd9 --- /dev/null +++ b/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml @@ -0,0 +1,10 @@ +# +# Copyright (c) 2020, The ZMK Contributors +# SPDX-License-Identifier: MIT +# + +description: Output Selection Behavior + +compatible: "zmk,behavior-outputs" + +include: one_param.yaml diff --git a/app/include/dt-bindings/zmk/endpoints.h b/app/include/dt-bindings/zmk/endpoints.h deleted file mode 100644 index 3bba972..0000000 --- a/app/include/dt-bindings/zmk/endpoints.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#define ENDPOINT_TOGGLE_CMD 0 -#define ENDPOINT_USB_CMD 1 -#define ENDPOINT_BLE_CMD 2 - -#define END_TOG ENDPOINT_TOGGLE_CMD -#define END_USB ENDPOINT_USB_CMD -#define END_BLE ENDPOINT_BLE_CMD \ No newline at end of file diff --git a/app/include/dt-bindings/zmk/outputs.h b/app/include/dt-bindings/zmk/outputs.h new file mode 100644 index 0000000..c9a34ae --- /dev/null +++ b/app/include/dt-bindings/zmk/outputs.h @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#define OUTPUT_TOGGLE_CMD 0 +#define OUTPUT_USB_CMD 1 +#define OUTPUT_BLE_CMD 2 + +#define OUT_TOG OUTPUT_TOGGLE_CMD +#define OUT_USB OUTPUT_USB_CMD +#define OUT_BLE OUTPUT_BLE_CMD \ No newline at end of file diff --git a/app/src/behaviors/behavior_endpoints.c b/app/src/behaviors/behavior_endpoints.c deleted file mode 100644 index dd56fc1..0000000 --- a/app/src/behaviors/behavior_endpoints.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#define DT_DRV_COMPAT zmk_behavior_endpoints - -#include -#include -#include - -#include - -#include -#include - -#include -LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); - -static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding, - struct zmk_behavior_binding_event event) { - switch (binding->param1) { - case ENDPOINT_TOGGLE_CMD: - return zmk_endpoints_toggle(); - case ENDPOINT_USB_CMD: - return zmk_endpoints_select(ZMK_ENDPOINT_USB); - case ENDPOINT_BLE_CMD: - return zmk_endpoints_select(ZMK_ENDPOINT_BLE); - default: - LOG_ERR("Unknown endpoints command: %d", binding->param1); - } - - return -ENOTSUP; -} - -static int behavior_ep_init(struct device *dev) { return 0; } - -static const struct behavior_driver_api behavior_endpoints_driver_api = { - .binding_pressed = on_keymap_binding_pressed, -}; - -DEVICE_AND_API_INIT(behavior_end, DT_INST_LABEL(0), behavior_ep_init, NULL, NULL, APPLICATION, - CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_endpoints_driver_api); diff --git a/app/src/behaviors/behavior_outputs.c b/app/src/behaviors/behavior_outputs.c new file mode 100644 index 0000000..0e7ac49 --- /dev/null +++ b/app/src/behaviors/behavior_outputs.c @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#define DT_DRV_COMPAT zmk_behavior_outputs + +#include +#include +#include + +#include + +#include +#include + +#include +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding, + struct zmk_behavior_binding_event event) { + switch (binding->param1) { + case OUTPUT_TOGGLE_CMD: + return zmk_endpoints_toggle(); + case OUTPUT_USB_CMD: + return zmk_endpoints_select(ZMK_ENDPOINT_USB); + case OUTPUT_BLE_CMD: + return zmk_endpoints_select(ZMK_ENDPOINT_BLE); + default: + LOG_ERR("Unknown output command: %d", binding->param1); + } + + return -ENOTSUP; +} + +static int behavior_out_init(struct device *dev) { return 0; } + +static const struct behavior_driver_api behavior_outputs_driver_api = { + .binding_pressed = on_keymap_binding_pressed, +}; + +DEVICE_AND_API_INIT(behavior_out, DT_INST_LABEL(0), behavior_out_init, NULL, NULL, APPLICATION, + CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_outputs_driver_api); -- cgit v1.2.3