mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Merge branch 'next' of github.com:gnss-sdr/gnss-sdr into pps_lime
This commit is contained in:
commit
b13041cb3c
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -62,7 +62,7 @@ jobs:
|
||||
- name: install dependencies
|
||||
run: brew update && brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio log4cpp openssl pugixml protobuf && ln -s $(brew --prefix llvm)/bin/clang-tidy /usr/local/bin && ln -s $(brew --prefix llvm)/bin/clang-apply-replacements /usr/local/bin && ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin && pip3 install mako
|
||||
- name: Prepare run
|
||||
run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.11.0 core_monitor core_libs pvt_libs
|
||||
run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.12.0 core_monitor core_libs pvt_libs
|
||||
- name: run clang-tidy
|
||||
run: cd build && run-clang-tidy -fix
|
||||
- name: check
|
||||
|
@ -325,10 +325,11 @@ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
|
||||
set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
|
||||
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "11.1.x")
|
||||
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR
|
||||
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
|
||||
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR
|
||||
CMAKE_VERSION VERSION_LESS 3.5)
|
||||
set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x")
|
||||
else()
|
||||
set(GNSSSDR_GTEST_LOCAL_VERSION "1.11.0")
|
||||
set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.0")
|
||||
endif()
|
||||
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
||||
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
|
||||
|
14
README.md
14
README.md
@ -415,9 +415,9 @@ $ sudo ldconfig
|
||||
#### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging:
|
||||
|
||||
```
|
||||
$ wget https://github.com/google/glog/archive/v0.5.0.tar.gz
|
||||
$ tar xvfz v0.5.0.tar.gz
|
||||
$ cd glog-0.5.0
|
||||
$ wget https://github.com/google/glog/archive/v0.6.0.tar.gz
|
||||
$ tar xvfz v0.6.0.tar.gz
|
||||
$ cd glog-0.6.0
|
||||
$ mkdir build && cd build
|
||||
$ cmake ..
|
||||
$ make
|
||||
@ -428,8 +428,8 @@ $ sudo ldconfig
|
||||
#### Download the [Google C++ Testing Framework](https://github.com/google/googletest "Googletest Homepage"), also known as Google Test:
|
||||
|
||||
```
|
||||
$ wget https://github.com/google/googletest/archive/release-1.11.0.zip
|
||||
$ unzip release-1.11.0.zip
|
||||
$ wget https://github.com/google/googletest/archive/release-1.12.0.zip
|
||||
$ unzip release-1.12.0.zip
|
||||
```
|
||||
|
||||
Please **DO NOT build or install** Google Test. Every user needs to compile
|
||||
@ -453,10 +453,10 @@ downloaded resides. Just type in your terminal (or add it to your
|
||||
`$HOME/.bashrc` file for a permanent solution) the following line:
|
||||
|
||||
```
|
||||
export GTEST_DIR=/home/username/googletest-release-1.11.0
|
||||
export GTEST_DIR=/home/username/googletest-release-1.12.0
|
||||
```
|
||||
|
||||
changing `/home/username/googletest-release-1.11.0` by the actual path where you
|
||||
changing `/home/username/googletest-release-1.12.0` by the actual path where you
|
||||
unpacked Google Test. If the CMake script does not find that folder, or the
|
||||
environment variable is not defined, or the source code is not installed by a
|
||||
package, then it will download a fresh copy of the Google Test source code and
|
||||
|
@ -25,7 +25,6 @@
|
||||
|
||||
|
||||
namespace ip = boost::asio::ip;
|
||||
using boost::asio::ip::tcp;
|
||||
|
||||
// Buffer constants
|
||||
// TODO: Make these configurable
|
||||
@ -110,7 +109,7 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
|
||||
LOG(INFO) << "Connected to " << addr << ":" << port;
|
||||
|
||||
// 4. Set nodelay
|
||||
socket_.set_option(tcp::no_delay(true), ec);
|
||||
socket_.set_option(ip::tcp::no_delay(true), ec);
|
||||
if (ec)
|
||||
{
|
||||
std::cout << "Failed to set no delay option.\n";
|
||||
|
@ -21,7 +21,6 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using boost::asio::ip::tcp;
|
||||
|
||||
Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user