diff options
Diffstat (limited to 'src/ui/lvgl_task.cpp')
| -rw-r--r-- | src/ui/lvgl_task.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp index f0184766..4cf25c15 100644 --- a/src/ui/lvgl_task.cpp +++ b/src/ui/lvgl_task.cpp @@ -33,11 +33,11 @@ #include "lua.h" #include "lv_api_map.h" #include "lvgl/lvgl.h" +#include "lvgl_input_driver.hpp" #include "misc/lv_color.h" #include "misc/lv_style.h" #include "misc/lv_timer.h" #include "modal.hpp" -#include "relative_wheel.hpp" #include "tasks.hpp" #include "touchwheel.hpp" #include "ui_fsm.hpp" @@ -50,8 +50,6 @@ namespace ui { [[maybe_unused]] static const char* kTag = "ui_task"; -static auto group_focus_cb(lv_group_t *group) -> void; - UiTask::UiTask() {} UiTask::~UiTask() { @@ -78,7 +76,6 @@ auto UiTask::Main() -> void { if (input_ && current_screen_->group() != current_group) { current_group = current_screen_->group(); lv_indev_set_group(input_->registration(), current_group); - lv_group_set_focus_cb(current_group, &group_focus_cb); } TickType_t delay = lv_timer_handler(); @@ -86,10 +83,9 @@ auto UiTask::Main() -> void { } } -auto UiTask::input(std::shared_ptr<EncoderInput> input) -> void { +auto UiTask::input(std::shared_ptr<input::LvglInputDriver> input) -> void { assert(current_screen_); input_ = input; - lv_indev_set_group(input_->registration(), current_screen_->group()); } auto UiTask::Start() -> UiTask* { @@ -98,11 +94,4 @@ auto UiTask::Start() -> UiTask* { return ret; } -static auto group_focus_cb(lv_group_t *group) -> void { - // TODO(robin): we probably want to vary this, configure this, etc - events::System().Dispatch(system_fsm::HapticTrigger{ - .effect = drivers::Haptics::Effect::kMediumClick1_100Pct, - }); -} - } // namespace ui |