From 6287819fccf0d208822f21fd14204e649149f304 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Fri, 5 Nov 2021 04:21:30 +0000 Subject: [PATCH] refactor: Move to USB_DEVICE_STACK symbol. See: https://docs.zephyrproject.org/latest/releases/release-notes-2.7.html#changes-in-this-release --- app/CMakeLists.txt | 4 ++-- app/Kconfig | 4 ++-- app/boards/arm/bluemicro840/Kconfig.defconfig | 7 ++----- app/boards/arm/nice60/Kconfig.defconfig | 7 ++----- app/boards/arm/nice_nano/Kconfig.defconfig | 7 ++----- app/boards/arm/nrf52840_m2/Kconfig.defconfig | 7 ++----- app/boards/arm/nrfmicro/Kconfig.defconfig | 7 ++----- app/src/display/widgets/battery_status.c | 14 +++++++------- app/src/display/widgets/output_status.c | 2 +- app/src/power.c | 4 ++-- 10 files changed, 24 insertions(+), 39 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 0d547fbe..5f8dace8 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -42,7 +42,7 @@ target_sources(app PRIVATE src/events/sensor_event.c) target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c) -target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.c) +target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c) if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL) @@ -78,7 +78,7 @@ endif() if (CONFIG_ZMK_SPLIT_BLE AND CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL) target_sources(app PRIVATE src/split/bluetooth/central.c) endif() -target_sources_ifdef(CONFIG_USB app PRIVATE src/usb.c) +target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c) target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c) target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c) diff --git a/app/Kconfig b/app/Kconfig index 81637336..948eaeff 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -422,7 +422,7 @@ menu "Advanced" menu "Initialization Priorities" -if USB +if USB_DEVICE_STACK config ZMK_USB_INIT_PRIORITY int "USB Init Priority" @@ -526,7 +526,7 @@ config KERNEL_BIN_NAME config REBOOT default y -config USB +config USB_DEVICE_STACK default y if HAS_HW_NRF_USBD config ZMK_WPM diff --git a/app/boards/arm/bluemicro840/Kconfig.defconfig b/app/boards/arm/bluemicro840/Kconfig.defconfig index 2b55e17c..bc68f311 100644 --- a/app/boards/arm/bluemicro840/Kconfig.defconfig +++ b/app/boards/arm/bluemicro840/Kconfig.defconfig @@ -8,15 +8,12 @@ if BOARD_BLUEMICRO840_V1 config BOARD default "bluemicro840_v1" -if USB +if USB_DEVICE_STACK config USB_NRFX default y -config USB_DEVICE_STACK - default y - -endif # USB +endif # USB_DEVICE_STACK config BT_CTLR default BT diff --git a/app/boards/arm/nice60/Kconfig.defconfig b/app/boards/arm/nice60/Kconfig.defconfig index 81a7c035..42d417ab 100644 --- a/app/boards/arm/nice60/Kconfig.defconfig +++ b/app/boards/arm/nice60/Kconfig.defconfig @@ -6,15 +6,12 @@ if BOARD_NICE60 config ZMK_KEYBOARD_NAME default "nice!60" -if USB +if USB_DEVICE_STACK config USB_NRFX default y -config USB_DEVICE_STACK - default y - -endif # USB +endif # USB_DEVICE_STACK config BT_CTLR default BT diff --git a/app/boards/arm/nice_nano/Kconfig.defconfig b/app/boards/arm/nice_nano/Kconfig.defconfig index 876002bf..24571653 100644 --- a/app/boards/arm/nice_nano/Kconfig.defconfig +++ b/app/boards/arm/nice_nano/Kconfig.defconfig @@ -6,15 +6,12 @@ if BOARD_NICE_NANO || BOARD_NICE_NANO_V2 config BOARD default "nice_nano" -if USB +if USB_DEVICE_STACK config USB_NRFX default y -config USB_DEVICE_STACK - default y - -endif # USB +endif # USB_DEVICE_STACK config BT_CTLR default BT diff --git a/app/boards/arm/nrf52840_m2/Kconfig.defconfig b/app/boards/arm/nrf52840_m2/Kconfig.defconfig index f3e1f0eb..4e1679ba 100644 --- a/app/boards/arm/nrf52840_m2/Kconfig.defconfig +++ b/app/boards/arm/nrf52840_m2/Kconfig.defconfig @@ -6,15 +6,12 @@ if BOARD_NRF52840_M2 config BOARD default "nrf52480_m2" -if USB +if USB_DEVICE_STACK config USB_NRFX default y -config USB_DEVICE_STACK - default y - -endif # USB +endif # USB_DEVICE_STACK config BT_CTLR default BT diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig index a3c02c22..754a430e 100644 --- a/app/boards/arm/nrfmicro/Kconfig.defconfig +++ b/app/boards/arm/nrfmicro/Kconfig.defconfig @@ -8,15 +8,12 @@ if BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13 config BOARD default "nrfmicro" -if USB +if USB_DEVICE_STACK config USB_NRFX default y -config USB_DEVICE_STACK - default y - -endif # USB +endif # USB_DEVICE_STACK config BT_CTLR default BT diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c index 362bdaa2..d74cc8ed 100644 --- a/app/src/display/widgets/battery_status.c +++ b/app/src/display/widgets/battery_status.c @@ -21,7 +21,7 @@ static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets); struct battery_status_state { uint8_t level; -#if IS_ENABLED(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) bool usb_present; #endif }; @@ -31,11 +31,11 @@ static void set_battery_symbol(lv_obj_t *label, struct battery_status_state stat uint8_t level = state.level; -#if IS_ENABLED(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) if (state.usb_present) { strcpy(text, LV_SYMBOL_CHARGE); } -#endif /* IS_ENABLED(CONFIG_USB) */ +#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ if (level > 95) { strcat(text, LV_SYMBOL_BATTERY_FULL); @@ -59,9 +59,9 @@ void battery_status_update_cb(struct battery_status_state state) { static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) { return (struct battery_status_state) { .level = bt_bas_get_battery_level(), -#if IS_ENABLED(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) .usb_present = zmk_usb_is_powered(), -#endif /* IS_ENABLED(CONFIG_USB) */ +#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ }; } @@ -69,9 +69,9 @@ ZMK_DISPLAY_WIDGET_LISTENER(widget_battery_status, struct battery_status_state, battery_status_update_cb, battery_status_get_state) ZMK_SUBSCRIPTION(widget_battery_status, zmk_battery_state_changed); -#if IS_ENABLED(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed); -#endif /* IS_ENABLED(CONFIG_USB) */ +#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ int zmk_widget_battery_status_init(struct zmk_widget_battery_status *widget, lv_obj_t *parent) { widget->obj = lv_label_create(parent, NULL); diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c index 89993c69..fe99ac96 100644 --- a/app/src/display/widgets/output_status.c +++ b/app/src/display/widgets/output_status.c @@ -73,7 +73,7 @@ ZMK_DISPLAY_WIDGET_LISTENER(widget_output_status, struct output_status_state, output_status_update_cb, get_state) ZMK_SUBSCRIPTION(widget_output_status, zmk_endpoint_selection_changed); -#if defined(CONFIG_USB) +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) ZMK_SUBSCRIPTION(widget_output_status, zmk_usb_conn_state_changed); #endif #if defined(CONFIG_ZMK_BLE) diff --git a/app/src/power.c b/app/src/power.c index 47ef3a3b..1803f62c 100644 --- a/app/src/power.c +++ b/app/src/power.c @@ -16,11 +16,11 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include bool is_usb_power_present() { -#ifdef CONFIG_USB +#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) return zmk_usb_is_powered(); #else return false; -#endif /* CONFIG_USB */ +#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ } struct pm_state_info pm_policy_next_state(int32_t ticks) {