mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Accessing maps is not so cheap, so doing in the constructor

Browse Source
This commit is contained in:
Carles Fernandez 2018-04-12 20:45:13 +02:00
parent 6dfacb1676
commit 1094e870bc
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
View File

@ -362,13 +362,15 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(dllpllconf_t conf_) : gr::block("dl
d_last_prompt = gr_complex(0.0, 0.0); d_last_prompt = gr_complex(0.0, 0.0);
d_state = 0; // initial state: standby d_state = 0; // initial state: standby
signal_pretty_name["1C"] = "L1 C/A"; map_signal_pretty_name["1C"] = "L1 C/A";
signal_pretty_name["1B"] = "E1"; map_signal_pretty_name["1B"] = "E1";
signal_pretty_name["1G"] = "L1 C/A"; map_signal_pretty_name["1G"] = "L1 C/A";
signal_pretty_name["2S"] = "L2C"; map_signal_pretty_name["2S"] = "L2C";
signal_pretty_name["2G"] = "L2 C/A"; map_signal_pretty_name["2G"] = "L2 C/A";
signal_pretty_name["5X"] = "E5a"; map_signal_pretty_name["5X"] = "E5a";
signal_pretty_name["L5"] = "L5"; map_signal_pretty_name["L5"] = "L5";
signal_pretty_name = map_signal_pretty_name[signal_type];
} }
@ -511,7 +513,7 @@ void dll_pll_veml_tracking::start_tracking()
d_code_loop_filter.set_pdi(static_cast<float>(d_code_period)); d_code_loop_filter.set_pdi(static_cast<float>(d_code_period));
// DEBUG OUTPUT // DEBUG OUTPUT
std::cout << "Tracking of " << systemName << " " << signal_pretty_name[signal_type] << " signal started on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl; std::cout << "Tracking of " << systemName << " " << signal_pretty_name << " signal started on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
LOG(INFO) << "Starting tracking of satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << " on channel " << d_channel; LOG(INFO) << "Starting tracking of satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << " on channel " << d_channel;
// enable tracking pull-in // enable tracking pull-in
@ -1263,7 +1265,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
next_state = acquire_secondary(); next_state = acquire_secondary();
if (next_state) if (next_state)
{ {
std::cout << systemName << " " << signal_pretty_name[signal_type] << " secondary code locked in channel " << d_channel std::cout << systemName << " " << signal_pretty_name << " secondary code locked in channel " << d_channel
<< " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl; << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
} }

3
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
View File

@ -119,7 +119,8 @@ private:
std::string systemName; std::string systemName;
std::string signal_type; std::string signal_type;
std::string *d_secondary_code_string; std::string *d_secondary_code_string;
std::map<std::string, std::string> signal_pretty_name; std::map<std::string, std::string> map_signal_pretty_name;
std::string signal_pretty_name;
//tracking state machine //tracking state machine
int d_state; int d_state;