TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 04:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve clipping of RSSI, baseband, audio bar graphs.

Browse Source
This commit is contained in:
Jared Boone 2016-01-27 12:50:33 -08:00
parent 018b54c711
commit 6917a38106
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/application/ui_audio.cpp
View File

@ -23,6 +23,8 @@
#include "event_m0.hpp" #include "event_m0.hpp"
#include "utility.hpp"
#include <algorithm> #include <algorithm>
namespace ui { namespace ui {
@ -42,15 +44,17 @@ void Audio::on_hide() {
void Audio::paint(Painter& painter) { void Audio::paint(Painter& painter) {
const auto r = screen_rect(); const auto r = screen_rect();
const int32_t db_min = -r.width(); constexpr int db_min = -96;
const int32_t x_0 = 0; constexpr int db_max = 0;
const int32_t x_rms = std::max(x_0, rms_db_ - db_min); constexpr int db_delta = db_max - db_min;
const int32_t x_max = std::max(x_rms + 1, max_db_ - db_min); const range_t<int> x_rms_range { 0, r.width() - 1 };
const int32_t x_lim = r.width(); const auto x_rms = x_rms_range.clip((rms_db_ - db_min) * r.width() / db_delta);
const range_t<int> x_max_range { x_rms + 1, r.width() };
const auto x_max = x_max_range.clip((max_db_ - db_min) * r.width() / db_delta);
const Rect r0 { const Rect r0 {
static_cast<ui::Coord>(r.left() + x_0), r.top(), static_cast<ui::Coord>(r.left()), r.top(),
static_cast<ui::Dim>(x_rms - x_0), r.height() static_cast<ui::Dim>(x_rms), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r0, r0,
@ -77,7 +81,7 @@ void Audio::paint(Painter& painter) {
const Rect r3 { const Rect r3 {
static_cast<ui::Coord>(r.left() + x_max), r.top(), static_cast<ui::Coord>(r.left() + x_max), r.top(),
static_cast<ui::Dim>(x_lim - x_max), r.height() static_cast<ui::Dim>(r.width() - x_max), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r3, r3,

17
firmware/application/ui_channel.cpp
View File

@ -23,6 +23,8 @@
#include "event_m0.hpp" #include "event_m0.hpp"
#include "utility.hpp"
#include <algorithm> #include <algorithm>
namespace ui { namespace ui {
@ -42,14 +44,15 @@ void Channel::on_hide() {
void Channel::paint(Painter& painter) { void Channel::paint(Painter& painter) {
const auto r = screen_rect(); const auto r = screen_rect();
const int32_t db_min = -r.width(); constexpr int db_min = -96;
const int32_t x_0 = 0; constexpr int db_max = 0;
const int32_t x_max = std::max(x_0, max_db_ - db_min); constexpr int db_delta = db_max - db_min;
const int32_t x_lim = r.width(); const range_t<int> x_max_range { 0, r.width() - 1 };
const auto x_max = x_max_range.clip((max_db_ - db_min) * r.width() / db_delta);
const Rect r0 { const Rect r0 {
static_cast<ui::Coord>(r.left() + x_0), r.top(), static_cast<ui::Coord>(r.left()), r.top(),
static_cast<ui::Dim>(x_max - x_0), r.height() static_cast<ui::Dim>(x_max), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r0, r0,
@ -67,7 +70,7 @@ void Channel::paint(Painter& painter) {
const Rect r2 { const Rect r2 {
static_cast<ui::Coord>(r.left() + x_max + 1), r.top(), static_cast<ui::Coord>(r.left() + x_max + 1), r.top(),
static_cast<ui::Dim>(x_lim - (x_max + 1)), r.height() static_cast<ui::Dim>(r.width() - (x_max + 1)), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r2, r2,

27
firmware/application/ui_rssi.cpp
View File

@ -23,6 +23,8 @@
#include "event_m0.hpp" #include "event_m0.hpp"
#include "utility.hpp"
#include <algorithm> #include <algorithm>
namespace ui { namespace ui {
@ -42,22 +44,23 @@ void RSSI::on_hide() {
void RSSI::paint(Painter& painter) { void RSSI::paint(Painter& painter) {
const auto r = screen_rect(); const auto r = screen_rect();
constexpr int32_t rssi_sample_range = 256; constexpr int rssi_sample_range = 256;
constexpr float rssi_voltage_min = 0.4; constexpr float rssi_voltage_min = 0.4;
constexpr float rssi_voltage_max = 2.2; constexpr float rssi_voltage_max = 2.2;
constexpr float adc_voltage_max = 3.3; constexpr float adc_voltage_max = 3.3;
constexpr int32_t raw_min = rssi_sample_range * rssi_voltage_min / adc_voltage_max; constexpr int raw_min = rssi_sample_range * rssi_voltage_min / adc_voltage_max;
constexpr int32_t raw_max = rssi_sample_range * rssi_voltage_max / adc_voltage_max; constexpr int raw_max = rssi_sample_range * rssi_voltage_max / adc_voltage_max;
constexpr int32_t raw_delta = raw_max - raw_min; constexpr int raw_delta = raw_max - raw_min;
const int32_t x_0 = 0; const range_t<int> x_avg_range { 0, r.width() - 1 };
const int32_t x_lim = r.width(); const auto x_avg = x_avg_range.clip((avg_ - raw_min) * r.width() / raw_delta);
const int32_t x_min = std::max(x_0, (min_ - raw_min) * x_lim / raw_delta); const range_t<int> x_min_range { 0, x_avg };
const int32_t x_avg = std::max(x_min, (avg_ - raw_min) * x_lim / raw_delta); const auto x_min = x_min_range.clip((min_ - raw_min) * r.width() / raw_delta);
const int32_t x_max = std::max(x_avg + 1, (max_ - raw_min) * x_lim / raw_delta); const range_t<int> x_max_range { x_avg + 1, r.width() };
const auto x_max = x_max_range.clip((max_ - raw_min) * r.width() / raw_delta);
const Rect r0 { const Rect r0 {
static_cast<ui::Coord>(r.left() + x_0), r.top(), static_cast<ui::Coord>(r.left()), r.top(),
static_cast<ui::Dim>(x_min - x_0), r.height() static_cast<ui::Dim>(x_min), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r0, r0,
@ -93,7 +96,7 @@ void RSSI::paint(Painter& painter) {
const Rect r4 { const Rect r4 {
static_cast<ui::Coord>(r.left() + x_max), r.top(), static_cast<ui::Coord>(r.left() + x_max), r.top(),
static_cast<ui::Dim>(x_lim - x_max), r.height() static_cast<ui::Dim>(r.width() - x_max), r.height()
}; };
painter.fill_rectangle( painter.fill_rectangle(
r4, r4,