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

added option button for view_config, default to SPCTR (spectrum), clear screen between changes, color gradient

Browse Source
This commit is contained in:
GullCode 2023-04-07 11:30:28 +02:00
parent c3971cae32
commit 12cfbf70f0
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/application/apps/ui_looking_glass_app.cpp
View File

@ -52,7 +52,7 @@ namespace ui
void GlassView::add_spectrum_pixel(int16_t color) void GlassView::add_spectrum_pixel(int16_t color)
{ {
spectrum_row[pixel_index] = spectrum_rgb3_lut[color] ; spectrum_row[pixel_index] = spectrum_rgb3_lut[color] ;
spectrum_data[pixel_index] = ( 3 * spectrum_data[pixel_index] + color ) / 4 ; spectrum_data[pixel_index] = ( 3 * spectrum_data[pixel_index] + color ) / 4 ; // smoothing
pixel_index ++ ; pixel_index ++ ;
if (pixel_index == 240) // got an entire waterfall line if (pixel_index == 240) // got an entire waterfall line
@ -60,11 +60,11 @@ namespace ui
if( live_frequency_view ) if( live_frequency_view )
{ {
constexpr int 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 int 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 int raw_min = 0 ; constexpr int raw_min = 0 ;
constexpr int 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 int raw_delta = raw_max - raw_min; constexpr int raw_delta = raw_max - raw_min;
const range_t<int> y_max_range { 0 , 320 - 108 }; const range_t<int> y_max_range { 0 , 320 - 108 };
@ -74,8 +74,9 @@ namespace ui
for( uint16_t xpos = 0 ; xpos < 240 ; xpos ++ ) for( uint16_t xpos = 0 ; xpos < 240 ; xpos ++ )
{ {
int16_t point = y_max_range.clip( ( ( spectrum_data[ xpos ] - raw_min ) * ( 320 - 108 ) ) / raw_delta ); int16_t point = y_max_range.clip( ( ( spectrum_data[ xpos ] - raw_min ) * ( 320 - 108 ) ) / raw_delta );
uint8_t color_gradient = (point * 255) / 212 ;
display.fill_rectangle( { { xpos , 108 } , { 1 , 320 - point } } , { 0 , 0 , 0 } ); display.fill_rectangle( { { xpos , 108 } , { 1 , 320 - point } } , { 0 , 0 , 0 } );
display.fill_rectangle( { { xpos , 320 - point } , { 1 , point } } , { 0 , 0 , 255 } ); display.fill_rectangle( { { xpos , 320 - point } , { 1 , point } } , { color_gradient , 0 , uint8_t( 255 - color_gradient ) } );
} }
} }
else else
@ -212,6 +213,7 @@ namespace ui
&field_vga, &field_vga,
&text_range, &text_range,
&steps_config, &steps_config,
&view_config,
&filter_config, &filter_config,
&field_rf_amp, &field_rf_amp,
&range_presets, &range_presets,
@ -308,6 +310,24 @@ namespace ui
steps = v ; steps = v ;
}; };
view_config.set_selected_index(0); //default spectrum
view_config.on_change = [this](size_t n, OptionsField::value_t v)
{
(void)n;
live_frequency_view = v ;
if( v )
{
display.scroll_disable();
}
else
{
display.scroll_set_area(109, 319); // Restart scroll on the correct coordinates
}
// clear between changes
display.fill_rectangle( { { 0 , 108 } , { 240 , 320 - 108 } } , { 0 , 0 , 0 } );
};
range_presets.on_change = [this](size_t n, OptionsField::value_t v) range_presets.on_change = [this](size_t n, OptionsField::value_t v)
{ {
(void)n; (void)n;

13
firmware/application/apps/ui_looking_glass_app.hpp
View File

@ -93,7 +93,7 @@ namespace ui
ChannelSpectrumFIFO* fifo { nullptr }; ChannelSpectrumFIFO* fifo { nullptr };
uint8_t max_power = 0; uint8_t max_power = 0;
int32_t steps = 250 ; // default of 250 Mhz steps int32_t steps = 250 ; // default of 250 Mhz steps
bool live_frequency_view = true ; bool live_frequency_view = false ;
Labels labels{ Labels labels{
{{0, 0}, "MIN: MAX: LNA VGA ", Color::light_grey()}, {{0, 0}, "MIN: MAX: LNA VGA ", Color::light_grey()},
@ -132,7 +132,7 @@ namespace ui
""}; ""};
OptionsField steps_config{ OptionsField steps_config{
{ 22 * 8, 4 * 16}, { 21 * 8, 4 * 16},
4, 4,
{ {
{"1", 1}, {"1", 1},
@ -140,7 +140,14 @@ namespace ui
{"100", 100}, {"100", 100},
{"250", 250}, {"250", 250},
{"500", 500}, {"500", 500},
{"1000", 1000}, }};
OptionsField view_config{
{25 * 8, 4 * 16},
5,
{
{"SPCTR", false },
{"LVL-V", true },
}}; }};
OptionsField filter_config{ OptionsField filter_config{