Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-07 06:02:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added MIC TX and FREQ DEL buttons

Browse source 
MIC TX button :Shortcut for jumping into TX -> MIC app.

FREQ DEL button: Deletes currently displayed frequency from temporary scanning memory. Ideal to get rid of those not wanted "noisy" freqs in the middle of a range scan.

Also, some code optimizations thrown in.
This commit is contained in:
euquiq 2020-07-28 01:21:52 -03:00
parent e8f6e1389e
commit 03084251c5
2 changed files with 114 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

40
firmware/application/apps/ui_scanner.hpp
View file

@ -26,6 +26,8 @@
#include "ui_font_fixed_8x16.hpp"
#include "freqman.hpp"
#include "analog_audio_app.hpp"
#include "audio.hpp"
#include "ui_mictx.hpp"
#define MAX_DB_ENTRY 500
@ -46,12 +48,11 @@ public:
void set_scanning(const bool v);
bool is_scanning();
void set_userpause(const bool v);
bool is_userpause();
void set_freq_lock(const uint32_t v);
uint32_t is_freq_lock();
void set_freq_del(const uint32_t v);
void stop();
ScannerThread(const ScannerThread&) = delete;
@ -64,8 +65,8 @@ private:
Thread* thread { nullptr };
bool _scanning { true };
bool _userpause { false };
uint32_t _freq_lock { 0 };
uint32_t _freq_del { 0 };
static msg_t static_fn(void* arg);
void run();
};
@ -97,6 +98,12 @@ public:
.foreground = Color::green(),
};
const Style style_red { //erasing freq
.font = font::fixed_8x16,
.background = Color::black(),
.foreground = Color::red(),
};
std::string title() const override { return "SCANNER"; };
std::vector<rf::Frequency> frequency_list{ };
std::vector<string> description_list { };
@ -111,6 +118,7 @@ private:
void show_max();
void scan_pause();
void scan_resume();
void user_resume();
void on_statistics_update(const ChannelStatistics& statistics);
void on_headphone_volume_changed(int32_t v);
@ -122,13 +130,15 @@ private:
uint32_t wait { 0 };
size_t def_step { 0 };
freqman_db database { };
uint32_t current_index { 0 };
bool userpause { false };
Labels labels {
{ { 0 * 8, 0 * 16 }, "LNA: VGA: AMP: VOL:", Color::light_grey() },
{ { 0 * 8, 1* 16 }, "BW: SQUELCH: /99 WAIT:", Color::light_grey() },
{ { 3 * 8, 10 * 16 }, "START END MANUAL", Color::light_grey() },
{ { 0 * 8, 14 * 16 }, "MODE:", Color::light_grey() },
{ { 11 * 8, 14 * 16 }, "STEP:", Color::light_grey() },
{ { 0 * 8, 27 * 8 }, "MODE:", Color::light_grey() },
{ { 11 * 8, 27 * 8 }, "STEP:", Color::light_grey() },
};
LNAGainField field_lna {
@ -210,7 +220,7 @@ private:
};
OptionsField field_mode {
{ 5 * 8, 14 * 16 },
{ 5 * 8, 27 * 8 },
6,
{
{ " AM ", 0 },
@ -220,7 +230,7 @@ private:
};
OptionsField step_mode {
{ 17 * 8, 14 * 16 },
{ 17 * 8, 27 * 8 },
12,
{
{ "5Khz (SA AM)", 5000 },
@ -237,14 +247,24 @@ private:
};
Button button_pause {
{ 12, 17 * 16, 96, 24 },
{ 12, 15 * 16, 96, 24 },
"PAUSE"
};
Button button_audio_app {
{ 124, 17 * 16, 96, 24 },
{ 124, 15 * 16, 96, 24 },
"AUDIO APP"
};
Button button_remove {
{ 12, 17 * 16, 96, 24 },
"DEL FREQ"
};
Button button_mic_app {
{ 124, 17 * 16, 96, 24 },
"MIC TX APP"
};
std::unique_ptr<ScannerThread> scan_thread { };