diff --git a/demos/printerdemo/zephyr/CMakeLists.txt b/demos/printerdemo/zephyr/CMakeLists.txt index a01d4db23b2..a22d193b8e6 100644 --- a/demos/printerdemo/zephyr/CMakeLists.txt +++ b/demos/printerdemo/zephyr/CMakeLists.txt @@ -18,10 +18,6 @@ else() message(FATAL_ERROR "Unsupported BOARD option specified: ${BOARD}") endif() -if(SHIELD STREQUAL "rk055hdmipi4ma0") - set(EXTRA_DTC_OVERLAY_FILE "${CMAKE_CURRENT_LIST_DIR}/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay") -endif() - find_package(Zephyr) project(slint_zephyr_printer_demo_mcu LANGUAGES CXX) diff --git a/demos/printerdemo/zephyr/boards/native_sim_64.overlay b/demos/printerdemo/zephyr/boards/native_sim_64.overlay index 143d1e5fb32..b3eec483d1a 100644 --- a/demos/printerdemo/zephyr/boards/native_sim_64.overlay +++ b/demos/printerdemo/zephyr/boards/native_sim_64.overlay @@ -1,12 +1,6 @@ // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: MIT -/{ - aliases { - slint-input = &input_sdl_touch; - }; -}; - &sdl_dc { height = <720>; width = <1280>; diff --git a/demos/printerdemo/zephyr/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay b/demos/printerdemo/zephyr/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay deleted file mode 100644 index 470b89b634f..00000000000 --- a/demos/printerdemo/zephyr/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: MIT - -/{ - aliases { - slint-input = >911_rk055hdmipi4ma0; - }; -}; diff --git a/demos/printerdemo/zephyr/src/slint-zephyr.cpp b/demos/printerdemo/zephyr/src/slint-zephyr.cpp index 6f491943f0a..cfc80f6f239 100644 --- a/demos/printerdemo/zephyr/src/slint-zephyr.cpp +++ b/demos/printerdemo/zephyr/src/slint-zephyr.cpp @@ -483,7 +483,7 @@ void zephyr_process_input_event(struct input_event *event, void *user_data) } } -INPUT_CALLBACK_DEFINE(DEVICE_DT_GET(DT_ALIAS(slint_input)), zephyr_process_input_event, NULL); +INPUT_CALLBACK_DEFINE(DEVICE_DT_GET(DT_CHOSEN(zephyr_touch)), zephyr_process_input_event, NULL); void slint_zephyr_init(const struct device *display) {