[hamradio-commits] [gnss-sdr] 248/251: bumping version number
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 6febea48fa47a755e57c2951df88481d78e0ec6e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Wed Sep 2 00:38:46 2015 +0200
bumping version number
---
CMakeLists.txt | 10 +++----
README.md | 31 +++++++++++++++++++---
docs/changelog | 4 +--
docs/changelog.Debian | 4 +--
docs/manpage/gnss-sdr-manpage | 4 +--
.../cmake/Packaging/volk_gnsssdr_profile-manpage | 2 +-
src/main/main.cc | 22 +++++++--------
7 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846ef36..24ec383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ endif(ENABLE_PACKAGING)
###############################
# GNSS-SDR version information
###############################
-set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications.
+set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications.
if(NOT ${THIS_IS_A_RELEASE})
# Get the current working branch
execute_process(
@@ -84,9 +84,9 @@ endif(NOT ${THIS_IS_A_RELEASE})
set(VERSION_INFO_MAJOR_VERSION 0)
set(VERSION_INFO_API_COMPAT 0)
if(${THIS_IS_A_RELEASE})
- set(VERSION_INFO_MINOR_VERSION 5)
+ set(VERSION_INFO_MINOR_VERSION 6)
else(${THIS_IS_A_RELEASE})
- set(VERSION_INFO_MINOR_VERSION 5.git-${GIT_BRANCH}-${GIT_COMMIT_HASH})
+ set(VERSION_INFO_MINOR_VERSION 6.git-${GIT_BRANCH}-${GIT_COMMIT_HASH})
endif(${THIS_IS_A_RELEASE})
set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION})
@@ -720,8 +720,8 @@ if(NOT ARMADILLO_FOUND)
message(STATUS " Armadillo will be downloaded and built automatically ")
message(STATUS " when doing 'make'. ")
- set(armadillo_RELEASE 5.400.2)
- set(armadillo_MD5 "0f06e5ddef5a3a8ef86f3a7bc480dec3")
+ set(armadillo_RELEASE 5.400.3)
+ set(armadillo_MD5 "397733eb2f305b50f28ead3350d975bdc")
ExternalProject_Add(
armadillo-${armadillo_RELEASE}
diff --git a/README.md b/README.md
index 79f11c2..82a6269 100644
--- a/README.md
+++ b/README.md
@@ -94,9 +94,9 @@ In case you do not want to use PyBOMBS and prefer to build and install GNU Radio
$ sudo apt-get install libopenblas-dev liblapack-dev # For Debian/Ubuntu/LinuxMint
$ sudo yum install lapack-devel blas-devel # For Fedora/CentOS/RHEL
$ sudo zypper install lapack-devel blas-devel # For OpenSUSE
-$ wget http://sourceforge.net/projects/arma/files/armadillo-5.400.2.tar.gz
-$ tar xvfz armadillo-5.400.2.tar.gz
-$ cd armadillo-5.400.2
+$ wget http://sourceforge.net/projects/arma/files/armadillo-5.400.3.tar.gz
+$ tar xvfz armadillo-5.400.3.tar.gz
+$ cd armadillo-5.400.3
$ cmake .
$ make
$ sudo make install
@@ -648,9 +648,32 @@ SignalSource.gain=60 ; Front-end gain in dB
SignalSource.subdevice=B:0 ; UHD subdevice specification (for USRP1 use A:0 or B:0, for USRP B210 use A:0)
~~~~~~
-Other examples are available at [gnss-sdr/conf/](./conf/).
+***Example: Configuring the USRP X300 with two front-ends for receiving signals in L1 and L2 bands***
+
+~~~~~~
+;######### SIGNAL_SOURCE CONFIG ############
+SignalSource.implementation=UHD_Signal_Source
+SignalSource.device_address=192.168.40.2 ; Put your USRP IP address here
+SignalSource.item_type=gr_complex
+SignalSource.RF_channels=2
+SignalSource.sampling_frequency=4000000
+SignalSource.subdevice=A:0 B:0
+;######### RF Channels specific settings ######
+SignalSource.freq0=1575420000
+SignalSource.gain0=50
+SignalSource.samples0=0
+SignalSource.dump0=false
+
+SignalSource.freq1=1227600000
+SignalSource.gain1=50
+SignalSource.samples1=0
+SignalSource.dump1=false
+~~~~~~
+
+
+Other examples are available at [gnss-sdr/conf/](./conf/).
### Signal Conditioner
diff --git a/docs/changelog b/docs/changelog
index fe9174a..7773d02 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,7 +1,7 @@
-gnss-sdr (0.0.5) unstable; urgency=low
+gnss-sdr (0.0.6) unstable; urgency=low
* First release that installs on the system and can generate packages.
Now 'make package' builds a .deb package in Ubuntu and Linux.
* Fixed some linking problems.
- -- Carles Fernandez-Prades <carles.fernandez at cttc.es> Fri, 14 Nov 2014 02:03:00 +0100
\ No newline at end of file
+ -- Carles Fernandez-Prades <carles.fernandez at cttc.es> Wed, 02 Sep 2015 02:03:00 +0100
\ No newline at end of file
diff --git a/docs/changelog.Debian b/docs/changelog.Debian
index 3af7a9a..74a3a8d 100644
--- a/docs/changelog.Debian
+++ b/docs/changelog.Debian
@@ -1,5 +1,5 @@
-gnss-sdr (0.0.5) unstable; urgency=low
+gnss-sdr (0.0.6) unstable; urgency=low
* First release that installs on the system and can generate deb packages.
- -- Carles Fernandez-Prades <carles.fernandez at cttc.es> Fri, 14 Nov 2014 02:03:00 +0100
\ No newline at end of file
+ -- Carles Fernandez-Prades <carles.fernandez at cttc.es> Wed, 02 Sep 2015 02:03:00 +0100
\ No newline at end of file
diff --git a/docs/manpage/gnss-sdr-manpage b/docs/manpage/gnss-sdr-manpage
index 1ee21a1..a3dbe88 100644
--- a/docs/manpage/gnss-sdr-manpage
+++ b/docs/manpage/gnss-sdr-manpage
@@ -1,6 +1,6 @@
.\" Manpage for gnss\-sdr.
.\" Contact carles.fernandez at cttc.es to correct errors or typos.
-.TH gnss\-sdr 1 "14 Nov 2014" "0.0.5" "gnss\-sdr man page"
+.TH gnss\-sdr 1 "2 Sep 2015" "0.0.6" "gnss\-sdr man page"
.SH NAME
\fBgnss\-sdr\fR \- GNSS Software Defined Receiver.
.SH SYNOPSIS
@@ -30,7 +30,7 @@ Examples of configuration files available at: ${prefix}/share/gnss\-sdr/conf, wh
\.TP
Check http://gnss\-sdr.org for more information.
.SH BUGS
-No known bugs.
+Please report bugs at https://github.com/gnss-sdr/gnss-sdr/issues
.SH AUTHOR
Carles Fernandez\-Prades (carles.fernandez at cttc.es)
\.TP
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage
index 8a2cc69..6760a53 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage
@@ -1,6 +1,6 @@
.\" Manpage for volk_gnsssdr_profile
.\" Contact carles.fernandez at cttc.es to correct errors or typos.
-.TH volk_gnsssdr_profile 1 "14 Nov 2014" "0.0.5" "volk_gnsssdr_profile man page"
+.TH volk_gnsssdr_profile 1 "02 Sep 2015" "0.0.6" "volk_gnsssdr_profile man page"
.SH NAME
\fBvolk_gnsssdr_profile\fR \- Profiler application for libvolk_gnsssdr functions.
.SH SYNOPSIS
diff --git a/src/main/main.cc b/src/main/main.cc
index 620f8a0..53b2ad9 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -31,7 +31,7 @@
* -------------------------------------------------------------------------
*/
#ifndef GNSS_SDR_VERSION
-#define GNSS_SDR_VERSION "0.0.5"
+#define GNSS_SDR_VERSION "0.0.6"
#endif
#ifndef GOOGLE_STRIP_LOG
@@ -148,16 +148,16 @@ int main(int argc, char** argv)
google::ParseCommandLineFlags(&argc, &argv, true);
std::cout << "Initializing GNSS-SDR v" << gnss_sdr_version << " ... Please wait." << std::endl;
- #if CUDA_GPU_ACCEL
- // Reset the device
- // cudaDeviceReset causes the driver to clean up all state. While
- // not mandatory in normal operation, it is good practice. It is also
- // needed to ensure correct operation when the application is being
- // profiled. Calling cudaDeviceReset causes all profile data to be
- // flushed before the application exits
- cudaDeviceReset();
- std::cout << "Reset CUDA device done " << std::endl;
- #endif
+ #if CUDA_GPU_ACCEL
+ // Reset the device
+ // cudaDeviceReset causes the driver to clean up all state. While
+ // not mandatory in normal operation, it is good practice. It is also
+ // needed to ensure correct operation when the application is being
+ // profiled. Calling cudaDeviceReset causes all profile data to be
+ // flushed before the application exits
+ cudaDeviceReset();
+ std::cout << "Reset CUDA device done " << std::endl;
+ #endif
if(GOOGLE_STRIP_LOG == 0)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list