From 37cfcb0d5c513c0bdda09077f1bca6c9cfdbda27 Mon Sep 17 00:00:00 2001 From: GullCode Date: Mon, 13 Mar 2023 22:55:48 +0100 Subject: [PATCH] added focusable ability to rssi field --- firmware/application/ui/ui_rssi.cpp | 47 +++++++++ firmware/application/ui/ui_rssi.hpp | 148 +++++++++++++++------------- 2 files changed, 125 insertions(+), 70 deletions(-) diff --git a/firmware/application/ui/ui_rssi.cpp b/firmware/application/ui/ui_rssi.cpp index 8c4f483a..1cfc2d0f 100644 --- a/firmware/application/ui/ui_rssi.cpp +++ b/firmware/application/ui/ui_rssi.cpp @@ -162,6 +162,14 @@ namespace ui { if (pitch_rssi_enabled) { baseband::set_pitch_rssi((avg_ - raw_min) * 2000 / raw_delta, true); } + if( has_focus() || highlighted() ) + { + const Rect r6 { r.left(), r.top(), r.width(), r.height() }; + painter.draw_rectangle( + r6, + Color::white() + ); + } } int32_t RSSI::get_min() @@ -317,4 +325,43 @@ namespace ui { set_dirty(); } + void RSSI::on_focus() { + if( on_highlight ) + on_highlight(*this); + } + + bool RSSI::on_key(const KeyEvent key) { + if( key == KeyEvent::Select ) { + if( on_select ) { + on_select(*this); + return true; + } + } else { + if( on_dir ) { + return on_dir(*this, key); + } + } + return false; + } + + bool RSSI::on_touch(const TouchEvent event) { + switch(event.type) { + case TouchEvent::Type::Start: + set_highlighted(true); + set_dirty(); + if( on_touch_press) { + on_touch_press(*this); + } + return true; + case TouchEvent::Type::End: + set_highlighted(false); + set_dirty(); + if( on_touch_release) { + on_touch_release(*this); + } + return true; + default: + return false; + } + } } /* namespace ui */ diff --git a/firmware/application/ui/ui_rssi.hpp b/firmware/application/ui/ui_rssi.hpp index f3062e44..bd64244f 100644 --- a/firmware/application/ui/ui_rssi.hpp +++ b/firmware/application/ui/ui_rssi.hpp @@ -25,88 +25,96 @@ #include "ui.hpp" #include "ui_widget.hpp" #include "ui_painter.hpp" - #include "event_m0.hpp" - #include "message.hpp" - #include namespace ui { -class RSSI : public Widget { -public: - RSSI( - const Rect parent_rect - ) : Widget { parent_rect }, - min_ { 0 }, - avg_ { 0 }, - max_ { 0 } - { - } + class RSSI : public Widget { + public: + std::function on_select { }; + std::function on_touch_release { }; // Executed when releasing touch, after on_select. + std::function on_touch_press { }; // Executed when touching, before on_select. + std::function on_dir { }; + std::function on_highlight { }; - void paint(Painter& painter) override; - int32_t get_min(); - int32_t get_avg(); - int32_t get_max(); - int32_t get_delta(); - void set_vertical_rssi(bool enabled); - void set_peak(bool enabled, size_t duration); - -private: - int32_t min_; - int32_t avg_; - int32_t max_; - int32_t peak_ = 0 ; - size_t peak_duration_ = 0 ; - - bool pitch_rssi_enabled = false; - bool vertical_rssi_enabled = false; // scale [vertically/from bottom to top] - // instead of [horizontally/from left to right] - bool peak_enabled = false; - size_t peak_duration = 1000; // peak duration in msec before being reset to actual max_rssi + RSSI( + const Rect parent_rect + ) : Widget { parent_rect }, + min_ { 0 }, + avg_ { 0 }, + max_ { 0 } + { + } - MessageHandlerRegistration message_handler_stats { - Message::ID::RSSIStatistics, - [this](const Message* const p) { - this->on_statistics_update(static_cast(p)->statistics); - } - }; - - MessageHandlerRegistration message_handler_pitch_rssi { - Message::ID::PitchRSSIConfigure, - [this](const Message* const p) { - const auto message = *reinterpret_cast(p); - this->set_pitch_rssi(message.enabled); - } - }; + int32_t get_min(); + int32_t get_avg(); + int32_t get_max(); + int32_t get_delta(); + void set_vertical_rssi(bool enabled); + void set_peak(bool enabled, size_t duration); + + void paint(Painter& painter) override; + void on_focus() override; + bool on_key(const KeyEvent key) override; + bool on_touch(const TouchEvent event) override; - void on_statistics_update(const RSSIStatistics& statistics); - void set_pitch_rssi(bool enabled); -}; + private: + int32_t min_; + int32_t avg_; + int32_t max_; + int32_t peak_ = 0 ; + size_t peak_duration_ = 0 ; + bool instant_exec_ { false }; -struct RSSIGraph_entry { - int32_t rssi_min { 0 }; - int32_t rssi_avg { 0 }; - int32_t rssi_max { 0 }; - int32_t db { 0 }; -}; + bool pitch_rssi_enabled = false; + bool vertical_rssi_enabled = false; // scale [vertically/from bottom to top] + // instead of [horizontally/from left to right] + bool peak_enabled = false; + size_t peak_duration = 1000; // peak duration in msec before being reset to actual max_rssi -using RSSIGraphList = std::vector; + MessageHandlerRegistration message_handler_stats { + Message::ID::RSSIStatistics, + [this](const Message* const p) { + this->on_statistics_update(static_cast(p)->statistics); + } + }; -class RSSIGraph : public Widget { -public: - RSSIGraph( - const Rect parent_rect - ) : Widget { parent_rect } - { - } - void paint(Painter& painter) override; - void add_values(int32_t rssi_min, int32_t rssi_avg, int32_t rssi_max, int32_t db ); - -private: - RSSIGraphList graph_list { } ; -}; + MessageHandlerRegistration message_handler_pitch_rssi { + Message::ID::PitchRSSIConfigure, + [this](const Message* const p) { + const auto message = *reinterpret_cast(p); + this->set_pitch_rssi(message.enabled); + } + }; + + void on_statistics_update(const RSSIStatistics& statistics); + void set_pitch_rssi(bool enabled); + }; + + struct RSSIGraph_entry { + int32_t rssi_min { 0 }; + int32_t rssi_avg { 0 }; + int32_t rssi_max { 0 }; + int32_t db { 0 }; + }; + + using RSSIGraphList = std::vector; + + class RSSIGraph : public Widget { + public: + RSSIGraph( + const Rect parent_rect + ) : Widget { parent_rect } + { + } + void paint(Painter& painter) override; + void add_values(int32_t rssi_min, int32_t rssi_avg, int32_t rssi_max, int32_t db ); + + private: + RSSIGraphList graph_list { } ; + }; }