mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-10-30 06:36:21 +00:00
Code Issues Releases Wiki Activity

Merge branch 'carlesfernandez:next' into osnma-cesare

Browse Source
This commit is contained in:
cesaaargm 2024-04-12 15:24:51 +02:00 committed by GitHub
commit 881bb5c58a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/FindTELEORBIT.cmake
View File

@ -38,6 +38,7 @@ set(TELEORBIT_ROOT_USER_DEFINED
find_path(TELEORBIT_INCLUDE_DIRS
NAMES teleorbit/api.h
HINTS ${PC_TELEORBIT_INCLUDEDIR}
PATH_SUFFIXES gnuradio
PATHS ${TELEORBIT_ROOT_USER_DEFINED}/include
/usr/include
/usr/local/include

2
src/algorithms/signal_source/adapters/flexiband_signal_source.cc
View File

@ -34,7 +34,7 @@ FlexibandSignalSource::FlexibandSignalSource(const ConfigurationInterface* confi
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
: SignalSourceBase(configuration, role, "Flexiband_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
{
const std::string default_item_type("byte");
const std::string default_item_type("gr_complex");
item_type_ = configuration->property(role + ".item_type", default_item_type);
const std::string default_firmware_file("flexiband_I-1b.bit");

6
src/algorithms/signal_source/adapters/flexiband_signal_source.h
View File

@ -66,10 +66,10 @@ public:
gr::basic_block_sptr get_right_block(int RF_channel) override;
private:
boost::shared_ptr<gr::block> flexiband_source_;
gnss_shared_ptr<gr::block> flexiband_source_;
std::vector<boost::shared_ptr<gr::block>> char_to_float;
std::vector<boost::shared_ptr<gr::block>> float_to_complex_;
std::vector<gnss_shared_ptr<gr::block>> char_to_float;
std::vector<gnss_shared_ptr<gr::block>> float_to_complex_;
std::vector<gr::blocks::null_sink::sptr> null_sinks_;
std::string item_type_;

3
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
View File

@ -1530,11 +1530,12 @@ int dll_pll_veml_tracking_fpga::general_work(int noutput_items __attribute__((un
{
boost::mutex::scoped_lock lock(d_mutex);
d_worker_is_done = false;
l.unlock();
while (!d_worker_is_done)
{
d_m_condition.wait(lock);
}
l.lock();
// Signal alignment (skip samples until the incoming signal is aligned with local replica)
int64_t acq_trk_diff_samples;
double acq_trk_diff_seconds;