mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-30 06:36:21 +00:00
Merge branch 'carlesfernandez:next' into osnma-cesare
This commit is contained in:
commit
881bb5c58a
@ -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
|
||||
|
@ -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");
|
||||
|
@ -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_;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user