Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 06:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

added focusable ability to rssi field

Browse Source
This commit is contained in:
GullCode 2023-03-13 22:55:48 +01:00
parent 6a61b9528e
commit 37cfcb0d5c
2 changed files with 125 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
firmware/application/ui/ui_rssi.cpp
View File

@ -162,6 +162,14 @@ namespace ui {
if (pitch_rssi_enabled) { if (pitch_rssi_enabled) {
baseband::set_pitch_rssi((avg_ - raw_min) * 2000 / raw_delta, true); 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() int32_t RSSI::get_min()
@ -317,4 +325,43 @@ namespace ui {
set_dirty(); 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 */ } /* namespace ui */

148
firmware/application/ui/ui_rssi.hpp
View File

@ -25,88 +25,96 @@
#include "ui.hpp" #include "ui.hpp"
#include "ui_widget.hpp" #include "ui_widget.hpp"
#include "ui_painter.hpp" #include "ui_painter.hpp"
#include "event_m0.hpp" #include "event_m0.hpp"
#include "message.hpp" #include "message.hpp"
#include <cstdint> #include <cstdint>
namespace ui { namespace ui {
class RSSI : public Widget { class RSSI : public Widget {
public: public:
RSSI( std::function<void(RSSI&)> on_select { };
const Rect parent_rect std::function<void(RSSI&)> on_touch_release { }; // Executed when releasing touch, after on_select.
) : Widget { parent_rect }, std::function<void(RSSI&)> on_touch_press { }; // Executed when touching, before on_select.
min_ { 0 }, std::function<bool(RSSI&, KeyEvent)> on_dir { };
avg_ { 0 }, std::function<void(RSSI&)> on_highlight { };
max_ { 0 }
{
}
void paint(Painter& painter) override; RSSI(
int32_t get_min(); const Rect parent_rect
int32_t get_avg(); ) : Widget { parent_rect },
int32_t get_max(); min_ { 0 },
int32_t get_delta(); avg_ { 0 },
void set_vertical_rssi(bool enabled); max_ { 0 }
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
MessageHandlerRegistration message_handler_stats { int32_t get_min();
Message::ID::RSSIStatistics, int32_t get_avg();
[this](const Message* const p) { int32_t get_max();
this->on_statistics_update(static_cast<const RSSIStatisticsMessage*>(p)->statistics); int32_t get_delta();
} void set_vertical_rssi(bool enabled);
}; void set_peak(bool enabled, size_t duration);
MessageHandlerRegistration message_handler_pitch_rssi { void paint(Painter& painter) override;
Message::ID::PitchRSSIConfigure, void on_focus() override;
[this](const Message* const p) { bool on_key(const KeyEvent key) override;
const auto message = *reinterpret_cast<const PitchRSSIConfigureMessage*>(p); bool on_touch(const TouchEvent event) override;
this->set_pitch_rssi(message.enabled);
}
};
void on_statistics_update(const RSSIStatistics& statistics); private:
void set_pitch_rssi(bool enabled); 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 { bool pitch_rssi_enabled = false;
int32_t rssi_min { 0 }; bool vertical_rssi_enabled = false; // scale [vertically/from bottom to top]
int32_t rssi_avg { 0 }; // instead of [horizontally/from left to right]
int32_t rssi_max { 0 }; bool peak_enabled = false;
int32_t db { 0 }; size_t peak_duration = 1000; // peak duration in msec before being reset to actual max_rssi
};
using RSSIGraphList = std::vector<RSSIGraph_entry>; MessageHandlerRegistration message_handler_stats {
Message::ID::RSSIStatistics,
[this](const Message* const p) {
this->on_statistics_update(static_cast<const RSSIStatisticsMessage*>(p)->statistics);
}
};
class RSSIGraph : public Widget { MessageHandlerRegistration message_handler_pitch_rssi {
public: Message::ID::PitchRSSIConfigure,
RSSIGraph( [this](const Message* const p) {
const Rect parent_rect const auto message = *reinterpret_cast<const PitchRSSIConfigureMessage*>(p);
) : Widget { parent_rect } this->set_pitch_rssi(message.enabled);
{ }
} };
void paint(Painter& painter) override;
void add_values(int32_t rssi_min, int32_t rssi_avg, int32_t rssi_max, int32_t db ); void on_statistics_update(const RSSIStatistics& statistics);
void set_pitch_rssi(bool enabled);
private: };
RSSIGraphList graph_list { } ;
}; 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<RSSIGraph_entry>;
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 { } ;
};
} }