mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

Fix more cpplint format errors

Browse Source
This commit is contained in:
Javier Arribas 2021-12-05 19:52:25 +01:00
parent 03b14a0212
commit 28e9d20be7
7 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc
View File

@ -35,6 +35,7 @@
#include <exception> // for exception #include <exception> // for exception
#include <iostream> // for cout #include <iostream> // for cout
#include <memory> // for shared_ptr #include <memory> // for shared_ptr
#include <vector>
#ifdef COMPILER_HAS_ROTL #ifdef COMPILER_HAS_ROTL
#include <bit> #include <bit>
@ -125,7 +126,7 @@ gps_l1_ca_telemetry_decoder_gs::gps_l1_ca_telemetry_decoder_gs(
d_symbol_history.set_capacity(d_required_symbols); d_symbol_history.set_capacity(d_required_symbols);
set_tag_propagation_policy(TPP_DONT); //no tag propagation, the time tag will be adjusted and regenerated in work() set_tag_propagation_policy(TPP_DONT); // no tag propagation, the time tag will be adjusted and regenerated in work()
if (d_dump_crc_stats) if (d_dump_crc_stats)
{ {

2
src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h
View File

@ -20,7 +20,7 @@
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "gnss_satellite.h" #include "gnss_satellite.h"
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "gnss_time.h" //for timetags produced by Tracking #include "gnss_time.h" // for timetags produced by Tracking
#include "gps_navigation_message.h" #include "gps_navigation_message.h"
#include "nav_message_packet.h" #include "nav_message_packet.h"
#include "tlm_conf.h" #include "tlm_conf.h"

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

@ -57,6 +57,7 @@
#include <exception> // for exception #include <exception> // for exception
#include <iostream> // for cout, cerr #include <iostream> // for cout, cerr
#include <map> #include <map>
#include <memory>
#include <numeric> #include <numeric>
#include <vector> #include <vector>
@ -594,7 +595,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_)
} }
d_last_timetag_samplecounter = 0; d_last_timetag_samplecounter = 0;
d_timetag_waiting = false; d_timetag_waiting = false;
set_tag_propagation_policy(TPP_DONT); //no tag propagation, the time tag will be adjusted and regenerated in work() set_tag_propagation_policy(TPP_DONT); // no tag propagation, the time tag will be adjusted and regenerated in work()
} }
@ -1721,7 +1722,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
if (d_pull_in_transitory == true) if (d_pull_in_transitory == true)
{ {
//if (d_trk_parameters.pull_in_time_s < (d_sample_counter - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in)) // if (d_trk_parameters.pull_in_time_s < (d_sample_counter - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in))
if (d_trk_parameters.pull_in_time_s < (this->nitems_read(0) - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in)) if (d_trk_parameters.pull_in_time_s < (this->nitems_read(0) - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in))
{ {
d_pull_in_transitory = false; d_pull_in_transitory = false;
@ -1733,7 +1734,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
{ {
case 0: // Standby - Consume samples at full throttle, do nothing case 0: // Standby - Consume samples at full throttle, do nothing
{ {
//d_sample_counter += static_cast<uint64_t>(ninput_items[0]); // d_sample_counter += static_cast<uint64_t>(ninput_items[0]);
consume_each(ninput_items[0]); consume_each(ninput_items[0]);
return 0; return 0;
break; break;
@ -1741,7 +1742,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
case 1: // Pull-in case 1: // Pull-in
{ {
// Signal alignment (skip samples until the incoming signal is aligned with local replica) // Signal alignment (skip samples until the incoming signal is aligned with local replica)
//const int64_t acq_trk_diff_samples = static_cast<int64_t>(d_sample_counter) - static_cast<int64_t>(d_acq_sample_stamp); // const int64_t acq_trk_diff_samples = static_cast<int64_t>(d_sample_counter) - static_cast<int64_t>(d_acq_sample_stamp);
const int64_t acq_trk_diff_samples = static_cast<int64_t>(this->nitems_read(0)) - static_cast<int64_t>(d_acq_sample_stamp); const int64_t acq_trk_diff_samples = static_cast<int64_t>(this->nitems_read(0)) - static_cast<int64_t>(d_acq_sample_stamp);
const double acq_trk_diff_seconds = static_cast<double>(acq_trk_diff_samples) / d_trk_parameters.fs_in; const double acq_trk_diff_seconds = static_cast<double>(acq_trk_diff_samples) / d_trk_parameters.fs_in;
const double delta_trk_to_acq_prn_start_samples = static_cast<double>(acq_trk_diff_samples) - d_acq_code_phase_samples; const double delta_trk_to_acq_prn_start_samples = static_cast<double>(acq_trk_diff_samples) - d_acq_code_phase_samples;
@ -1759,7 +1760,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
const int32_t samples_offset = round(d_acq_code_phase_samples); const int32_t samples_offset = round(d_acq_code_phase_samples);
d_acc_carrier_phase_rad -= d_carrier_phase_step_rad * static_cast<double>(samples_offset); d_acc_carrier_phase_rad -= d_carrier_phase_step_rad * static_cast<double>(samples_offset);
d_state = 2; d_state = 2;
//d_sample_counter += samples_offset; // count for the processed samples // d_sample_counter += samples_offset; // count for the processed samples
d_cn0_smoother.reset(); d_cn0_smoother.reset();
d_carrier_lock_test_smoother.reset(); d_carrier_lock_test_smoother.reset();
@ -1790,7 +1791,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
// } // }
// fail-safe: check if the secondary code or bit synchronization has not succeeded in a limited time period // fail-safe: check if the secondary code or bit synchronization has not succeeded in a limited time period
//if (d_trk_parameters.bit_synchronization_time_limit_s < (d_sample_counter - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in)) // if (d_trk_parameters.bit_synchronization_time_limit_s < (d_sample_counter - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in))
if (d_trk_parameters.bit_synchronization_time_limit_s < (this->nitems_read(0) - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in)) if (d_trk_parameters.bit_synchronization_time_limit_s < (this->nitems_read(0) - d_acq_sample_stamp) / static_cast<int>(d_trk_parameters.fs_in))
{ {
d_carrier_lock_fail_counter = 300000; // force loss-of-lock condition d_carrier_lock_fail_counter = 300000; // force loss-of-lock condition
@ -2047,7 +2048,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
consume_each(d_current_prn_length_samples); consume_each(d_current_prn_length_samples);
//d_sample_counter += static_cast<uint64_t>(d_current_prn_length_samples); // d_sample_counter += static_cast<uint64_t>(d_current_prn_length_samples);
if (current_synchro_data.Flag_valid_symbol_output || loss_of_lock) if (current_synchro_data.Flag_valid_symbol_output || loss_of_lock)
{ {
current_synchro_data.fs = static_cast<int64_t>(d_trk_parameters.fs_in); current_synchro_data.fs = static_cast<int64_t>(d_trk_parameters.fs_in);

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

@ -22,7 +22,7 @@
#include "dll_pll_conf.h" #include "dll_pll_conf.h"
#include "exponential_smoother.h" #include "exponential_smoother.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "gnss_time.h" //for timetags produced by File_Timestamp_Signal_Source #include "gnss_time.h" // for timetags produced by File_Timestamp_Signal_Source
#include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter #include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter
#include "tracking_loop_filter.h" // for DLL filter #include "tracking_loop_filter.h" // for DLL filter
#include <boost/circular_buffer.hpp> #include <boost/circular_buffer.hpp>
@ -165,7 +165,7 @@ private:
std::ofstream d_dump_file; std::ofstream d_dump_file;
//uint64_t d_sample_counter; // uint64_t d_sample_counter;
uint64_t d_acq_sample_stamp; uint64_t d_acq_sample_stamp;
GnssTime d_last_timetag; GnssTime d_last_timetag;
uint64_t d_last_timetag_samplecounter; uint64_t d_last_timetag_samplecounter;

6
src/algorithms/tracking/gnuradio_blocks/kf_vtl_tracking.cc
View File

@ -922,7 +922,7 @@ void kf_vtl_tracking::update_kf_narrow_intgration_time()
<< 0 << 0 << 0 << 1 << 0 << arma::endr << 0 << 0 << 0 << 1 << 0 << arma::endr
<< 0 << 0 << 0 << 0 << 1 << arma::endr; << 0 << 0 << 0 << 0 << 1 << arma::endr;
double B = d_code_chip_rate / d_signal_carrier_freq; //carrier to code rate factor double B = d_code_chip_rate / d_signal_carrier_freq; // carrier to code rate factor
H << 1 << 0 << -B * Ti / 2.0 << B * (Ti * Ti) / 6.0 << 0 << arma::endr H << 1 << 0 << -B * Ti / 2.0 << B * (Ti * Ti) / 6.0 << 0 << arma::endr
<< 0 << 1 << -GNSS_PI * Ti << GNSS_PI * (Ti * Ti) / 3.0 << 0 << arma::endr; << 0 << 1 << -GNSS_PI * Ti << GNSS_PI * (Ti * Ti) / 3.0 << 0 << arma::endr;
@ -950,7 +950,7 @@ void kf_vtl_tracking::update_kf_cn0(double current_cn0_dbhz)
{ {
// Kalman Filter class variables // Kalman Filter class variables
double Ti = d_correlation_length_ms * 0.001; double Ti = d_correlation_length_ms * 0.001;
double B = d_code_chip_rate / d_signal_carrier_freq; //carrier to code rate factor double B = d_code_chip_rate / d_signal_carrier_freq; // carrier to code rate factor
H = arma::mat(2, 5); H = arma::mat(2, 5);
H << 1 << 0 << -B * Ti / 2.0 << B * (Ti * Ti) / 6.0 << 0 << arma::endr H << 1 << 0 << -B * Ti / 2.0 << B * (Ti * Ti) / 6.0 << 0 << arma::endr
@ -1211,7 +1211,7 @@ void kf_vtl_tracking::run_Kf()
// { // {
// if (d_pull_in_transitory == false and d_corrected_doppler == false) // if (d_pull_in_transitory == false and d_corrected_doppler == false)
// { // {
// //todo // todo: alforithm here...
// } // }
// } // }

11
src/algorithms/tracking/gnuradio_blocks/kf_vtl_tracking.h
View File

@ -23,7 +23,7 @@
#include "cpu_multicorrelator_real_codes.h" #include "cpu_multicorrelator_real_codes.h"
#include "exponential_smoother.h" #include "exponential_smoother.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "gnss_time.h" //for timetags produced by File_Timestamp_Signal_Source #include "gnss_time.h" // for timetags produced by File_Timestamp_Signal_Source
#include "kf_conf.h" #include "kf_conf.h"
#include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter #include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter
#include "tracking_loop_filter.h" // for DLL filter #include "tracking_loop_filter.h" // for DLL filter
@ -37,9 +37,10 @@
#include <cstddef> // for size_t #include <cstddef> // for size_t
#include <cstdint> // for int32_t #include <cstdint> // for int32_t
#include <fstream> // for ofstream #include <fstream> // for ofstream
#include <string> // for string #include <memory>
#include <typeinfo> // for typeid #include <string> // for string
#include <utility> // for pair #include <typeinfo> // for typeid
#include <utility> // for pair
class Gnss_Synchro; class Gnss_Synchro;
class kf_vtl_tracking; class kf_vtl_tracking;
@ -110,7 +111,7 @@ private:
volk_gnsssdr::vector<gr_complex> d_Prompt_Data; volk_gnsssdr::vector<gr_complex> d_Prompt_Data;
volk_gnsssdr::vector<gr_complex> d_Prompt_buffer; volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
//boost::circular_buffer<std::pair<double, double>> d_code_ph_history; // boost::circular_buffer<std::pair<double, double>> d_code_ph_history;
boost::circular_buffer<gr_complex> d_Prompt_circular_buffer; boost::circular_buffer<gr_complex> d_Prompt_circular_buffer;

2
src/core/receiver/gnss_flowgraph.cc
View File

@ -1442,7 +1442,7 @@ int GNSSFlowgraph::connect_observables_to_pvt()
pmt::pmt_t ports_in = channels_.at(i)->get_left_block_trk()->message_ports_in(); pmt::pmt_t ports_in = channels_.at(i)->get_left_block_trk()->message_ports_in();
for (size_t n = 0; n < pmt::length(ports_in); n++) for (size_t n = 0; n < pmt::length(ports_in); n++)
{ {
//std::cout << "pmt: " << pmt::symbol_to_string(pmt::vector_ref(ports_in, n)) << "\n"; // std::cout << "pmt: " << pmt::symbol_to_string(pmt::vector_ref(ports_in, n)) << "\n";
if (pmt::symbol_to_string(pmt::vector_ref(ports_in, n)) == "pvt_to_trk") if (pmt::symbol_to_string(pmt::vector_ref(ports_in, n)) == "pvt_to_trk")
{ {
top_block_->msg_connect(pvt_->get_left_block(), pmt::mp("pvt_to_trk"), channels_.at(i)->get_left_block_trk(), pmt::mp("pvt_to_trk")); top_block_->msg_connect(pvt_->get_left_block(), pmt::mp("pvt_to_trk"), channels_.at(i)->get_left_block_trk(), pmt::mp("pvt_to_trk"));