mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Fix merging

Browse Source
This commit is contained in:
Carles Fernandez 2023-10-26 14:45:01 +02:00
parent b3d95779e5
commit 15840f6ae5
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,13 +105,9 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
d_enable_reed_solomon_inav(false), d_enable_reed_solomon_inav(false),
d_valid_timetag(false), d_valid_timetag(false),
d_E6_TOW_set(false), d_E6_TOW_set(false),
<<<<<<< HEAD
d_there_are_e1_channels(conf.there_are_e1_channels), d_there_are_e1_channels(conf.there_are_e1_channels),
d_there_are_e6_channels(conf.there_are_e6_channels)
=======
d_there_are_e6_channels(conf.there_are_e6_channels), d_there_are_e6_channels(conf.there_are_e6_channels),
d_use_ced(conf.use_ced) d_use_ced(conf.use_ced)
>>>>>>> 62a8547e62605a6b9fa6b1e128beceb046bde2dc
{ {
// prevent telemetry symbols accumulation in output buffers // prevent telemetry symbols accumulation in output buffers
this->set_max_noutput_items(1); this->set_max_noutput_items(1);