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

src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc

@@ -33,6 +33,7 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(
     DLOG(INFO) << "role " << role;
     tlm_parameters_.SetFromConfiguration(configuration, role);
     tlm_parameters_.enable_reed_solomon = configuration->property(role + ".enable_reed_solomon", false);
+    tlm_parameters_.use_ced = configuration->property(role + ".use_reduced_ced", false);
     // make telemetry decoder object
     telemetry_decoder_ = galileo_make_telemetry_decoder_gs(satellite_, tlm_parameters_, 1);  // unified galileo decoder set to INAV (frame_type=1)
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc

@@ -105,8 +105,13 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
                       d_enable_reed_solomon_inav(false),
                       d_valid_timetag(false),
                       d_E6_TOW_set(false),
+<<<<<<< HEAD
                       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_use_ced(conf.use_ced)
+>>>>>>> 62a8547e62605a6b9fa6b1e128beceb046bde2dc
 {
     // prevent telemetry symbols accumulation in output buffers
     this->set_max_noutput_items(1);
@@ -450,7 +455,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
     else
         {
             // If we still do not have ephemeris, check if we have a reduced CED
-            if ((d_band == '1') && !d_first_eph_sent && (d_inav_nav.have_new_reduced_ced() == true))
+            if ((d_band == '1') && d_use_ced && !d_first_eph_sent && (d_inav_nav.have_new_reduced_ced() == true))
                 {
                     const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(d_inav_nav.get_reduced_ced());
                     std::cout << "New Galileo E1 I/NAV reduced CED message received in channel " << d_channel << " from satellite " << d_satellite << std::endl;

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h

@@ -153,6 +153,7 @@ private:
     bool d_E6_TOW_set;
     bool d_there_are_e1_channels;
     bool d_there_are_e6_channels;
+    bool d_use_ced;
 };
 
 

src/algorithms/telemetry_decoder/libs/tlm_conf.h

@@ -44,6 +44,7 @@ public:
     bool enable_navdata_monitor{false};
     bool there_are_e1_channels{false};
     bool there_are_e6_channels{false};
+    bool use_ced{false};
 };