From a69b95187be4afce4eefa8f7b08ceca7b88b7724 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 15 Jan 2025 15:37:35 +1100 Subject: Handle lock state in each input device, instead of in the lvgl driver --- src/tangara/input/input_volume_buttons.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/tangara/input/input_volume_buttons.cpp') diff --git a/src/tangara/input/input_volume_buttons.cpp b/src/tangara/input/input_volume_buttons.cpp index 3c3fb2a3..7ffdfcdc 100644 --- a/src/tangara/input/input_volume_buttons.cpp +++ b/src/tangara/input/input_volume_buttons.cpp @@ -14,11 +14,20 @@ namespace input { VolumeButtons::VolumeButtons(drivers::IGpios& gpios) : gpios_(gpios), up_("upper", actions::volumeUp()), - down_("lower", actions::volumeDown()) {} + down_("lower", actions::volumeDown()), + locked_(false) {} auto VolumeButtons::read(lv_indev_data_t* data) -> void { - up_.update(!gpios_.Get(drivers::IGpios::Pin::kKeyUp), data); - down_.update(!gpios_.Get(drivers::IGpios::Pin::kKeyDown), data); + bool up = !gpios_.Get(drivers::IGpios::Pin::kKeyUp); + bool down = !gpios_.Get(drivers::IGpios::Pin::kKeyDown); + + if ((up && down) || locked_) { + up = false; + down = false; + } + + up_.update(up, data); + down_.update(down, data); } auto VolumeButtons::name() -> std::string { @@ -30,4 +39,12 @@ auto VolumeButtons::triggers() return {up_, down_}; } +auto VolumeButtons::onLock() -> void { + locked_ = true; +} + +auto VolumeButtons::onUnlock() -> void { + locked_ = false; +} + } // namespace input -- cgit v1.2.3