changed text index to button, adding set to index and on_encoder, global indentation

This commit is contained in:
GullCode 2023-03-24 23:44:16 +01:00
parent 9398b12093
commit 3d13ee828e
4 changed files with 2470 additions and 2364 deletions

File diff suppressed because it is too large Load Diff

View File

@ -42,367 +42,383 @@
namespace ui { namespace ui {
class ReconThread { class ReconThread {
public: public:
ReconThread(freqman_db *database ); ReconThread(freqman_db *database );
~ReconThread(); ~ReconThread();
void set_recon(const bool v); void set_recon(const bool v);
void set_freq_delete(const bool v); void set_freq_delete(const bool v);
bool is_recon(); bool is_recon();
void set_lock_duration( const uint32_t v ); void set_lock_duration( const uint32_t v );
uint32_t get_lock_duration(); uint32_t get_lock_duration();
void set_lock_nb_match( const uint32_t v ); void set_lock_nb_match( const uint32_t v );
void set_match_mode( const uint32_t v ); void set_match_mode( const uint32_t v );
uint32_t get_lock_nb_match(); uint32_t get_lock_nb_match();
void set_freq_lock(const uint32_t v); void set_freq_lock(const uint32_t v);
uint32_t is_freq_lock(); uint32_t is_freq_lock();
int64_t get_current_freq(); int64_t get_current_freq();
void set_stepper(const int64_t v); void set_stepper(const int64_t v);
void change_recon_direction(); void change_recon_direction();
bool get_recon_direction(); bool get_recon_direction();
void set_recon_direction( const bool v); void set_recon_direction( const bool v);
void set_continuous(const bool v); void set_continuous(const bool v);
void set_default_modulation( freqman_index_t index ); void set_default_modulation( freqman_index_t index );
freqman_index_t get_current_modulation(); freqman_index_t get_current_modulation();
void set_default_bandwidth( freqman_index_t index ); void set_default_bandwidth( freqman_index_t index );
freqman_index_t get_current_bandwidth(); freqman_index_t get_current_bandwidth();
void set_default_step( freqman_index_t index ); void set_default_step( freqman_index_t index );
void set_freq_index( int16_t index ); void set_freq_index( int16_t index );
int16_t get_freq_index(); int16_t get_freq_index();
void run(); void run();
void stop(); void stop();
ReconThread(const ReconThread&) = delete; ReconThread(const ReconThread&) = delete;
ReconThread(ReconThread&&) = delete; ReconThread(ReconThread&&) = delete;
ReconThread& operator=(const ReconThread&) = delete; ReconThread& operator=(const ReconThread&) = delete;
ReconThread& operator=(ReconThread&&) = delete; ReconThread& operator=(ReconThread&&) = delete;
private: private:
freqman_db &frequency_list_ ; freqman_db &frequency_list_ ;
Thread* thread { nullptr }; Thread* thread { nullptr };
int64_t freq = 0 ; int64_t freq = 0 ;
uint32_t step = 0 ; uint32_t step = 0 ;
freqman_index_t def_modulation = 0 ; freqman_index_t def_modulation = 0 ;
freqman_index_t def_bandwidth = 0 ; freqman_index_t def_bandwidth = 0 ;
freqman_index_t def_step = 0 ; freqman_index_t def_step = 0 ;
tone_index tone = 0 ; tone_index tone = 0 ;
freqman_entry last_entry = { } ; freqman_entry last_entry = { } ;
int16_t frequency_index = 0 ; int16_t frequency_index = 0 ;
bool _recon { true }; bool _recon { true };
bool _freq_delete { false }; bool _freq_delete { false };
bool _fwd { true }; bool _fwd { true };
bool _continuous { true }; bool _continuous { true };
int64_t _stepper { 0 }; int64_t _stepper { 0 };
int32_t _freq_lock { 0 }; int32_t _freq_lock { 0 };
uint32_t _lock_duration { 50 }; uint32_t _lock_duration { 50 };
uint32_t _lock_nb_match { 10 }; uint32_t _lock_nb_match { 10 };
static msg_t static_fn(void* arg); static msg_t static_fn(void* arg);
}; };
class ReconView : public View { class ReconView : public View {
public: public:
ReconView(NavigationView& nav); ReconView(NavigationView& nav);
~ReconView(); ~ReconView();
void focus() override; void focus() override;
void big_display_freq( int64_t f ); void big_display_freq( int64_t f );
const Style style_grey { // recon const Style style_grey { // recon
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::grey(), .foreground = Color::grey(),
}; };
const Style style_white { // recon const Style style_white { // recon
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::white(), .foreground = Color::white(),
}; };
const Style style_yellow { //Found signal const Style style_yellow { //Found signal
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::yellow(), .foreground = Color::yellow(),
}; };
const Style style_green { //Found signal const Style style_green { //Found signal
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::green(), .foreground = Color::green(),
}; };
const Style style_red { //erasing freq const Style style_red { //erasing freq
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::red(), .foreground = Color::red(),
}; };
const Style style_blue { // quick recon, wait == 0 const Style style_blue { // quick recon, wait == 0
.font = font::fixed_8x16, .font = font::fixed_8x16,
.background = Color::black(), .background = Color::black(),
.foreground = Color::blue(), .foreground = Color::blue(),
}; };
std::string title() const override { return "Recon"; }; std::string title() const override { return "Recon"; };
//void set_parent_rect(const Rect new_parent_rect) override; //void set_parent_rect(const Rect new_parent_rect) override;
private: private:
NavigationView& nav_; NavigationView& nav_;
void start_recon_thread(); void start_recon_thread();
size_t change_mode( freqman_index_t mod_type); size_t change_mode( freqman_index_t mod_type);
void show_max( bool refresh_display = false ); void show_max( bool refresh_display = false );
void recon_pause(); void recon_pause();
void recon_resume(); void recon_resume();
void user_pause(); void user_pause();
void user_resume(); void user_resume();
void frequency_file_load( bool stop_all_before = false); void frequency_file_load( bool stop_all_before = false);
void on_statistics_update(const ChannelStatistics& statistics); void on_statistics_update(const ChannelStatistics& statistics);
void on_headphone_volume_changed(int32_t v); void on_headphone_volume_changed(int32_t v);
void set_display_freq( int64_t freq ); void set_display_freq( int64_t freq );
void handle_retune( int64_t freq , uint32_t index ); void handle_retune( int64_t freq , uint32_t index );
bool check_sd_card(); bool check_sd_card();
void handle_coded_squelch(const uint32_t value);
jammer::jammer_range_t frequency_range { false, 0, 0 }; //perfect for manual recon task too... jammer::jammer_range_t frequency_range { false, 0, 0 }; //perfect for manual recon task too...
int32_t squelch { 0 }; int32_t squelch { 0 };
int32_t db { 0 }; int32_t db { 0 };
int32_t timer { 0 }; int32_t timer { 0 };
int32_t wait { 5000 }; // in msec. if > 0 wait duration after a lock, if < 0 duration is set to 'wait' unless there is no more activity int32_t wait { 5000 }; // in msec. if > 0 wait duration after a lock, if < 0 duration is set to 'wait' unless there is no more activity
uint32_t lock_wait { 500 }; // in msec. Represent the maximum amount of time we will wait for a lock to complete before switching to next uint32_t lock_wait { 500 }; // in msec. Represent the maximum amount of time we will wait for a lock to complete before switching to next
int32_t def_step { 0 }; int32_t def_step { 0 };
freqman_db frequency_list = { }; freqman_db frequency_list = { };
uint32_t current_index { 0 }; uint32_t current_index { 0 };
bool userpause { false }; bool userpause { false };
bool continuous_lock { false }; bool continuous_lock { false };
std::string input_file = { "RECON" }; std::string input_file = { "RECON" };
std::string output_file = { "RECON_RESULTS" }; std::string output_file = { "RECON_RESULTS" };
bool autosave = { true }; bool autosave = { true };
bool autostart = { true }; bool autostart = { true };
bool continuous = { true }; bool continuous = { true };
bool filedelete = { true }; bool filedelete = { true };
bool load_freqs = { true }; bool load_freqs = { true };
bool load_ranges = { true }; bool load_ranges = { true };
bool load_hamradios = { true }; bool load_hamradios = { true };
bool update_ranges = { true }; bool update_ranges = { true };
bool fwd = { true }; bool fwd = { true };
// maximum usable freq // maximum usable freq
long long int MAX_UFREQ = { 7200000000 }; long long int MAX_UFREQ = { 7200000000 };
uint32_t recon_lock_nb_match = { 10 }; uint32_t recon_lock_nb_match = { 10 };
uint32_t recon_lock_duration = { 50 }; uint32_t recon_lock_duration = { 50 };
uint32_t recon_match_mode = { 0 }; uint32_t recon_match_mode = { 0 };
bool scanner_mode { false }; bool scanner_mode { false };
bool manual_mode { false }; bool manual_mode { false };
bool sd_card_mounted = false ; bool sd_card_mounted = false ;
int32_t volume = 40 ; int32_t volume = 40 ;
Labels labels Labels labels
{ {
{ { 0 * 8 , 0 * 16 }, "LNA: VGA: AMP: VOL: ", Color::light_grey() }, { { 0 * 8 , 0 * 16 }, "LNA: VGA: AMP: VOL: ", Color::light_grey() },
{ { 0 * 8 , 1 * 16 }, "BW: SQ: W,L: , ", Color::light_grey() }, { { 0 * 8 , 1 * 16 }, "BW: SQ: W,L: , ", Color::light_grey() },
{ { 3 * 8 , 10 * 16 }, "START END MANUAL", Color::light_grey() }, { { 3 * 8 , 10 * 16 }, "START END MANUAL", Color::light_grey() },
{ { 0 * 8 , (26 * 8) + 4 }, "MODE:", Color::light_grey() }, { { 0 * 8 , (26 * 8) + 4 }, "MODE:", Color::light_grey() },
{ { 11 * 8 , (26 * 8) + 4 }, "STEP:", Color::light_grey() }, { { 11 * 8 , (26 * 8) + 4 }, "STEP:", Color::light_grey() },
}; };
LNAGainField field_lna { LNAGainField field_lna {
{ 4 * 8, 0 * 16 } { 4 * 8, 0 * 16 }
}; };
VGAGainField field_vga { VGAGainField field_vga {
{ 11 * 8, 0 * 16 } { 11 * 8, 0 * 16 }
}; };
RFAmpField field_rf_amp { RFAmpField field_rf_amp {
{ 18 * 8, 0 * 16 } { 18 * 8, 0 * 16 }
}; };
NumberField field_volume { NumberField field_volume {
{ 24 * 8, 0 * 16 }, { 24 * 8, 0 * 16 },
2, 2,
{ 0, 99 }, { 0, 99 },
1, 1,
' ', ' ',
}; };
OptionsField field_bw { OptionsField field_bw {
{ 3 * 8, 1 * 16 }, { 3 * 8, 1 * 16 },
6, 6,
{ } { }
}; };
NumberField field_squelch { NumberField field_squelch {
{ 12 * 8, 1 * 16 }, { 12 * 8, 1 * 16 },
3, 3,
{ -90, 20 }, { -90, 20 },
1, 1,
' ', ' ',
}; };
NumberField field_wait { NumberField field_wait {
{ 20 * 8, 1 * 16 }, { 20 * 8, 1 * 16 },
5, 5,
{ -9000, 9000 }, { -9000, 9000 },
100, 100,
' ', ' ',
}; };
NumberField field_lock_wait { NumberField field_lock_wait {
{ 26 * 8, 1 * 16 }, { 26 * 8, 1 * 16 },
4, 4,
{ 100 , 9000 }, { 100 , 9000 },
100, 100,
' ', ' ',
}; };
RSSI rssi { RSSI rssi {
{ 0 * 16, 2 * 16, 240 - 4 * 8 , 16 }, { 0 * 16, 2 * 16, 240 - 4 * 8 , 16 },
}; };
Text text_cycle { ButtonWithEncoder text_cycle {
{ 0, 3 * 16, 3 * 8, 16 }, { 0, 3 * 16, 3 * 8, 16 },
}; ""
};
Text text_max { Text text_max {
{ 3 * 8, 3 * 16, 20 * 8 , 16 }, { 3 * 8, 3 * 16, 20 * 8 , 16 },
}; };
Text desc_cycle { Text desc_cycle {
{0, 4 * 16, 240 , 16 }, {0, 4 * 16, 240 , 16 },
}; };
/* BigFrequency big_display { //Show frequency in glamour /* BigFrequency big_display { //Show frequency in glamour
{ 4, 7 * 16 - 8 , 28 * 8, 52 }, { 4, 7 * 16 - 8 , 28 * 8, 52 },
0 0
}; */ }; */
Text big_display { //Show frequency in text mode Text big_display { //Show frequency in text mode
{ 0, 5 * 16 , 21 * 8, 16 }, { 0, 5 * 16 , 21 * 8, 16 },
}; };
Text freq_stats { //Show frequency stats in text mode Text freq_stats { //Show frequency stats in text mode
{ 0, 6 * 16 , 21 * 8, 16 }, { 0, 6 * 16 , 21 * 8, 16 },
}; };
Text text_timer { //Show frequency stats in text mode // TIMER: 9999
{ 0, 7 * 16 , 21 * 8, 16 }, Text text_timer { //Show frequency stats in text mode
}; { 0, 7 * 16 , 11 * 8, 16 },
};
Button button_recon_setup { Text text_ctcss {
{ 240 - 4 * 8 , 2 * 16 , 4 * 8, 28 }, { 12 * 8 + 4, 7 * 16 , 14 * 8, 1 * 8 },
"OPT" ""
}; };
Button button_looking_glass { Button button_recon_setup {
{ 240 - 5 * 8 , 6 * 16 - 4 , 5 * 8, 28 }, { 240 - 4 * 8 , 2 * 16 , 4 * 8, 28 },
"GLASS" "OPT"
}; };
Button button_scanner_mode { Button button_looking_glass {
{ 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 }, { 240 - 5 * 8 , 6 * 16 - 4 , 5 * 8, 28 },
"RECON" "GLASS"
}; };
Text file_name { //Show file used Button button_scanner_mode {
{ 0 , 8 * 16 + 6 , 21 * 8, 16 }, { 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 },
}; "RECON"
};
ButtonWithEncoder button_manual_start { Text file_name { //Show file used
{ 0 * 8, 11 * 16, 11 * 8, 28 }, { 0 , 8 * 16 + 6 , 21 * 8, 16 },
"" };
};
ButtonWithEncoder button_manual_end { ButtonWithEncoder button_manual_start {
{ 12 * 8 - 6, 11 * 16, 11 * 8, 28 }, { 0 * 8, 11 * 16, 11 * 8, 28 },
"" ""
}; };
Button button_manual_recon { ButtonWithEncoder button_manual_end {
{ 23 * 8 - 3, 11 * 16, 7 * 8 , 28 }, { 12 * 8 - 6, 11 * 16, 11 * 8, 28 },
"SEARCH" ""
}; };
OptionsField field_mode { Button button_manual_recon {
{ 5 * 8, (26 * 8) + 4 }, { 23 * 8 - 3, 11 * 16, 7 * 8 , 28 },
6, "SEARCH"
{ };
}
};
OptionsField step_mode { OptionsField field_mode {
{ 17 * 8, (26 * 8) + 4 }, { 5 * 8, (26 * 8) + 4 },
12, 6,
{ {
} }
}; };
ButtonWithEncoder button_pause { OptionsField step_mode {
{ 0, (15 * 16) - 4, 72, 28 }, { 17 * 8, (26 * 8) + 4 },
"PAUSE" 12,
}; {
}
};
ButtonWithEncoder button_pause {
{ 0, (15 * 16) - 4, 72, 28 },
"PAUSE"
};
Button button_audio_app { Button button_audio_app {
{ 84, (15 * 16) - 4, 72, 28 }, { 84, (15 * 16) - 4, 72, 28 },
"AUDIO" "AUDIO"
}; };
ButtonWithEncoder button_add { ButtonWithEncoder button_add {
{ 168, (15 * 16) - 4, 72, 28 }, { 168, (15 * 16) - 4, 72, 28 },
"<STORE>" "<STORE>"
}; };
Button button_dir { Button button_dir {
{ 0, (35 * 8) - 4, 34, 28 }, { 0, (35 * 8) - 4, 34, 28 },
"FW>" "FW>"
}; };
Button button_restart { Button button_restart {
{ 38, (35 * 8) - 4, 34, 28 }, { 38, (35 * 8) - 4, 34, 28 },
"RST" "RST"
}; };
Button button_mic_app { Button button_mic_app {
{ 84, (35 * 8) - 4, 72, 28 }, { 84, (35 * 8) - 4, 72, 28 },
"MIC TX" "MIC TX"
}; };
ButtonWithEncoder button_remove { ButtonWithEncoder button_remove {
{ 168, (35 * 8) - 4, 72, 28 }, { 168, (35 * 8) - 4, 72, 28 },
"<REMOVE>" "<REMOVE>"
}; };
std::unique_ptr<ReconThread> recon_thread { }; std::unique_ptr<ReconThread> recon_thread { };
MessageHandlerRegistration message_handler_retune { MessageHandlerRegistration message_handler_coded_squelch {
Message::ID::Retune, Message::ID::CodedSquelch,
[this](const Message* const p) { [this](const Message* const p) {
const auto message = *reinterpret_cast<const RetuneMessage*>(p); const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
this->handle_retune(message.freq,message.range); this->handle_coded_squelch(message.value);
} }
}; };
MessageHandlerRegistration message_handler_stats { MessageHandlerRegistration message_handler_retune {
Message::ID::ChannelStatistics, Message::ID::Retune,
[this](const Message* const p) { [this](const Message* const p) {
this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics); const auto message = *reinterpret_cast<const RetuneMessage*>(p);
} this->handle_retune(message.freq,message.range);
}; }
// app save settings };
std::app_settings settings { };
std::app_settings::AppSettings app_settings { }; MessageHandlerRegistration message_handler_stats {
}; Message::ID::ChannelStatistics,
[this](const Message* const p) {
this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
}
};
// app save settings
std::app_settings settings { };
std::app_settings::AppSettings app_settings { };
};
} /* namespace ui */ } /* namespace ui */

View File

@ -34,268 +34,268 @@ using namespace portapack;
namespace ui { namespace ui {
bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume ) bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume )
{ {
File settings_file; File settings_file;
size_t length, file_position = 0; size_t length, file_position = 0;
char * pos; char * pos;
char * line_start; char * line_start;
char * line_end; char * line_end;
char file_data[257]; char file_data[257];
uint32_t it = 0 ; uint32_t it = 0 ;
uint32_t nb_params = 9 ; uint32_t nb_params = 9 ;
std::string params[ 9 ]; std::string params[ 9 ];
bool check_sd_card = (sd_card::status() == sd_card::Status::Mounted) ? true : false ; bool check_sd_card = (sd_card::status() == sd_card::Status::Mounted) ? true : false ;
if( check_sd_card ) if( check_sd_card )
{ {
auto result = settings_file.open( source ); auto result = settings_file.open( source );
if( !result.is_valid() ) if( !result.is_valid() )
{ {
while( it < nb_params ) while( it < nb_params )
{ {
// Read a 256 bytes block from file // Read a 256 bytes block from file
settings_file.seek(file_position); settings_file.seek(file_position);
memset(file_data, 0, 257); memset(file_data, 0, 257);
auto read_size = settings_file.read(file_data, 256); auto read_size = settings_file.read(file_data, 256);
if (read_size.is_error()) if (read_size.is_error())
break ; break ;
file_position += 256; file_position += 256;
// Reset line_start to beginning of buffer // Reset line_start to beginning of buffer
line_start = file_data; line_start = file_data;
pos=line_start; pos=line_start;
while ((line_end = strstr(line_start, "\x0A"))) { while ((line_end = strstr(line_start, "\x0A"))) {
length = line_end - line_start - 1 ; length = line_end - line_start - 1 ;
params[ it ] = string( pos , length ); params[ it ] = string( pos , length );
it ++ ; it ++ ;
line_start = line_end + 1; line_start = line_end + 1;
pos=line_start ; pos=line_start ;
if (line_start - file_data >= 256) if (line_start - file_data >= 256)
break; break;
if( it >= nb_params ) if( it >= nb_params )
break ; break ;
} }
if (read_size.value() != 256) if (read_size.value() != 256)
break; // End of file break; // End of file
// Restart at beginning of last incomplete line // Restart at beginning of last incomplete line
file_position -= (file_data + 256 - line_start); file_position -= (file_data + 256 - line_start);
} }
} }
} }
if( it > 0 ) if( it > 0 )
input_file = params[ 0 ]; input_file = params[ 0 ];
else else
input_file = "RECON" ; input_file = "RECON" ;
if( it > 1 ) if( it > 1 )
output_file= params[ 1 ]; output_file= params[ 1 ];
else else
output_file = "RECON_RESULTS" ; output_file = "RECON_RESULTS" ;
if( it > 2 ) if( it > 2 )
recon_lock_duration = strtoll( params[ 2 ].c_str() , nullptr , 10 ); recon_lock_duration = strtoll( params[ 2 ].c_str() , nullptr , 10 );
else else
recon_lock_duration = 50 ; recon_lock_duration = 50 ;
if( it > 3 ) if( it > 3 )
recon_lock_nb_match = strtoll( params[ 3 ].c_str() , nullptr , 10 ); recon_lock_nb_match = strtoll( params[ 3 ].c_str() , nullptr , 10 );
else else
recon_lock_nb_match = 10 ; recon_lock_nb_match = 10 ;
if( it > 4 ) if( it > 4 )
recon_squelch_level = strtoll( params[ 4 ].c_str() , nullptr , 10 ); recon_squelch_level = strtoll( params[ 4 ].c_str() , nullptr , 10 );
else else
recon_squelch_level = -14 ; recon_squelch_level = -14 ;
if( it > 5 ) if( it > 5 )
recon_match_mode = strtoll( params[ 5 ].c_str() , nullptr , 10 ); recon_match_mode = strtoll( params[ 5 ].c_str() , nullptr , 10 );
else else
recon_match_mode = 0 ; recon_match_mode = 0 ;
if( it > 6 ) if( it > 6 )
wait = strtoll( params[ 6 ].c_str() , nullptr , 10 ); wait = strtoll( params[ 6 ].c_str() , nullptr , 10 );
else else
wait = 5000 ; wait = 5000 ;
if( it > 7 ) if( it > 7 )
lock_wait = strtoll( params[ 7 ].c_str() , nullptr , 10 ); lock_wait = strtoll( params[ 7 ].c_str() , nullptr , 10 );
else else
lock_wait = 1000 ; lock_wait = 1000 ;
if( it > 8 ) if( it > 8 )
volume = strtoll( params[ 8 ].c_str() , nullptr , 10 ); volume = strtoll( params[ 8 ].c_str() , nullptr , 10 );
else else
volume = 40 ; volume = 40 ;
if( it < nb_params ) if( it < nb_params )
{ {
/* bad number of params, signal defaults */ /* bad number of params, signal defaults */
return false ; return false ;
} }
return true ; return true ;
} }
bool ReconSetupSaveStrings( std::string dest, std::string input_file , std::string output_file , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume ) bool ReconSetupSaveStrings( std::string dest, std::string input_file , std::string output_file , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume )
{ {
File settings_file; File settings_file;
auto result = settings_file.create( dest ); auto result = settings_file.create( dest );
if( result.is_valid() ) if( result.is_valid() )
return false ; return false ;
settings_file.write_line( input_file ); settings_file.write_line( input_file );
settings_file.write_line( output_file ); settings_file.write_line( output_file );
settings_file.write_line( to_string_dec_uint( recon_lock_duration ) ); settings_file.write_line( to_string_dec_uint( recon_lock_duration ) );
settings_file.write_line( to_string_dec_uint( recon_lock_nb_match ) ); settings_file.write_line( to_string_dec_uint( recon_lock_nb_match ) );
settings_file.write_line( to_string_dec_int( recon_squelch_level ) ); settings_file.write_line( to_string_dec_int( recon_squelch_level ) );
settings_file.write_line( to_string_dec_uint( recon_match_mode ) ); settings_file.write_line( to_string_dec_uint( recon_match_mode ) );
settings_file.write_line( to_string_dec_int( wait ) ); settings_file.write_line( to_string_dec_int( wait ) );
settings_file.write_line( to_string_dec_uint( lock_wait ) ); settings_file.write_line( to_string_dec_uint( lock_wait ) );
settings_file.write_line( to_string_dec_int( volume ) ); settings_file.write_line( to_string_dec_int( volume ) );
return true ; return true ;
} }
ReconSetupViewMain::ReconSetupViewMain( NavigationView &nav , Rect parent_rect , std::string input_file , std::string output_file ) : View( parent_rect ) , _input_file { input_file } , _output_file { output_file } ReconSetupViewMain::ReconSetupViewMain( NavigationView &nav , Rect parent_rect , std::string input_file , std::string output_file ) : View( parent_rect ) , _input_file { input_file } , _output_file { output_file }
{ {
hidden(true); hidden(true);
add_children({ add_children({
&button_load_freqs, &button_load_freqs,
&text_input_file, &text_input_file,
&button_save_freqs, &button_save_freqs,
&button_output_file, &button_output_file,
&checkbox_autosave_freqs, &checkbox_autosave_freqs,
&checkbox_autostart_recon, &checkbox_autostart_recon,
&checkbox_continuous, &checkbox_continuous,
&checkbox_clear_output &checkbox_clear_output
}); });
checkbox_autosave_freqs.set_value( persistent_memory::recon_autosave_freqs() ); checkbox_autosave_freqs.set_value( persistent_memory::recon_autosave_freqs() );
checkbox_autostart_recon.set_value( persistent_memory::recon_autostart_recon() ); checkbox_autostart_recon.set_value( persistent_memory::recon_autostart_recon() );
checkbox_continuous.set_value( persistent_memory::recon_continuous() ); checkbox_continuous.set_value( persistent_memory::recon_continuous() );
checkbox_clear_output.set_value( persistent_memory::recon_clear_output() ); checkbox_clear_output.set_value( persistent_memory::recon_clear_output() );
text_input_file.set( _input_file ); text_input_file.set( _input_file );
button_output_file.set_text( _output_file ); button_output_file.set_text( _output_file );
button_load_freqs.on_select = [this, &nav](Button&) { button_load_freqs.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".TXT"); auto open_view = nav.push<FileLoadView>(".TXT");
open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) { open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
std::string dir_filter = "FREQMAN/"; std::string dir_filter = "FREQMAN/";
std::string str_file_path = new_file_path.string(); std::string str_file_path = new_file_path.string();
if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
// get the filename without txt extension so we can use load_freqman_file fcn // get the filename without txt extension so we can use load_freqman_file fcn
_input_file = new_file_path.stem().string(); _input_file = new_file_path.stem().string();
text_input_file.set( _input_file ); text_input_file.set( _input_file );
} else { } else {
nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired."); nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
} }
}; };
}; };
button_save_freqs.on_select = [this, &nav](Button&) { button_save_freqs.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".TXT"); auto open_view = nav.push<FileLoadView>(".TXT");
open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) { open_view->on_changed = [this,&nav](std::filesystem::path new_file_path) {
std::string dir_filter = "FREQMAN/"; std::string dir_filter = "FREQMAN/";
std::string str_file_path = new_file_path.string(); std::string str_file_path = new_file_path.string();
if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
_output_file = new_file_path.stem().string(); _output_file = new_file_path.stem().string();
button_output_file.set_text( _output_file ); button_output_file.set_text( _output_file );
} else { } else {
nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired."); nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
} }
}; };
}; };
button_output_file.on_select =[this, &nav](Button&) { button_output_file.on_select =[this, &nav](Button&) {
text_prompt( nav, _output_file , 28 , text_prompt( nav, _output_file , 28 ,
[this](std::string& buffer) { [this](std::string& buffer) {
_output_file = buffer ; _output_file = buffer ;
button_output_file.set_text( _output_file ); button_output_file.set_text( _output_file );
} ); } );
}; };
}; };
void ReconSetupViewMain::Save( std::string &input_file , std::string &output_file ) { void ReconSetupViewMain::Save( std::string &input_file , std::string &output_file ) {
persistent_memory::set_recon_autosave_freqs(checkbox_autosave_freqs.value()); persistent_memory::set_recon_autosave_freqs(checkbox_autosave_freqs.value());
persistent_memory::set_recon_autostart_recon(checkbox_autostart_recon.value()); persistent_memory::set_recon_autostart_recon(checkbox_autostart_recon.value());
persistent_memory::set_recon_continuous(checkbox_continuous.value()); persistent_memory::set_recon_continuous(checkbox_continuous.value());
persistent_memory::set_recon_clear_output(checkbox_clear_output.value()); persistent_memory::set_recon_clear_output(checkbox_clear_output.value());
input_file=_input_file ; input_file=_input_file ;
output_file=_output_file ; output_file=_output_file ;
}; };
void ReconSetupViewMore::Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode ) { void ReconSetupViewMore::Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode ) {
persistent_memory::set_recon_load_freqs(checkbox_load_freqs.value()); persistent_memory::set_recon_load_freqs(checkbox_load_freqs.value());
persistent_memory::set_recon_load_ranges(checkbox_load_ranges.value()); persistent_memory::set_recon_load_ranges(checkbox_load_ranges.value());
persistent_memory::set_recon_load_hamradios(checkbox_load_hamradios.value()); persistent_memory::set_recon_load_hamradios(checkbox_load_hamradios.value());
persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value()); persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value());
recon_lock_duration = field_recon_lock_duration.value(); recon_lock_duration = field_recon_lock_duration.value();
recon_lock_nb_match = field_recon_lock_nb_match.value(); recon_lock_nb_match = field_recon_lock_nb_match.value();
recon_match_mode = field_recon_match_mode . selected_index_value() ; recon_match_mode = field_recon_match_mode . selected_index_value() ;
}; };
void ReconSetupViewMain::focus() { void ReconSetupViewMain::focus() {
button_load_freqs.focus(); button_load_freqs.focus();
} }
ReconSetupViewMore::ReconSetupViewMore( NavigationView &nav , Rect parent_rect , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , uint32_t recon_match_mode ) : View( parent_rect ), _recon_lock_duration { recon_lock_duration } , _recon_lock_nb_match { recon_lock_nb_match } , _recon_match_mode { recon_match_mode } ReconSetupViewMore::ReconSetupViewMore( NavigationView &nav , Rect parent_rect , uint32_t recon_lock_duration , uint32_t recon_lock_nb_match , uint32_t recon_match_mode ) : View( parent_rect ), _recon_lock_duration { recon_lock_duration } , _recon_lock_nb_match { recon_lock_nb_match } , _recon_match_mode { recon_match_mode }
{ {
(void)nav; (void)nav;
hidden(true); hidden(true);
add_children({ add_children({
&checkbox_load_freqs, &checkbox_load_freqs,
&checkbox_load_ranges, &checkbox_load_ranges,
&checkbox_load_hamradios, &checkbox_load_hamradios,
&checkbox_update_ranges_when_recon, &checkbox_update_ranges_when_recon,
&text_recon_lock_duration, &text_recon_lock_duration,
&field_recon_lock_duration, &field_recon_lock_duration,
&text_recon_lock_nb, &text_recon_lock_nb,
&field_recon_lock_nb_match, &field_recon_lock_nb_match,
&field_recon_match_mode, &field_recon_match_mode,
}); });
checkbox_load_freqs.set_value( persistent_memory::recon_load_freqs() ); checkbox_load_freqs.set_value( persistent_memory::recon_load_freqs() );
checkbox_load_ranges.set_value( persistent_memory::recon_load_ranges() ); checkbox_load_ranges.set_value( persistent_memory::recon_load_ranges() );
checkbox_load_hamradios.set_value( persistent_memory::recon_load_hamradios() ); checkbox_load_hamradios.set_value( persistent_memory::recon_load_hamradios() );
checkbox_update_ranges_when_recon.set_value( persistent_memory::recon_update_ranges_when_recon() ); checkbox_update_ranges_when_recon.set_value( persistent_memory::recon_update_ranges_when_recon() );
field_recon_lock_duration.set_value( _recon_lock_duration ); field_recon_lock_duration.set_value( _recon_lock_duration );
field_recon_lock_nb_match.set_value( _recon_lock_nb_match ); field_recon_lock_nb_match.set_value( _recon_lock_nb_match );
field_recon_match_mode.set_by_value( _recon_match_mode ); field_recon_match_mode.set_by_value( _recon_match_mode );
}; };
void ReconSetupViewMore::focus() { void ReconSetupViewMore::focus() {
checkbox_load_freqs.focus(); checkbox_load_freqs.focus();
} }
void ReconSetupView::focus() { void ReconSetupView::focus() {
viewMain.focus(); viewMain.focus();
} }
ReconSetupView::ReconSetupView( ReconSetupView::ReconSetupView(
NavigationView& nav , std::string _input_file , std::string _output_file , uint32_t _recon_lock_duration , uint32_t _recon_lock_nb_match , uint32_t _recon_match_mode ) : nav_ { nav } , input_file { _input_file } , output_file { _output_file } , recon_lock_duration { _recon_lock_duration } , recon_lock_nb_match { _recon_lock_nb_match } , recon_match_mode { _recon_match_mode } NavigationView& nav , std::string _input_file , std::string _output_file , uint32_t _recon_lock_duration , uint32_t _recon_lock_nb_match , uint32_t _recon_match_mode ) : nav_ { nav } , input_file { _input_file } , output_file { _output_file } , recon_lock_duration { _recon_lock_duration } , recon_lock_nb_match { _recon_lock_nb_match } , recon_match_mode { _recon_match_mode }
{ {
add_children({ add_children({
&tab_view, &tab_view,
&viewMain, &viewMain,
&viewMore, &viewMore,
&button_save &button_save
}); });
button_save.on_select = [this,&nav](Button&) { button_save.on_select = [this,&nav](Button&) {
viewMain.Save( input_file , output_file ); viewMain.Save( input_file , output_file );
viewMore.Save( recon_lock_duration , recon_lock_nb_match , recon_match_mode ); viewMore.Save( recon_lock_duration , recon_lock_nb_match , recon_match_mode );
std::vector<std::string> messages ; std::vector<std::string> messages ;
messages.push_back( input_file ); messages.push_back( input_file );
messages.push_back( output_file ); messages.push_back( output_file );
messages.push_back( to_string_dec_uint( recon_lock_duration ) ); messages.push_back( to_string_dec_uint( recon_lock_duration ) );
messages.push_back( to_string_dec_uint( recon_lock_nb_match ) ); messages.push_back( to_string_dec_uint( recon_lock_nb_match ) );
messages.push_back( to_string_dec_uint( recon_match_mode ) ); messages.push_back( to_string_dec_uint( recon_match_mode ) );
on_changed( messages ); on_changed( messages );
nav.pop(); nav.pop();
}; };
} }
} /* namespace ui */ } /* namespace ui */

View File

@ -29,166 +29,166 @@
namespace ui { namespace ui {
bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume ); bool ReconSetupLoadStrings( std::string source, std::string &input_file , std::string &output_file , uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , int32_t &recon_squelch_level , uint32_t &recon_match_mode , int32_t &wait , uint32_t &lock_wait , int32_t &volume );
bool ReconSetupSaveStrings( std::string dest, const std::string input_file , const std::string output_file , const uint32_t recon_lock_duration , const uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume ); bool ReconSetupSaveStrings( std::string dest, const std::string input_file , const std::string output_file , const uint32_t recon_lock_duration , const uint32_t recon_lock_nb_match , int32_t recon_squelch_level , uint32_t recon_match_mode , int32_t wait , uint32_t lock_wait , int32_t volume );
class ReconSetupViewMain : public View { class ReconSetupViewMain : public View {
public: public:
ReconSetupViewMain( NavigationView& nav, Rect parent_rect , std::string input_file , std::string output_file ); ReconSetupViewMain( NavigationView& nav, Rect parent_rect , std::string input_file , std::string output_file );
void Save( std::string &input_file , std::string &output_file ); void Save( std::string &input_file , std::string &output_file );
void focus() override; void focus() override;
private: private:
std::string _input_file = { "RECON" }; std::string _input_file = { "RECON" };
std::string _output_file = { "RECON_RESULTS" }; std::string _output_file = { "RECON_RESULTS" };
Button button_load_freqs { Button button_load_freqs {
{ 1 * 8 , 12 , 18 * 8 , 22 }, { 1 * 8 , 12 , 18 * 8 , 22 },
"select input file" "select input file"
}; };
Text text_input_file { Text text_input_file {
{ 1 * 8 , 4 + 2 * 16, 18 * 8, 22 }, { 1 * 8 , 4 + 2 * 16, 18 * 8, 22 },
"RECON" "RECON"
}; };
Button button_save_freqs { Button button_save_freqs {
{ 1 * 8 , 4 * 16 - 8 , 18 * 8 , 22 }, { 1 * 8 , 4 * 16 - 8 , 18 * 8 , 22 },
"select output file" "select output file"
}; };
Button button_output_file { Button button_output_file {
{ 1 * 8 , 5 * 16 - 2, 18 * 8, 22 }, { 1 * 8 , 5 * 16 - 2, 18 * 8, 22 },
"RECON_RESULTS" "RECON_RESULTS"
}; };
Checkbox checkbox_autosave_freqs { Checkbox checkbox_autosave_freqs {
{ 1 * 8, 7 * 16 - 4 }, { 1 * 8, 7 * 16 - 4 },
3, 3,
"autosave freqs" "autosave freqs"
}; };
Checkbox checkbox_autostart_recon { Checkbox checkbox_autostart_recon {
{ 1 * 8, 9 * 16 - 4 }, { 1 * 8, 9 * 16 - 4 },
3, 3,
"autostart recon" "autostart recon"
}; };
Checkbox checkbox_continuous { Checkbox checkbox_continuous {
{ 1 * 8, 11 * 16 - 4 }, { 1 * 8, 11 * 16 - 4 },
3, 3,
"continuous" "continuous"
}; };
Checkbox checkbox_clear_output { Checkbox checkbox_clear_output {
{ 1 * 8, 13 * 16 - 4 }, { 1 * 8, 13 * 16 - 4 },
3, 3,
"clear output at start" "clear output at start"
}; };
}; };
class ReconSetupViewMore : public View { class ReconSetupViewMore : public View {
public: public:
ReconSetupViewMore( NavigationView& nav, Rect parent_rect , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode ); ReconSetupViewMore( NavigationView& nav, Rect parent_rect , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
void Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode ); void Save( uint32_t &recon_lock_duration , uint32_t &recon_lock_nb_match , uint32_t &recon_match_mode );
void focus() override; void focus() override;
private: private:
const uint32_t _recon_lock_duration = 50 ; const uint32_t _recon_lock_duration = 50 ;
const uint32_t _recon_lock_nb_match = 10 ; const uint32_t _recon_lock_nb_match = 10 ;
const uint32_t _recon_match_mode = 0 ; const uint32_t _recon_match_mode = 0 ;
Checkbox checkbox_load_freqs { Checkbox checkbox_load_freqs {
{ 1 * 8, 12 }, { 1 * 8, 12 },
3, 3,
"input: load freqs" "input: load freqs"
}; };
Checkbox checkbox_load_ranges { Checkbox checkbox_load_ranges {
{ 1 * 8, 42 }, { 1 * 8, 42 },
3, 3,
"input: load ranges" "input: load ranges"
}; };
Checkbox checkbox_load_hamradios { Checkbox checkbox_load_hamradios {
{ 1 * 8, 72 }, { 1 * 8, 72 },
3, 3,
"input: load hamradios" "input: load hamradios"
}; };
Checkbox checkbox_update_ranges_when_recon { Checkbox checkbox_update_ranges_when_recon {
{ 1 * 8, 102 }, { 1 * 8, 102 },
3, 3,
"auto update m-ranges" "auto update m-ranges"
}; };
Text text_recon_lock_duration { Text text_recon_lock_duration {
{ 1 * 8 , 132 , 22 * 8 , 22 }, { 1 * 8 , 132 , 22 * 8 , 22 },
" ms (lock duration)" " ms (lock duration)"
}; };
NumberField field_recon_lock_duration { NumberField field_recon_lock_duration {
{ 1 * 8, 132 }, // position X , Y { 1 * 8, 132 }, // position X , Y
4, // number of displayed digits (even empty) 4, // number of displayed digits (even empty)
{ 50 , 990 }, // range of number { 50 , 990 }, // range of number
10, // rotary encoder increment 10, // rotary encoder increment
' ', // filling character ' ', // filling character
false // can loop false // can loop
}; };
Text text_recon_lock_nb { Text text_recon_lock_nb {
{ 1 * 8 , 162 , 25 * 8 , 22 }, { 1 * 8 , 162 , 25 * 8 , 22 },
" x (nb lock to match freq)" " x (nb lock to match freq)"
}; };
NumberField field_recon_lock_nb_match { NumberField field_recon_lock_nb_match {
{ 1 * 8, 162 }, { 1 * 8, 162 },
4, 4,
{ 1, 99 }, { 1, 99 },
1, 1,
' ', ' ',
false false
}; };
OptionsField field_recon_match_mode { OptionsField field_recon_match_mode {
{ 1 * 8, 192 }, { 1 * 8, 192 },
20, // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE 20, // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE
{ {
{ "SQL MATCH: CONTINOUS" , 0 }, { "SQL MATCH: CONTINOUS" , 0 },
{ "SQL MATCH: SPARSE" , 1 } { "SQL MATCH: SPARSE" , 1 }
} }
}; };
}; };
class ReconSetupView : public View { class ReconSetupView : public View {
public: public:
ReconSetupView( NavigationView& nav , std::string _input_file , std::string _output_file , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode ); ReconSetupView( NavigationView& nav , std::string _input_file , std::string _output_file , const uint32_t _recon_lock_duration , const uint32_t _recon_lock_nb_match , const uint32_t _recon_match_mode );
std::function<void( std::vector<std::string> messages )> on_changed { }; std::function<void( std::vector<std::string> messages )> on_changed { };
void focus() override; void focus() override;
std::string title() const override { return "Recon setup"; }; std::string title() const override { return "Recon setup"; };
private: private:
NavigationView& nav_ ; NavigationView& nav_ ;
std::string input_file = { "RECON" }; std::string input_file = { "RECON" };
std::string output_file = { "RECON_RESULTS" }; std::string output_file = { "RECON_RESULTS" };
uint32_t recon_lock_duration = 50 ; uint32_t recon_lock_duration = 50 ;
uint32_t recon_lock_nb_match = 10 ; uint32_t recon_lock_nb_match = 10 ;
uint32_t recon_match_mode = 0 ; uint32_t recon_match_mode = 0 ;
Rect view_rect = { 0, 3 * 8, 240, 230 }; Rect view_rect = { 0, 3 * 8, 240, 230 };
ReconSetupViewMain viewMain{ nav_ , view_rect , input_file , output_file }; ReconSetupViewMain viewMain{ nav_ , view_rect , input_file , output_file };
ReconSetupViewMore viewMore{ nav_ , view_rect , recon_lock_duration , recon_lock_nb_match , recon_match_mode }; ReconSetupViewMore viewMore{ nav_ , view_rect , recon_lock_duration , recon_lock_nb_match , recon_match_mode };
TabView tab_view { TabView tab_view {
{ "Main", Color::cyan() , &viewMain }, { "Main", Color::cyan() , &viewMain },
{ "More", Color::green(), &viewMore } { "More", Color::green(), &viewMore }
}; };
Button button_save { Button button_save {
{ 9 * 8, 255, 14 * 8 , 40 }, { 9 * 8, 255, 14 * 8 , 40 },
"SAVE" "SAVE"
}; };
}; };
} /* namespace ui */ } /* namespace ui */