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

Improve wording

Browse Source
This commit is contained in:
Carles Fernandez 2020-07-28 10:51:45 +02:00
parent 1a1addf2c4
commit b33d7ba739
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc
View File

@ -252,7 +252,7 @@ void beidou_b1i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Beidou_Dnav_Utc_Model> tmp_obj = std::make_shared<Beidou_Dnav_Utc_Model>(d_nav.get_utc_model()); const std::shared_ptr<Beidou_Dnav_Utc_Model> tmp_obj = std::make_shared<Beidou_Dnav_Utc_Model>(d_nav.get_utc_model());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV UTC Model have been received in channel" << d_channel << " from satellite " << d_satellite; LOG(INFO) << "BEIDOU DNAV UTC Model data have been received in channel" << d_channel << " from satellite " << d_satellite;
std::cout << "New BEIDOU B1I DNAV utc model message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << '\n'; std::cout << "New BEIDOU B1I DNAV utc model message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << '\n';
} }
if (d_nav.have_new_iono() == true) if (d_nav.have_new_iono() == true)
@ -260,7 +260,7 @@ void beidou_b1i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Beidou_Dnav_Iono> tmp_obj = std::make_shared<Beidou_Dnav_Iono>(d_nav.get_iono()); const std::shared_ptr<Beidou_Dnav_Iono> tmp_obj = std::make_shared<Beidou_Dnav_Iono>(d_nav.get_iono());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV Iono have been received in channel" << d_channel << " from satellite " << d_satellite; LOG(INFO) << "BEIDOU DNAV Iono data have been received in channel" << d_channel << " from satellite " << d_satellite;
std::cout << "New BEIDOU B1I DNAV Iono message received in channel " << d_channel << ": Iono model parameters from satellite " << d_satellite << '\n'; std::cout << "New BEIDOU B1I DNAV Iono message received in channel " << d_channel << ": Iono model parameters from satellite " << d_satellite << '\n';
} }
if (d_nav.have_new_almanac() == true) if (d_nav.have_new_almanac() == true)
@ -268,7 +268,7 @@ void beidou_b1i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
// uint32_t slot_nbr = d_nav.i_alm_satellite_PRN; // uint32_t slot_nbr = d_nav.i_alm_satellite_PRN;
// std::shared_ptr<Beidou_Dnav_Almanac> tmp_obj = std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr)); // std::shared_ptr<Beidou_Dnav_Almanac> tmp_obj = std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr));
// this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); // this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV Almanac have been received in channel" << d_channel << " from satellite " << d_satellite << '\n'; LOG(INFO) << "BEIDOU DNAV Almanac data have been received in channel" << d_channel << " from satellite " << d_satellite << '\n';
std::cout << "New BEIDOU B1I DNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << '\n'; std::cout << "New BEIDOU B1I DNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << '\n';
} }
} }

6
src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc
View File

@ -257,7 +257,7 @@ void beidou_b3i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
const std::shared_ptr<Beidou_Dnav_Utc_Model> tmp_obj = const std::shared_ptr<Beidou_Dnav_Utc_Model> tmp_obj =
std::make_shared<Beidou_Dnav_Utc_Model>(d_nav.get_utc_model()); std::make_shared<Beidou_Dnav_Utc_Model>(d_nav.get_utc_model());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV UTC Model have been received in channel" LOG(INFO) << "BEIDOU DNAV UTC Model data have been received in channel"
<< d_channel << " from satellite " << d_satellite; << d_channel << " from satellite " << d_satellite;
std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV utc model message received in channel " std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV utc model message received in channel "
<< d_channel << ": UTC model parameters from satellite " << d_channel << ": UTC model parameters from satellite "
@ -269,7 +269,7 @@ void beidou_b3i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
const std::shared_ptr<Beidou_Dnav_Iono> tmp_obj = const std::shared_ptr<Beidou_Dnav_Iono> tmp_obj =
std::make_shared<Beidou_Dnav_Iono>(d_nav.get_iono()); std::make_shared<Beidou_Dnav_Iono>(d_nav.get_iono());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV Iono have been received in channel" << d_channel LOG(INFO) << "BEIDOU DNAV Iono data have been received in channel" << d_channel
<< " from satellite " << d_satellite; << " from satellite " << d_satellite;
std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV Iono message received in channel " std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV Iono message received in channel "
<< d_channel << ": Iono model parameters from satellite " << d_channel << ": Iono model parameters from satellite "
@ -282,7 +282,7 @@ void beidou_b3i_telemetry_decoder_gs::decode_subframe(float *frame_symbols)
// std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr)); // std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr));
// this->message_port_pub(pmt::mp("telemetry"), // this->message_port_pub(pmt::mp("telemetry"),
// pmt::make_any(tmp_obj)); // pmt::make_any(tmp_obj));
LOG(INFO) << "BEIDOU DNAV Almanac have been received in channel" LOG(INFO) << "BEIDOU DNAV Almanac data have been received in channel"
<< d_channel << " from satellite " << d_satellite << '\n'; << d_channel << " from satellite " << d_satellite << '\n';
std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV almanac received in channel " << d_channel std::cout << TEXT_YELLOW << "New BEIDOU B3I DNAV almanac received in channel " << d_channel
<< " from satellite " << d_satellite << TEXT_RESET << '\n'; << " from satellite " << d_satellite << TEXT_RESET << '\n';

4
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc
View File

@ -192,7 +192,7 @@ void glonass_l1_ca_telemetry_decoder_gs::decode_string(const double *frame_symbo
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Glonass_Gnav_Utc_Model> tmp_obj = std::make_shared<Glonass_Gnav_Utc_Model>(d_nav.get_utc_model()); const std::shared_ptr<Glonass_Gnav_Utc_Model> tmp_obj = std::make_shared<Glonass_Gnav_Utc_Model>(d_nav.get_utc_model());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "GLONASS GNAV UTC Model have been received in channel" << d_channel << " from satellite " << d_satellite; LOG(INFO) << "GLONASS GNAV UTC Model data have been received in channel" << d_channel << " from satellite " << d_satellite;
std::cout << "New GLONASS L1 GNAV message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << '\n'; std::cout << "New GLONASS L1 GNAV message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << '\n';
} }
if (d_nav.have_new_almanac() == true) if (d_nav.have_new_almanac() == true)
@ -201,7 +201,7 @@ void glonass_l1_ca_telemetry_decoder_gs::decode_string(const double *frame_symbo
const std::shared_ptr<Glonass_Gnav_Almanac> const std::shared_ptr<Glonass_Gnav_Almanac>
tmp_obj = std::make_shared<Glonass_Gnav_Almanac>(d_nav.get_almanac(slot_nbr)); tmp_obj = std::make_shared<Glonass_Gnav_Almanac>(d_nav.get_almanac(slot_nbr));
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "GLONASS GNAV Almanac have been received in channel" << d_channel << " in slot number " << slot_nbr; LOG(INFO) << "GLONASS GNAV Almanac data have been received in channel" << d_channel << " in slot number " << slot_nbr;
std::cout << "New GLONASS L1 GNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << '\n'; std::cout << "New GLONASS L1 GNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << '\n';
} }
// 5. Update satellite information on system // 5. Update satellite information on system

4
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc
View File

@ -192,7 +192,7 @@ void glonass_l2_ca_telemetry_decoder_gs::decode_string(const double *frame_symbo
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Glonass_Gnav_Utc_Model> tmp_obj = std::make_shared<Glonass_Gnav_Utc_Model>(d_nav.get_utc_model()); const std::shared_ptr<Glonass_Gnav_Utc_Model> tmp_obj = std::make_shared<Glonass_Gnav_Utc_Model>(d_nav.get_utc_model());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "GLONASS GNAV UTC Model have been received in channel" << d_channel << " from satellite " << d_satellite; LOG(INFO) << "GLONASS GNAV UTC Model data have been received in channel" << d_channel << " from satellite " << d_satellite;
std::cout << TEXT_CYAN << "New GLONASS L2 GNAV message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << TEXT_RESET << '\n'; std::cout << TEXT_CYAN << "New GLONASS L2 GNAV message received in channel " << d_channel << ": UTC model parameters from satellite " << d_satellite << TEXT_RESET << '\n';
} }
if (d_nav.have_new_almanac() == true) if (d_nav.have_new_almanac() == true)
@ -200,7 +200,7 @@ void glonass_l2_ca_telemetry_decoder_gs::decode_string(const double *frame_symbo
const uint32_t slot_nbr = d_nav.get_alm_satellite_slot_number(); const uint32_t slot_nbr = d_nav.get_alm_satellite_slot_number();
const std::shared_ptr<Glonass_Gnav_Almanac> tmp_obj = std::make_shared<Glonass_Gnav_Almanac>(d_nav.get_almanac(slot_nbr)); const std::shared_ptr<Glonass_Gnav_Almanac> tmp_obj = std::make_shared<Glonass_Gnav_Almanac>(d_nav.get_almanac(slot_nbr));
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
LOG(INFO) << "GLONASS GNAV Almanac have been received in channel" << d_channel << " in slot number " << slot_nbr; LOG(INFO) << "GLONASS GNAV Almanac data have been received in channel" << d_channel << " in slot number " << slot_nbr;
std::cout << TEXT_CYAN << "New GLONASS L2 GNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << TEXT_RESET << '\n'; std::cout << TEXT_CYAN << "New GLONASS L2 GNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << TEXT_RESET << '\n';
} }
// 5. Update satellite information on system // 5. Update satellite information on system

2
src/core/system_parameters/beidou_dnav_navigation_message.cc
View File

@ -978,7 +978,7 @@ bool Beidou_Dnav_Navigation_Message::have_new_almanac()
{ {
if ((flag_d1_sf4 == true) and (flag_d1_sf5 == true)) if ((flag_d1_sf4 == true) and (flag_d1_sf5 == true))
{ {
// All almanac have been received // All Almanac data have been received
flag_d1_sf4 = false; flag_d1_sf4 = false;
flag_d1_sf5 = false; flag_d1_sf5 = false;

2
src/core/system_parameters/galileo_fnav_message.cc
View File

@ -385,7 +385,7 @@ bool Galileo_Fnav_Message::have_new_almanac() // Check if we have a new almanac
{ {
if ((flag_almanac_1 == true) and (flag_almanac_2 == true)) if ((flag_almanac_1 == true) and (flag_almanac_2 == true))
{ {
// All almanac have been received // All Almanac data have been received
flag_almanac_1 = false; flag_almanac_1 = false;
flag_almanac_2 = false; flag_almanac_2 = false;
flag_all_almanac = true; flag_all_almanac = true;

2
src/core/system_parameters/galileo_fnav_message.h
View File

@ -273,7 +273,7 @@ private:
bool flag_TOW_set{}; // it is true when page 1,2,3 or 4 arrives bool flag_TOW_set{}; // it is true when page 1,2,3 or 4 arrives
bool flag_utc_model{}; // Flag indicating that utc model parameters (word 4) have been received bool flag_utc_model{}; // Flag indicating that utc model parameters (word 4) have been received
bool flag_all_almanac{}; // Flag indicating that all almanac have been received bool flag_all_almanac{}; // Flag indicating that all Almanac data have been received
bool flag_almanac_1{}; // Flag indicating that almanac 1/2 (word 5) have been received bool flag_almanac_1{}; // Flag indicating that almanac 1/2 (word 5) have been received
bool flag_almanac_2{}; // Flag indicating that almanac 2/2 (word 6) have been received bool flag_almanac_2{}; // Flag indicating that almanac 2/2 (word 6) have been received
}; };

2
src/core/system_parameters/galileo_navigation_message.cc
View File

@ -252,7 +252,7 @@ bool Galileo_Navigation_Message::have_new_almanac() // Check if we have a new a
{ {
if ((flag_almanac_1 == true) and (flag_almanac_2 == true) and (flag_almanac_3 == true) and (flag_almanac_4 == true)) if ((flag_almanac_1 == true) and (flag_almanac_2 == true) and (flag_almanac_3 == true) and (flag_almanac_4 == true))
{ {
// All almanac have been received // All Almanac data have been received
flag_almanac_1 = false; flag_almanac_1 = false;
flag_almanac_2 = false; flag_almanac_2 = false;
flag_almanac_3 = false; flag_almanac_3 = false;

2
src/core/system_parameters/galileo_navigation_message.h
View File

@ -340,7 +340,7 @@ private:
bool flag_TOW_set{}; // it is true when page 5 or page 6 arrives bool flag_TOW_set{}; // it is true when page 5 or page 6 arrives
bool flag_utc_model{}; // Flag indicating that utc model parameters (word 6) have been received bool flag_utc_model{}; // Flag indicating that utc model parameters (word 6) have been received
bool flag_all_almanac{}; // Flag indicating that all almanac have been received bool flag_all_almanac{}; // Flag indicating that all Almanac data have been received
bool flag_almanac_1{}; // Flag indicating that almanac 1/4 (word 7) have been received bool flag_almanac_1{}; // Flag indicating that almanac 1/4 (word 7) have been received
bool flag_almanac_2{}; // Flag indicating that almanac 2/4 (word 8) have been received bool flag_almanac_2{}; // Flag indicating that almanac 2/4 (word 8) have been received
bool flag_almanac_3{}; // Flag indicating that almanac 3/4 (word 9) have been received bool flag_almanac_3{}; // Flag indicating that almanac 3/4 (word 9) have been received

2
src/core/system_parameters/glonass_gnav_navigation_message.cc
View File

@ -668,7 +668,7 @@ bool Glonass_Gnav_Navigation_Message::have_new_almanac() // Check if we have a
{ {
if (d_previous_Na[i_alm_satellite_slot_number] != gnav_utc_model.d_N_A) if (d_previous_Na[i_alm_satellite_slot_number] != gnav_utc_model.d_N_A)
{ {
// All almanac have been received for this satellite // All Almanac data have been received for this satellite
flag_almanac_str_6 = false; flag_almanac_str_6 = false;
flag_almanac_str_7 = false; flag_almanac_str_7 = false;
new_alm = true; new_alm = true;