mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-14 13:54:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-03-18 23:27:58 +01:00
commit 76568eb900
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/channel/adapters/channel.cc
View File

@ -155,6 +155,9 @@ void Channel::disconnect(gr::top_block_sptr top_block)
acq_->disconnect(top_block); acq_->disconnect(top_block);
trk_->disconnect(top_block); trk_->disconnect(top_block);
nav_->disconnect(top_block); nav_->disconnect(top_block);
top_block->msg_disconnect(nav_->get_left_block(), pmt::mp("telemetry_to_trk"), trk_->get_right_block(), pmt::mp("telemetry_to_trk"));
top_block->msg_disconnect(acq_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events"));
top_block->msg_disconnect(trk_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events"));
connected_ = false; connected_ = false;
} }

8
src/algorithms/libs/beidou_b3i_signal_processing.cc
View File

@ -45,9 +45,9 @@ void beidou_b3i_code_gen_int(int* _dest, signed int _prn, unsigned int _chip_shi
bool feedback1, feedback2, aux; bool feedback1, feedback2, aux;
uint32_t lcv, lcv2, delay; uint32_t lcv, lcv2, delay;
int32_t prn_idx = _prn - 1; int32_t prn_idx = _prn - 1;
// clang-format off
std::array<std::array<bool, 13>, 63> G2_register_shifted = {{ std::array<std::array<bool, 13>, 63> G2_register_shifted =
{{true, false, true, false, true, true, true, true, true, true, true, true, true}}, {{{{true, false, true, false, true, true, true, true, true, true, true, true, true}},
{{true, true, true, true, false, false, false, true, false, true, false, true, true}}, {{true, true, true, true, false, false, false, true, false, true, false, true, true}},
{{true, false, true, true, true, true, false, false, false, true, false, true, false}}, {{true, false, true, true, true, true, false, false, false, true, false, true, false}},
{{true, true, true, true, true, true, true, true, true, true, false, true, true}}, {{true, true, true, true, true, true, true, true, true, true, false, true, true}},
@ -110,7 +110,7 @@ void beidou_b3i_code_gen_int(int* _dest, signed int _prn, unsigned int _chip_shi
{{false, true, true, true, false, false, false, true, false, false, false, false, false}}, {{false, true, true, true, false, false, false, true, false, false, false, false, false}},
{{false, false, true, true, false, false, true, false, false, false, false, true, false}}, {{false, false, true, true, false, false, true, false, false, false, false, true, false}},
{{false, false, true, false, false, false, true, false, false, true, true, true, false}}}}; {{false, false, true, false, false, false, true, false, false, true, true, true, false}}}};
// clang-format on
// A simple error check // A simple error check
if ((prn_idx < 0) || (prn_idx > 63)) if ((prn_idx < 0) || (prn_idx > 63))
return; return;