mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Javier Arribas 2022-06-30 10:38:50 +02:00
commit b13041cb3c
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
- name: install dependencies - 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 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 - 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 - name: run clang-tidy
run: cd build && run-clang-tidy -fix run: cd build && run-clang-tidy -fix
- name: check - name: check

5
CMakeLists.txt
View File

@ -325,10 +325,11 @@ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0") set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "11.1.x") 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 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") set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x")
else() else()
set(GNSSSDR_GTEST_LOCAL_VERSION "1.11.0") set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.0")
endif() endif()
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")

14
README.md
View File

@ -415,9 +415,9 @@ $ sudo ldconfig
#### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging: #### 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 $ wget https://github.com/google/glog/archive/v0.6.0.tar.gz
$ tar xvfz v0.5.0.tar.gz $ tar xvfz v0.6.0.tar.gz
$ cd glog-0.5.0 $ cd glog-0.6.0
$ mkdir build && cd build $ mkdir build && cd build
$ cmake .. $ cmake ..
$ make $ 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: #### 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 $ wget https://github.com/google/googletest/archive/release-1.12.0.zip
$ unzip release-1.11.0.zip $ unzip release-1.12.0.zip
``` ```
Please **DO NOT build or install** Google Test. Every user needs to compile 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: `$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 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 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 package, then it will download a fresh copy of the Google Test source code and

3
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
View File

@ -25,7 +25,6 @@
namespace ip = boost::asio::ip; namespace ip = boost::asio::ip;
using boost::asio::ip::tcp;
// Buffer constants // Buffer constants
// TODO: Make these configurable // 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; LOG(INFO) << "Connected to " << addr << ":" << port;
// 4. Set nodelay // 4. Set nodelay
socket_.set_option(tcp::no_delay(true), ec); socket_.set_option(ip::tcp::no_delay(true), ec);
if (ec) if (ec)
{ {
std::cout << "Failed to set no delay option.\n"; std::cout << "Failed to set no delay option.\n";

1
src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
View File

@ -21,7 +21,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
using boost::asio::ip::tcp;
Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0) Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0)
{ {