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

Merge pull request #832 from gullradriel/recon-update

Browse Source 
Recon update
This commit is contained in:
gullradriel 2023-03-13 23:18:26 +01:00 committed by GitHub
commit d1ab93f644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 165 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef _UI_GLASS
#define _UI_GLASS
#include "ui.hpp"
#include "portapack.hpp"
#include "baseband_api.hpp"
@ -184,4 +187,4 @@
};
}
#endif

27
firmware/application/apps/ui_recon.cpp
View File

@ -524,15 +524,21 @@ namespace ui {
if(frequency_list[index].description.size() > 0) desc_cycle.set( frequency_list[index].description ); //Show new description
}
big_display.set_style(&style_white);
if( !userpause )
button_pause.set_text("<PAUSE>");
else
button_pause.set_text("<RESUME>");
}
else if( freq_lock == 1 && recon_lock_nb_match != 1 )
{
//STARTING LOCK FREQ
big_display.set_style(&style_yellow);
button_pause.set_text("<SKPLCK>");
}
else if( index < 1000 && freq_lock >= recon_thread -> get_lock_nb_match() )
{
big_display.set_style( &style_green);
button_pause.set_text("<UNLOCK>");
//FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
if( (!scanner_mode) && autosave && last_freq != freq ) {
@ -660,6 +666,7 @@ namespace ui {
&field_lock_wait,
&button_recon_setup,
&button_scanner_mode,
&button_looking_glass,
&file_name,
&rssi,
&text_cycle,
@ -875,6 +882,20 @@ namespace ui {
nav_.push<AnalogAudioView>();
};
button_looking_glass.on_select = [this](Button&) {
recon_thread->stop();
nav_.pop();
nav_.push<GlassView>();
};
rssi.set_focusable(true);
rssi.on_select = [this](RSSI&) {
recon_thread->stop();
nav_.pop();
nav_.push<LevelView>();
};
button_mic_app.on_select = [this](Button&) {
recon_thread->stop();
nav_.pop();
@ -1091,7 +1112,7 @@ namespace ui {
show_max(); /* display step information */
text_cycle.set( "MANUAL SEARCH" );
button_scanner_mode.set_style( &style_white );
button_scanner_mode.set_text( "M-SEARCH" );
button_scanner_mode.set_text( "MSEARCH" );
file_name.set_style( &style_white );
file_name.set( "USE: MANUAL RANGE" );
@ -1653,7 +1674,7 @@ namespace ui {
void ReconView::user_pause() {
timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq.
button_pause.set_text("<RESUME>"); //PAUSED, show resume
//button_pause.set_text("<RESUME>"); //PAUSED, show resume
userpause=true;
continuous_lock=false;
recon_pause();
@ -1661,7 +1682,7 @@ namespace ui {
void ReconView::user_resume() {
timer = 0 ; // Will trigger a recon_resume() on_statistics_update, also advancing to next freq.
button_pause.set_text("<PAUSE>"); //Show button for pause
//button_pause.set_text("<PAUSE>"); //Show button for pause
userpause=false; // Resume recon
continuous_lock=false;
recon_resume();

18
firmware/application/apps/ui_recon.hpp
View File

@ -31,6 +31,8 @@
#include "analog_audio_app.hpp"
#include "audio.hpp"
#include "ui_mictx.hpp"
#include "ui_level.hpp"
#include "ui_looking_glass_app.hpp"
#include "portapack_persistent_memory.hpp"
#include "baseband_api.hpp"
#include "string_format.hpp"
@ -285,15 +287,15 @@ namespace ui {
}; */
Text big_display { //Show frequency in text mode
{ 0, 5 * 16 , 28 * 8, 16 },
{ 0, 5 * 16 , 21 * 8, 16 },
};
Text freq_stats { //Show frequency stats in text mode
{ 0, 6 * 16 , 28 * 8, 16 },
{ 0, 6 * 16 , 21 * 8, 16 },
};
Text text_timer { //Show frequency stats in text mode
{ 0, 7 * 16 , 28 * 8, 16 },
{ 0, 7 * 16 , 21 * 8, 16 },
};
Button button_recon_setup {
@ -301,16 +303,20 @@ namespace ui {
"OPT"
};
Button button_looking_glass {
{ 240 - 5 * 8 , 6 * 16 , 5 * 8, 28 },
"GLASS"
};
Button button_scanner_mode {
{ 21 * 8 , 8 * 16 , 9 * 8, 28 },
{ 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 },
"RECON"
};
Text file_name { //Show file used
{ 0 , 8 * 16 + 4 , 20 * 8, 16 },
{ 0 , 8 * 16 + 4 , 21 * 8, 16 },
};
ButtonWithEncoder button_manual_start {
{ 0 * 8, 11 * 16, 11 * 8, 28 },
""

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

@ -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 */

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

@ -25,88 +25,96 @@
#include "ui.hpp"
#include "ui_widget.hpp"
#include "ui_painter.hpp"
#include "event_m0.hpp"
#include "message.hpp"
#include <cstdint>
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<void(RSSI&)> on_select { };
std::function<void(RSSI&)> on_touch_release { }; // Executed when releasing touch, after on_select.
std::function<void(RSSI&)> on_touch_press { }; // Executed when touching, before on_select.
std::function<bool(RSSI&, KeyEvent)> on_dir { };
std::function<void(RSSI&)> 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<const RSSIStatisticsMessage*>(p)->statistics);
}
};
MessageHandlerRegistration message_handler_pitch_rssi {
Message::ID::PitchRSSIConfigure,
[this](const Message* const p) {
const auto message = *reinterpret_cast<const PitchRSSIConfigureMessage*>(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<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 {
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<const PitchRSSIConfigureMessage*>(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<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 { } ;
};
}