mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +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-05-23 09:12:28 +02:00
commit 81645bb81e
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
9 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/PVT/libs/CMakeLists.txt
View File

@ -95,7 +95,7 @@ if(Boost_VERSION VERSION_GREATER "106599")
endif() endif()
if(OS_IS_MACOSX) if(OS_IS_MACOSX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_definitions(pvt_libs target_compile_definitions(pvt_libs
PUBLIC PUBLIC
-DBOOST_ASIO_HAS_STD_STRING_VIEW -DBOOST_ASIO_HAS_STD_STRING_VIEW

2
src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
View File

@ -77,7 +77,7 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
endif() endif()
if(OS_IS_MACOSX) if(OS_IS_MACOSX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_definitions(signal_source_gr_blocks target_compile_definitions(signal_source_gr_blocks
PUBLIC PUBLIC
-DBOOST_ASIO_HAS_STD_STRING_VIEW -DBOOST_ASIO_HAS_STD_STRING_VIEW

2
src/algorithms/tracking/libs/CMakeLists.txt
View File

@ -101,7 +101,7 @@ if(Boost_VERSION VERSION_GREATER "106599")
endif() endif()
if(OS_IS_MACOSX) if(OS_IS_MACOSX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_definitions(tracking_libs target_compile_definitions(tracking_libs
PUBLIC PUBLIC
-DBOOST_ASIO_HAS_STD_STRING_VIEW -DBOOST_ASIO_HAS_STD_STRING_VIEW

7
src/algorithms/tracking/libs/bayesian_estimation.cc
View File

@ -6,7 +6,12 @@
* the properties of a stochastic process based on a sequence of * the properties of a stochastic process based on a sequence of
* discrete samples of the sequence. * discrete samples of the sequence.
* *
* [1] TODO: Refs * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian
* Covariance Estimation for Kalman Filter based Digital Carrier
* Synchronization," Proceedings of the 31st International Technical Meeting
* of the Satellite Division of The Institute of Navigation
* (ION GNSS+ 2018), Miami, Florida, September 2018, pp. 3575-3586.
* https://doi.org/10.33012/2018.15911
* *
* \authors <ul> * \authors <ul>
* <li> Gerald LaMountain, 2018. gerald(at)ece.neu.edu * <li> Gerald LaMountain, 2018. gerald(at)ece.neu.edu

7
src/algorithms/tracking/libs/bayesian_estimation.h
View File

@ -6,7 +6,12 @@
* the properties of a stochastic process based on a sequence of * the properties of a stochastic process based on a sequence of
* discrete samples of the sequence. * discrete samples of the sequence.
* *
* [1] TODO: Refs * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian
* Covariance Estimation for Kalman Filter based Digital Carrier
* Synchronization," Proceedings of the 31st International Technical Meeting
* of the Satellite Division of The Institute of Navigation
* (ION GNSS+ 2018), Miami, Florida, September 2018, pp. 3575-3586.
* https://doi.org/10.33012/2018.15911
* *
* \authors <ul> * \authors <ul>
* <li> Gerald LaMountain, 2018. gerald(at)ece.neu.edu * <li> Gerald LaMountain, 2018. gerald(at)ece.neu.edu

2
src/algorithms/tracking/libs/lock_detectors.h
View File

@ -64,7 +64,7 @@
* *
* The SNR value is converted to CN0 [dB-Hz], taking to account the coherent integration time, using the following formula: * The SNR value is converted to CN0 [dB-Hz], taking to account the coherent integration time, using the following formula:
* \f{equation} * \f{equation}
* CN0_{dB}=10*log(\hat{\rho})-10*log(2 * T_{int}), * CN0_{dB}=10*log(\hat{\rho})-10*log(T_{int}),
* \f} * \f}
* where \f$T_{int}\f$ is the coherent integration time, in seconds. * where \f$T_{int}\f$ is the coherent integration time, in seconds.
* Ref: Marco Pini, Emanuela Falletti and Maurizio Fantino, "Performance * Ref: Marco Pini, Emanuela Falletti and Maurizio Fantino, "Performance

2
src/core/monitor/CMakeLists.txt
View File

@ -69,7 +69,7 @@ endif()
if(OS_IS_MACOSX) if(OS_IS_MACOSX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_definitions(core_monitor target_compile_definitions(core_monitor
PUBLIC PUBLIC
-DBOOST_ASIO_HAS_STD_STRING_VIEW -DBOOST_ASIO_HAS_STD_STRING_VIEW

2
src/core/receiver/CMakeLists.txt
View File

@ -163,7 +163,7 @@ target_link_libraries(core_receiver
) )
if(OS_IS_MACOSX) if(OS_IS_MACOSX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_definitions(core_receiver target_compile_definitions(core_receiver
PUBLIC PUBLIC
-DBOOST_ASIO_HAS_STD_STRING_VIEW -DBOOST_ASIO_HAS_STD_STRING_VIEW

14
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
View File

@ -60,16 +60,16 @@ class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx;
typedef boost::shared_ptr<GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx> GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr; typedef boost::shared_ptr<GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx> GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr;
GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue); GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx : public gr::block class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx : public gr::block
{ {
private: private:
friend GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue); friend GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg); void msg_handler_events(pmt::pmt_t msg);
GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue); GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
concurrent_queue<int>& channel_internal_queue; Concurrent_Queue<int>& channel_internal_queue;
public: public:
int rx_message; int rx_message;
@ -77,7 +77,7 @@ public:
}; };
GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue) GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{ {
return GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(queue)); return GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(queue));
} }
@ -99,7 +99,7 @@ void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pm
} }
GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue) GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{ {
this->message_port_register_in(pmt::mp("events")); this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@ -139,7 +139,7 @@ protected:
void process_message(); void process_message();
void stop_queue(); void stop_queue();
concurrent_queue<int> channel_internal_queue; Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue; gr::msg_queue::sptr queue;
gr::top_block_sptr top_block; gr::top_block_sptr top_block;
std::shared_ptr<GpsL1CaPcpsOpenClAcquisition> acquisition; std::shared_ptr<GpsL1CaPcpsOpenClAcquisition> acquisition;