mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-15 11:45:47 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2019-09-07 16:43:00 +02:00
commit c6fb801460
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
35 changed files with 99 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CMakeLists.txt
View File

@ -696,13 +696,6 @@ set_package_properties(Boost PROPERTIES
) )
if(CMAKE_VERSION VERSION_LESS 3.5) if(CMAKE_VERSION VERSION_LESS 3.5)
if(NOT TARGET Boost::boost)
add_library(Boost::boost SHARED IMPORTED) # Trick for CMake 2.8.12
set_target_properties(Boost::boost PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}
IMPORTED_LOCATION ${Boost_DATE_TIME_LIBRARIES}
)
endif()
if(NOT TARGET Boost::date_time) if(NOT TARGET Boost::date_time)
add_library(Boost::date_time SHARED IMPORTED) add_library(Boost::date_time SHARED IMPORTED)
set_target_properties(Boost::date_time PROPERTIES set_target_properties(Boost::date_time PROPERTIES
@ -2223,6 +2216,21 @@ set_package_properties(GRIIO PROPERTIES
PURPOSE "Used for communication with PlutoSDR and FMCOMMS devices." PURPOSE "Used for communication with PlutoSDR and FMCOMMS devices."
TYPE OPTIONAL TYPE OPTIONAL
) )
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
if(NOT GRIIO_FOUND)
message(STATUS "gnuradio-iio not found, its installation is required.")
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
if(ENABLE_PACKAGING)
set(ENABLE_PLUTOSDR OFF)
set(ENABLE_FMCOMMS2 OFF)
else()
message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with -DENABLE_PLUTOSDR=ON or -DENABLE_FMCOMMS2=ON.")
endif()
endif()
endif()
##################################################################### #####################################################################
@ -2235,6 +2243,21 @@ set_package_properties(LIBIIO PROPERTIES
PURPOSE "Used for communication with the AD9361 chipset." PURPOSE "Used for communication with the AD9361 chipset."
TYPE OPTIONAL TYPE OPTIONAL
) )
if(ENABLE_AD9361 OR ENABLE_FMCOMMS2)
if(NOT LIBIIO_FOUND)
message(STATUS "libiio not found, its installation is required.")
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
if(ENABLE_PACKAGING)
set(ENABLE_AD9361 OFF)
set(ENABLE_FMCOMMS2 OFF)
else()
message(FATAL_ERROR "libiio is required for building gnss-sdr with -DENABLE_AD9361=ON.")
endif()
endif()
endif()
############################################## ##############################################

36
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@ -25,30 +25,6 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
endif() endif()
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
if(NOT GRIIO_FOUND)
message(STATUS "gnuradio-iio not found, its installation is required.")
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with -DENABLE_PLUTOSDR=ON or -DENABLE_FMCOMMS2=ON.")
endif()
endif()
if(ENABLE_AD9361)
if(NOT LIBIIO_FOUND)
message(STATUS "libiio not found, its installation is required.")
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
message(FATAL_ERROR "libiio is required for building gnss-sdr with -DENABLE_AD9361=ON.")
endif()
endif()
if(ENABLE_PLUTOSDR) if(ENABLE_PLUTOSDR)
############################################## ##############################################
# ADALM-PLUTO (Analog Devices Inc.) # ADALM-PLUTO (Analog Devices Inc.)
@ -234,9 +210,6 @@ if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
) )
endif() endif()
target_compile_definitions(signal_source_adapters
PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
)
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
if(GR_IIO_INCLUDE_HAS_GNURADIO) if(GR_IIO_INCLUDE_HAS_GNURADIO)
@ -255,6 +228,11 @@ if(ENABLE_CLANG_TIDY)
endif() endif()
endif() endif()
set_property(TARGET signal_source_adapters APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES target_compile_definitions(signal_source_adapters
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
)
set_property(TARGET signal_source_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )

2
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
View File

@ -119,4 +119,4 @@ private:
std::shared_ptr<Fpga_Switch> switch_fpga; std::shared_ptr<Fpga_Switch> switch_fpga;
}; };
#endif /*GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_

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

@ -29,8 +29,8 @@
*/ */
#ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H #ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_
#define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H #define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_
#include "concurrent_queue.h" #include "concurrent_queue.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
@ -103,4 +103,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H */ #endif // GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/file_signal_source.h
View File

@ -130,4 +130,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /*GNSS_SDR_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
View File

@ -127,4 +127,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /* GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_ */ #endif // GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/gen_signal_source.h
View File

@ -74,4 +74,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_GEN_SIGNAL_SOURCE_H*/ #endif // GNSS_SDR_GEN_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/gn3s_signal_source.h
View File

@ -92,4 +92,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_GN3S_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_GN3S_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/labsat_signal_source.h
View File

@ -91,4 +91,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
View File

@ -130,4 +130,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /* GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_ */ #endif // GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/nsr_file_signal_source.h
View File

@ -130,4 +130,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /*GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/osmosdr_signal_source.h
View File

@ -115,4 +115,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/plutosdr_signal_source.h
View File

@ -114,4 +114,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/raw_array_signal_source.h
View File

@ -92,4 +92,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_

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

@ -29,8 +29,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_
#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_
#include "concurrent_queue.h" #include "concurrent_queue.h"
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
@ -118,4 +118,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H */ #endif // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/spir_file_signal_source.h
View File

@ -128,4 +128,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /*GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
View File

@ -137,4 +137,4 @@ private:
size_t item_size_; size_t item_size_;
}; };
#endif /*GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
View File

@ -135,4 +135,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
View File

@ -159,4 +159,4 @@ private:
bool enable_throttle_control_; bool enable_throttle_control_;
}; };
#endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_

2
src/algorithms/signal_source/adapters/uhd_signal_source.h
View File

@ -112,4 +112,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };
#endif /*GNSS_SDR_UHD_SIGNAL_SOURCE_H_*/ #endif // GNSS_SDR_UHD_SIGNAL_SOURCE_H_

6
src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
View File

@ -30,8 +30,8 @@
*/ */
#ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H #ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_
#define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H #define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <gnuradio/sync_block.h> #include <gnuradio/sync_block.h>
@ -109,4 +109,4 @@ private:
bool open(); bool open();
}; };
#endif /* GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H */ #endif // GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_

6
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
View File

@ -28,8 +28,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_LABSAT23_SOURCE_H #ifndef GNSS_SDR_LABSAT23_SOURCE_H_
#define GNSS_SDR_LABSAT23_SOURCE_H #define GNSS_SDR_LABSAT23_SOURCE_H_
#include "concurrent_queue.h" #include "concurrent_queue.h"
#include <gnuradio/block.h> #include <gnuradio/block.h>
@ -87,4 +87,4 @@ private:
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> d_queue; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> d_queue;
}; };
#endif #endif // GNSS_SDR_LABSAT23_SOURCE_H_

6
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
View File

@ -35,8 +35,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_
#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_
#include "rtl_tcp_dongle_info.h" #include "rtl_tcp_dongle_info.h"
#include <boost/array.hpp> #include <boost/array.hpp>
@ -128,4 +128,4 @@ private:
} }
}; };
#endif // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H #endif // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
View File

@ -65,8 +65,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H #ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H_
#define GNSS_SDR_UNPACK_2BIT_SAMPLES_H #define GNSS_SDR_UNPACK_2BIT_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
#include <cstdint> #include <cstdint>
@ -117,4 +117,4 @@ private:
std::vector<int8_t> work_buffer_; std::vector<int8_t> work_buffer_;
}; };
#endif #endif // GNSS_SDR_UNPACK_2BIT_SAMPLES_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
View File

@ -32,8 +32,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H #ifndef GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_
#define GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H #define GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
@ -60,4 +60,4 @@ private:
friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr(); friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();
}; };
#endif #endif // GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
View File

@ -28,8 +28,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H #ifndef GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_
#define GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H #define GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
@ -56,4 +56,4 @@ private:
friend unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples_sptr(); friend unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples_sptr();
}; };
#endif #endif // GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
View File

@ -30,8 +30,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H #ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_
#define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H #define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
@ -58,4 +58,4 @@ private:
friend unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples_sptr(); friend unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples_sptr();
}; };
#endif #endif // GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
View File

@ -28,8 +28,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H #ifndef GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_
#define GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H #define GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
@ -56,4 +56,4 @@ private:
friend unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples_sptr(); friend unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples_sptr();
}; };
#endif #endif // GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_

6
src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
View File

@ -29,8 +29,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H #ifndef GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_
#define GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H #define GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_
#include <gnuradio/sync_interpolator.h> #include <gnuradio/sync_interpolator.h>
@ -56,4 +56,4 @@ private:
unsigned int samples_per_int; unsigned int samples_per_int;
}; };
#endif #endif // GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_

23
src/algorithms/signal_source/libs/CMakeLists.txt
View File

@ -16,29 +16,10 @@
# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
# #
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
if(NOT GRIIO_FOUND)
message(STATUS "gnuradio-iio not found, its installation is required.")
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled")
endif()
endif()
if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
if(NOT LIBIIO_FOUND) set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
message(STATUS "libiio not found, its installation is required.") set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
message(STATUS "Please build and install the following projects:")
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled")
else()
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
endif()
endif() endif()
if(ENABLE_FPGA OR ENABLE_AD9361) if(ENABLE_FPGA OR ENABLE_AD9361)

6
src/algorithms/signal_source/libs/ad9361_manager.h
View File

@ -30,8 +30,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_AD9361_MANAGER_H #ifndef GNSS_SDR_AD9361_MANAGER_H_
#define GNSS_SDR_AD9361_MANAGER_H #define GNSS_SDR_AD9361_MANAGER_H_
#include <cstdint> #include <cstdint>
#include <string> #include <string>
@ -128,4 +128,4 @@ bool ad9361_disable_lo_remote(const std::string &remote_host);
bool ad9361_disable_lo_local(); bool ad9361_disable_lo_local();
#endif #endif // GNSS_SDR_AD9361_MANAGER_H_

2
src/algorithms/signal_source/libs/fpga_switch.h
View File

@ -74,4 +74,4 @@ private:
void close_device(void); void close_device(void);
}; };
#endif /* GNSS_SDR_FPGA_SWITCH_H_ */ #endif // GNSS_SDR_FPGA_SWITCH_H_

2
src/algorithms/signal_source/libs/gnss_sdr_valve.h
View File

@ -92,4 +92,4 @@ private:
bool d_open_valve; bool d_open_valve;
}; };
#endif /*GNSS_SDR_GNSS_SDR_VALVE_H_*/ #endif // GNSS_SDR_GNSS_SDR_VALVE_H_

6
src/algorithms/signal_source/libs/rtl_tcp_commands.h
View File

@ -29,8 +29,8 @@
* *
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_RTL_TCP_COMMANDS_H #ifndef GNSS_SDR_RTL_TCP_COMMANDS_H_
#define GNSS_SDR_RTL_TCP_COMMANDS_H #define GNSS_SDR_RTL_TCP_COMMANDS_H_
#include <boost/asio/ip/tcp.hpp> // for tcp, tcp::socket #include <boost/asio/ip/tcp.hpp> // for tcp, tcp::socket
#include <boost/system/error_code.hpp> // for error_code #include <boost/system/error_code.hpp> // for error_code
@ -53,4 +53,4 @@ enum RTL_TCP_COMMAND
boost::system::error_code rtl_tcp_command(RTL_TCP_COMMAND id, unsigned param, boost::system::error_code rtl_tcp_command(RTL_TCP_COMMAND id, unsigned param,
boost::asio::ip::tcp::socket &socket); boost::asio::ip::tcp::socket &socket);
#endif // GNSS_SDR_RTL_TCP_COMMANDS_H #endif // GNSS_SDR_RTL_TCP_COMMANDS_H_

6
src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
View File

@ -30,8 +30,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_RTL_TCP_DONGLE_INFO_H #ifndef GNSS_SDR_RTL_TCP_DONGLE_INFO_H_
#define GNSS_SDR_RTL_TCP_DONGLE_INFO_H #define GNSS_SDR_RTL_TCP_DONGLE_INFO_H_
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
@ -80,4 +80,4 @@ private:
}; };
#endif // GNSS_SDR_RTL_TCP_DONGLE_INFO_H #endif // GNSS_SDR_RTL_TCP_DONGLE_INFO_H_