1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-18 07:44:57 +00:00
Commit Graph

624 Commits

Author SHA1 Message Date
Marc Majoral
2b15343a6a started tracking pull-in test implementation for the FPGA 2018-08-29 18:20:41 +02:00
Carles Fernandez
b2db6abdaa
Add more extensive use of cstdint typenames 2018-08-11 14:31:35 +02:00
Javier Arribas
752b4396d0 Fix inverted spectrum in unpack gss6450 block 2018-08-01 12:13:54 +02:00
Carles Fernandez
73aa89dfc6
Fix creation of acquisition blocks, fix warning of unused private member 2018-06-03 22:43:53 +02:00
Carles Fernandez
424f812790
Fix clang warnings about unused private member 2018-06-03 19:11:16 +02:00
Carles Fernandez
d40094e6e2
Clean CMake scripts 2018-05-25 20:49:45 +02:00
Carles Fernandez
d6654301c5
Fix typo 2018-05-20 00:15:22 +02:00
Carles Fernandez
fc18408f11
Avoid throwing in the destructor 2018-05-19 22:42:08 +02:00
Carles Fernandez
5076b5a683
Fix warning of unused variable 2018-05-19 21:36:17 +02:00
Carles Fernandez
b4cc22abc2
Avoid throwing in the destructor 2018-05-19 20:34:50 +02:00
Carles Fernandez
a05952c966
Initialize all members in the constructor
Replace C-style casts by C++ casts
Fixes spelling errors
Other minor cleaning for consistency
2018-05-19 20:23:48 +02:00
Carles Fernandez
76d871bc8d
Avoid throwing in the destructor 2018-05-19 19:07:00 +02:00
Carles Fernandez
eeb2893f9c
Fix GCC 8.1.1 warnings 2018-05-16 21:54:31 +02:00
Carles Fernandez
835cf3b11e
Rename CMake module for gr-iio to a more consistent name. Minor fixes 2018-05-16 21:33:52 +02:00
Carles Fernandez
87fb81b972
Use https instead of http in links when available. Minor fixes 2018-05-16 20:00:14 +02:00
Javier Arribas
dfeb62871f Adding optional compilation of the custom UDP packet source. Disabled by default 2018-05-16 11:36:37 +02:00
Javier Arribas
bf7a3f0090 Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into udp_source 2018-05-16 10:54:27 +02:00
Javier Arribas
df0dd82843 Optimizing custom UDP packet source and applying code style 2018-05-16 10:49:27 +02:00
Carles Fernandez
0d60d97c24
Use https instead of http in links when available
Update copyright year in headers
2018-05-13 22:49:11 +02:00
Javier Arribas
bde6bd6cee Replacing GNURadio udp packet source with custom libpcap-based ethernet packet source 2018-05-11 13:21:53 +02:00
Javier Arribas
0ef3b56e22 Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into udp_source 2018-05-10 17:57:44 +02:00
zosoworld
79170327ab Fixed rtl_tcp signal source 2018-05-04 19:54:45 +02:00
zosoworld
62198abdf4 Fixed rtl_tcp signal source deadlock 2018-05-04 19:04:09 +02:00
Javier Arribas
9912acc4f8 Adding channel selector option in config if a single RF channel is used in UDP source 2018-05-03 18:44:04 +02:00
Javier Arribas
189cded82a Adding IQ Swap options to UDP source 2018-05-02 19:48:15 +02:00
Carles Fernandez
8b390d0924
Replace boost::lexical_cast with std::to_string
Fixes in optional buildings
2018-05-01 23:32:52 +02:00
Javier Arribas
7865387df9 Adding UDP GNSS signal source block 2018-05-01 21:25:15 +02:00
Carles Fernandez
8d8ebfc6df
Remove unused includes, minor fixes 2018-05-01 12:02:50 +02:00
Carles Fernandez
43103068fd
Remove unused includes 2018-05-01 10:16:30 +02:00
Carles Fernandez
966dd699ac
Fix building with libiio but without gnuradio-iio 2018-05-01 08:40:08 +02:00
Carles Fernandez
c90ec201f2
Fix building in PYBOMBS 2018-05-01 08:33:41 +02:00
Carles Fernandez
bd81330201
Apply code formatting 2018-04-30 19:53:20 +02:00
Carles Fernandez
6d6b583169
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into mmajoral-fpga 2018-04-30 19:23:35 +02:00
Carles Fernandez
a2eb5d5344
Improve readability, reorder includes 2018-04-29 13:26:21 +02:00
Javier
ab534e7791 Fix build bug 2018-04-13 18:31:35 +02:00
Carles Fernandez
c01d8d0dd9
Move general_work to the bottom of the file 2018-04-13 11:39:05 +02:00
Javier Arribas
8e59a42ae2 Merge Next with FPGA. Adding software-defined emulation of the sample counter 2018-04-06 17:03:20 +02:00
Carles Fernandez
ac168cf274 Avoid warning 2018-04-06 09:39:11 +02:00
mmajoral
e1635a735d Added the class switch_FPGA, which controls the switch in the FPGA that connects the analog frontend and the DMA to the queues of the HW accelerators.
Removed some unused variables in the tracking.
2018-04-05 15:05:46 +02:00
Carles Fernandez
e434480c5a Fix Pybombs building 2018-03-28 15:05:15 +02:00
Carles Fernandez
a6a13cc306 Fix building in Pybombs 2018-03-28 08:35:33 +02:00
Carles Fernandez
b31f929655 Apply clang-format, fix libiio detection in MacOS 2018-03-27 21:10:31 +02:00
Javier Arribas
65713d4c82 Adding support for dual channel in FMCOMMS2 and optional Local Oscillator generation using FMCOMMS2 TX channel 2018-03-27 19:35:53 +02:00
Javier Arribas
982af827b4 Group all ad9361 configuration calls in one library 2018-03-27 19:00:25 +02:00
Javier Arribas
428a2eb1b5 Removing unused files 2018-03-27 14:44:56 +02:00
Javier Arribas
ec09016750 Adding Local Oscillator generation for dual band operation using AD9361 FPGA source. Bug fix in FPGA flowgraph 2018-03-27 14:24:07 +02:00
Carles Fernandez
0400034d14 Fix typos detected by codespell 2018-03-25 19:47:28 +02:00
Javier Arribas
7c406bb6eb Merging fpga with next 2018-03-05 11:03:59 +01:00
Carles Fernandez
34f24562cf Apply automated code formatting
Documented at .clang-format
See http://clang.llvm.org/docs/ClangFormat.html and http://clang.llvm.org/docs/ClangFormatStyleOptions.html
2018-03-03 02:03:39 +01:00
Javier Arribas
dc4c7b9551 Adding AD9361 fpga signal source 2018-03-02 11:30:36 +01:00
Carles Fernandez
658e677fc3 Reorder includes: local headers first, then 3rd-party library headers, and finally standard headers 2018-02-26 03:15:53 +01:00
Carles Fernandez
24f6003ba0 Remove iostream from header files
and in redundant places such as in unit tests
2018-02-25 22:49:06 +01:00
osqzss
995367d776 Add bladeRF support 2018-02-24 15:19:04 +09:00
Carles Fernandez
2b8ab9dcee Group all flags in a single file
This makes easier to document and to add new ones.
Shortened version of common files have been added:
-c for -config_file
-s for -signal_source
2018-02-18 12:23:55 +01:00
Carles Fernandez
d780de445a Small fixes 2018-02-05 11:18:06 +01:00
osqzss
1bef2bbfb5 Add LimeSDR antenna selection support 2018-02-05 15:52:22 +09:00
Antonio Ramos
9491e2a701 Remove unused include 2018-01-25 11:50:07 +01:00
Antonio Ramos
ecf94f71f1 Add 8 and 16 bits ADC compatibility 2018-01-25 11:00:23 +01:00
Carles Fernandez
8386289984 Initialize all members in the constructor 2018-01-23 22:52:15 +01:00
Carles Fernandez
80edc4313f Change header guard name for consistency 2018-01-23 21:48:42 +01:00
Carles Fernandez
9b7ce39c57 Fix wrong comments and add consistency in header guard name 2018-01-23 21:41:19 +01:00
Carles Fernandez
f6f14f246b Remove repeated and unrequired includes 2018-01-23 21:23:02 +01:00
Carles Fernandez
35c11d0120 Apply coding style 2018-01-23 20:09:39 +01:00
Carles Fernandez
2a9d6975e0 Apply coding style 2018-01-23 20:07:43 +01:00
Carles Fernandez
ef2c2bcf6b Fix building with Clang 2018-01-23 19:51:36 +01:00
Javier Arribas
84fe651f0d Adding Labsat v2 and v3 single channel signal recorder file source 2018-01-23 17:31:42 +01:00
Carles Fernandez
59bd7273ae Merge branch 'spirent_signal_source' of https://github.com/antonioramosdet/gnss-sdr into antonioramosdet-spirent_signal_source 2018-01-22 12:40:19 +01:00
Antonio Ramos
0dab500fb0 Update author 2018-01-22 12:38:38 +01:00
Antonio Ramos
dd77cd10df Remove debug lines 2018-01-22 12:21:28 +01:00
Carles Fernandez
db938bb047 Build fix due to a change in the gr-iio v0.3 API
A change in the API has removed the decimation parameter from sources
(see https://github.com/analogdevicesinc/gr-iio/issues/15 )

This commit fixes the build against the current master of
https://github.com/analogdevicesinc/gr-iio but it breaks compatibility
with older versions. Users with gr-iio already installed will need to
update it.
2018-01-20 11:56:17 +01:00
Antonio Ramos
7a2a02252a Minor changes 2018-01-19 13:50:33 +01:00
Carles Fernandez
3ca7d0d08a Remove unused include 2018-01-19 12:09:40 +01:00
Antonio Ramos
4873ea2b88 Fix GSS6450 signal source 2018-01-18 16:57:15 +01:00
Antonio Ramos
282c3d8659 Implement Spirent GSS6450 file signal source 2018-01-16 17:38:43 +01:00
Antonio Ramos
29b8643def Added Spirent GSS6450 file signal source 2018-01-12 13:15:20 +01:00
Carles Fernandez
4992449b51 Remove unused includes 2017-11-04 10:59:51 +01:00
Carles Fernandez
a9be24420e Fix typo 2017-11-01 20:49:10 +01:00
Carles Fernandez
afb3aa14f6 Remove commented lines 2017-10-31 16:03:41 +01:00
Carles Fernandez
647a27a192 Avoid possible duplication of linked libraries
Add installation pointers for gnuradio-iio
2017-10-31 16:02:18 +01:00
Carles Fernandez
462de44be4 Fix compilation 2017-10-31 13:05:15 +01:00
Carles Fernandez
0054f1c5f8 Fix compilation 2017-10-31 12:45:09 +01:00
Carles Fernandez
cc3ed4c672 Apply project's coding style 2017-10-30 22:31:20 +01:00
rmunozl
31b4228d8b add better explanation in README.md and improve format of some files 2017-10-30 15:17:53 +00:00
lmne
23fa911dd5 Add support to fmcomms2 SDR hardware 2017-10-29 02:51:22 -03:00
Carles Fernandez
511675a97e Apply project's coding style 2017-10-18 09:08:13 +02:00
Carles Fernandez
fc9740b4dc Do not use LOG(FATAL) since the glog library could have been stripped
off
2017-08-25 19:17:12 +02:00
Carles Fernandez
122ec19626 Make use of the inline keyword where appropriate 2017-08-21 11:45:12 +02:00
Carles Fernandez
64ab909a0d Replace C-style casts by C++ casts 2017-08-19 12:10:47 +02:00
Carles Fernandez
7ac3f282fa Replace C-style cast by C++ casts 2017-08-19 02:33:54 +02:00
Carles Fernandez
61f8df3586 Replace some C-style cast by static_cast<>()
See https://stackoverflow.com/questions/1609163/what-is-the-difference-between-static-cast-and-c-style-casting
2017-08-18 12:45:47 +02:00
Carles Fernandez
6532e0c57d Small fix 2017-08-16 13:45:17 +02:00
Carles Fernandez
07113fd89d Use the override special identifier when overriding a virtual function 2017-08-16 00:58:10 +02:00
Carles Fernandez
85cc7802be Fix const correctness when catching exceptions
See https://stackoverflow.com/questions/7581654/about-catching-exception-good-practices
Unneeded includes unistd.h removed
Close dump files in destructor
2017-08-14 13:59:00 +02:00
Carles Fernandez
59164c33bd Remove unneded cstdlib include 2017-08-12 15:52:23 +02:00
Carles Fernandez
9bfef0e05a Fix CMake scripts to use Ninja https://ninja-build.org/
cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -GNinja .. && ninja
2017-06-21 08:54:47 +02:00
Cillian O'Driscoll
c1d798ae37 [WIP] fix for #54
two_bit_packed_file_signal_source: ensure all blocks have the right item size for both real and complex
outputs
2017-06-16 22:37:54 +01:00
Javier
f69cc2491c Adding UHD device filter by serial number option 2017-05-31 11:45:26 +02:00
Carles Fernandez
95ffcd3ac0 Improve portability
In some architectures (e.g. alpha, hppa, powerpcspe, m68k,  sh4, sparc64, x32) the package gr-osmosdr is not available. So when the package is build with -DENABLE_OSMOSDR=ON, it breaks on the mentioned architectures. This is expected behaviour (it breaks because a required dependency is not found), but prevents from building the package on such architectures. This commit introduces a small change: when compilation is called with

cmake -DENABLE_OSMOSDR=ON -DENABLE_PACKAGING=ON ..

then, the compilation does not break if gr-osmosdr is not found.

This commit also fixes building when UHD is present but gnuradio-uhd is not (for instance, in hurd-i386)
2017-04-12 18:06:04 +02:00
Carles Fernandez
5264622895 Fix detection of big endian 2017-02-10 10:33:12 +01:00
Carles Fernandez
8eb01075f4 Restore ostream format 2017-01-11 23:26:42 +01:00
Carles Fernandez
81093e3d6b Remove firmware and drivers folders
Now drivers have their own repo at https://github.com/gnss-sdr/gr-gn3s
and https://github.com/gnss-sdr/gr-dbfcttc
2016-06-09 19:10:24 +02:00
Carles Fernandez
5a73b4e047 Improve package reproducibility
Packages using CMake often use file(GLOB ...) to retrieve a list of
source files. As this is based on readdir(), the resulting file list
is unsorted. A common use case is to pass this list directly to
add_executable or add_library. But as the order is unpredictable, the
binaries are not reproducible (because the order in which the objects
are linked will vary).

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824263
2016-05-23 19:51:59 +02:00
Carles Fernandez
831cc75153 Remove tabs from the source code 2016-05-02 23:46:30 +02:00
Javier Arribas
b4e8966691 Removing the unused Output_filter block from the gnss_sdr flowgraph 2016-04-06 16:12:06 +02:00
Carles Fernandez
1b7bc5af0c The USRP Hardware Driver (UHD) is now optional.
Used if found.
2016-02-02 23:32:48 +01:00
Carles Fernandez
fc01c85203 Removing unused parameter (removes a warning) 2016-01-11 10:44:57 +01:00
Carles Fernandez
d0ac06d71d Cleaning includes 2016-01-04 22:56:52 +01:00
Carles Fernandez
45195917c1 fixing some gnuradio-related warnings reported by gcc, so others can be spotted easier 2015-12-02 18:25:06 +01:00
Cillian O'Driscoll
e4ff358178 Added seconds_to_skip and header_size
Use these configuration parameters to skip ahead in the FileSignalSource
Fixed bug in determining file duration
2015-11-26 15:08:26 +00:00
Cillian O'Driscoll
cee99131c1 Added two_bit_packed_file_signal_source 2015-10-14 09:35:22 +01:00
Cillian O'Driscoll
c20accbf26 Added interleaving reversal to unpack_2bit_samples 2015-10-14 09:34:33 +01:00
Cillian O'Driscoll
f389fc5042 Fixed a bug in endian reverse 2015-10-14 09:34:33 +01:00
Cillian O'Driscoll
3ca18df229 Added unpack_2bit_samples
This is a generic gnuradio block for handling 2 bit samples packed into
bytes or shorts. It can handle big or little endian ordering of the
samples within the byte, as well as big or little endian ordering of the
bytes within a short.

This is a utility function for a generic sample source which will be
able to handle all of these cases for both real and complex signals.
2015-10-14 09:34:33 +01:00
Javier Arribas
7b57bd28f8 Merge branch 'next-gnss-sdr' into next 2015-08-25 12:40:31 +02:00
Javier Arribas
1aa84cd1c4 Updated CUDA kernels and several GPU tracking optimizations.
Bug fix in GPS_L1_CA_DLL_PLL binary dump
2015-08-06 17:05:15 +02:00
Javier Arribas
632136d1f8 Add missing boost include dirs in signal source 2015-07-27 15:48:24 +02:00
Carles Fernandez
334caa329e Improving detection of GNU Radio version so modules requiring >=3.7.4
will be built even without the presence of pkgconfig
2015-07-19 11:18:20 +02:00
Carles Fernandez
ea6a92a1fc Fixing broken compilation when using gnuradio 3.7.3 (using I/Q swap
option of interleaved_short_to_complex that was introduced in 3.7.4)
2015-07-17 20:25:56 +02:00
Carles Fernandez
5d22d90cc0 Fixing documentation 2015-07-16 18:54:57 +02:00
Javier
0927394351 Swap I/Q in two bit cpx interleaved file signal source
Some adjustments in the example configuration file to improve receiver
sensitivity
2015-07-03 15:37:30 +02:00
Javier
6c0377ed06 Added new file source adapter:
2 bits complex file source for GNSS-SDR GSoC 2015 signal sampler
designed by Ajith Peter
2015-07-02 17:59:43 +02:00
Javier
a31542cbf6 Added support to select the frontend clock reference source in UHD
signal source (i.e. internal or external clock reference)
2015-06-17 18:07:36 +02:00
Carles Fernandez
fb45d31eed Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-05-22 18:30:21 +02:00
Carles Fernandez
48435735ba fixes parallel building when glog is auto-built 2015-05-19 20:28:02 +02:00
Anthony Arnold
9e17f3d88d Reordering IQ reads 2015-05-18 03:12:44 +10:00
Anthony Arnold
322a812447 Correct stopping case 2015-05-15 19:59:21 +10:00
Anthony Arnold
d912ea7500 Stop on error 2015-05-15 18:41:51 +10:00
Anthony Arnold
a02c659795 Opening socket first 2015-05-10 23:54:40 +10:00
Anthony Arnold
96fc353fe4 Setting gains 2015-05-10 23:42:13 +10:00
Anthony Arnold
5f3ae0c66b Refactored out rtl_tcp stuff to libs 2015-05-10 22:57:43 +10:00
Anthony Arnold
6d16921845 Setting AGC mode 2015-05-09 12:53:17 +10:00
Anthony Arnold
1b0dd9e063 Solved performance issue. 2015-05-09 12:20:44 +10:00
Anthony Arnold
81bed50d03 Missing newline 2015-05-08 17:07:37 +10:00
Anthony Arnold
128a7452d5 rtl_tcp specific signal source block 2015-05-08 16:59:38 +10:00
Carles Fernandez
f556660e1f Merge branch 'osmoflags' of https://github.com/anthony-arnold/gnss-sdr
into anthony-arnold-osmoflags
2015-04-30 20:13:14 +02:00
Anthony Arnold
b059d5a648 Print args 2015-04-30 23:36:36 +10:00
Anthony Arnold
a9c77939df OsmoSdr args 2015-04-30 17:25:03 +10:00
Javier
a709874df4 Added support for new features of Flexiband GNURadio driver developed by
CTTC: Now it is possible to read signal from USB front-end frames
captured by Flexiband native driver.
2015-04-15 17:56:51 +02:00
Carles Fernandez
f0b9e03dcd Code cleaning 2015-03-04 21:09:44 +01:00
Javier
9afff479b1 Updated multichannel frontend support. 2015-03-04 19:00:57 +01:00
Javier
474f78f500 New Teleorbit Flexiband adapter for Teleorbit Flexiband frontends
(optional signal source). It requires a external GNU Radio driver.
2015-03-03 18:07:26 +01:00
Carles Fernandez
7c7f0ecbd2 Merge remote-tracking branch 'Arribas/next' into multisource
Conflicts:
	src/algorithms/signal_source/adapters/uhd_signal_source.cc
	src/core/receiver/gnss_flowgraph.cc
2015-03-01 22:23:17 +01:00
Javier Arribas
7a681a287d Debug output cleaning 2015-03-01 20:58:03 +01:00
Javier
304f38b81a Added multichannel frontend support. Enabled in UHD signal source. Multisource configuration minor changes 2015-03-01 20:25:50 +01:00
Carles Fernandez
2a2740cb01 Code cleaning 2015-02-27 18:21:25 +01:00
Javier
5b37329200 Bug fix in multisource/multichannel gnss_block_interface 2015-02-27 10:36:09 +01:00
Javier
8606191311 Added support to multiband frontends (UHD multiband) in UHD signal
source. Still to do modifications in flowgraph to connect the signal
conditioners and the next chained blocks..
2015-02-18 18:46:00 +01:00
Carles Fernandez
fc83b961b1 Adding more input data types 2015-02-04 13:06:44 +01:00
Carles Fernandez
3dcac855b8 adding more data types 2015-02-04 02:29:38 +01:00
Carles Fernandez
6984e78b70 replacing some C casts by C++ casts 2015-01-31 12:16:46 +01:00
Carles Fernandez
c00703b0ae Adding SPIR data file source 2015-01-14 17:27:26 +01:00
Carles Fernandez
056158e198 Adding SPIR file data source, by Fran Fabra 2015-01-14 17:26:41 +01:00
Carles Fernandez
6620e7d43c Updating copyright year 2015-01-08 19:49:59 +01:00
Carles Fernandez
d73095620b Changing name of rtlsdr_signal source by osmosdr_signal_source 2014-12-15 17:39:22 +01:00
Javier
0d417271c5 Bug fix in UHD source that prevented the USRP device selection by IP
address.

Adding sample configuration file for USRP X300 (and other networked
USRPs)
2014-12-03 18:58:28 +01:00
Carles Fernandez
54eb5d65be Making UHD not required, but used by default if found 2014-11-14 21:42:22 +01:00
Carles Fernandez
75e971b3a8 change etc/ to share/ 2014-11-13 00:28:36 +01:00
Carles Fernandez
d7c8ecc230 etc/ folder changed to share/ since it is a Filesystem Hierarchy
Standard (FHS) requirement for architecture-independent
application-specific static files
2014-11-12 23:05:53 +01:00
Carles Fernandez
79f88bd142 Changes in the building system 2014-11-05 23:26:31 +01:00
Carles Fernandez
76d00c7b1e Changes in program output when the configuration or source files are not
found
2014-11-05 01:39:13 +01:00
Carles Fernandez
d163f75a58 Removing reference to version 2014-11-04 21:30:18 +01:00
Carles Fernandez
74cb7ff362 Changing building system: 'cmake && make && sudo make install' 2014-11-04 21:28:01 +01:00
Javier Arribas
a2cad4c147 Added support for Fraunhofer / TeleOrbit Flexiband front-end
demultiplexed signal files (interleaved I/Q byte-size files,
post-process only).

Use sample configuration file gnss-sdr_Hybrid_byte.conf to try it!

Go to http://www.iis.fraunhofer.de/de/ff/lok/leist/test/flexiband.html
to obtain free captures from Fraunhofer
2014-10-27 13:00:10 +01:00
Carles Fernandez
e6f7af6f4c Fixing computation of signal duration 2014-09-09 17:16:33 +02:00
Carles Fernandez
3257d8cba1 Improving handling of optional processing blocks and linking libraries.
New options ENABLE_GN3S, ENABLE_RTLSDR, ENABLE_OPENCL, ENABLE_ARRAY and
ENABLE_GPERFTOOLS, all set by default to OFF. Users can enable that
features by 'cmake -DENABLE_XXX=ON ../ '. OpenCL is now not used by
default since it was giving problems in some platforms. Old variables
(RTSDR_DRIVER, GN3S_DRIVER, RAW_ARRAY_DRIVER and DISABLE_OPENCL) are
still honored and can be used in the same way, but the new ENABLE_XXX
are recommended for the sake of more uniform naming. Main CMakeFile.txt
has been rearranged, putting options first, then searching for the
required libraries, and then the optional ones. If Gperftools is enabled
and found, binaries are linked to the tcmalloc and profiler libraries,
and using the adequate flags. Fixed building in Mac OSX if Armadillo and
OpenBLAS were not installed in the system.
2014-08-07 21:04:01 +02:00
Carles Fernandez
8531a758ea Includes header files at add_libraries(...), which makes IDEs such as
Xcode to display them
2014-06-28 03:55:57 +02:00
Carles Fernandez
4e714bf033 changing some raw pointers by smart pointers in the core receiver.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@502 64b25241-fba3-4117-9849-534c7e92360d
2014-04-03 21:59:14 +00:00
Javier Arribas
885c5f364c Small bug fix and new configuration file ready to receive GPS signals in real-time with USRP devices and appropiate front-ends. Remember to tune the front-end gain (source section in config file) and, in some particular antenna and LNA setups, tune also the acquisition threshold (acquisition section). The configuration is tested on USRP v1 + DBSRX, USRP 2 + DBSRX and USRP B100 + WBX.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@491 64b25241-fba3-4117-9849-534c7e92360d
2014-03-17 19:41:14 +00:00
Carles Fernandez
25ed311f22 Small fix for Mac OS X
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@488 64b25241-fba3-4117-9849-534c7e92360d
2014-03-16 20:21:21 +00:00
Carles Fernandez
39f8754217 Cleaning the terminal output and dumping most of the information in the log file. Better use of the glog library, logging can be seen also in Release, in real time by doing './gnss-sdr --logtostderr=1'. Update to latest version of Armadillo.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@486 64b25241-fba3-4117-9849-534c7e92360d
2014-03-16 19:58:29 +00:00
Javier Arribas
28d6b9a122 GNSS-SDR Array blocks update
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@482 64b25241-fba3-4117-9849-534c7e92360d
2014-02-18 19:40:44 +00:00
Javier Arribas
ae053127b4 components of CTTC experimental GNSS antenna array signal source adapter for GNSS-SDR. Not usable yet!
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@481 64b25241-fba3-4117-9849-534c7e92360d
2014-02-17 18:53:45 +00:00
Carles Fernandez
4edd485cd0 Tidying up includes: own .h, C libraries, C++ libraries, other libraries' .h, project's .h. Some old time.h and stdlib.h have been replaced by ctime and cstdlib
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@477 64b25241-fba3-4117-9849-534c7e92360d
2014-01-14 23:22:54 +00:00
Carles Fernandez
05accfb1d7 Tidying up includes: : C library, C++ library, other libraries' .h, project's .h.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@476 64b25241-fba3-4117-9849-534c7e92360d
2014-01-12 20:07:38 +00:00
Carles Fernandez
9c890a799f add GNU Radio include dirs
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@464 64b25241-fba3-4117-9849-534c7e92360d
2013-12-15 22:27:37 +00:00
Carles Fernandez
004495507d Fixing detection of GNU Radio when installed in non-usual locations (e.g. /home/user/target). Now the user can tell cmake where GNU Radio is by 'cmake ../ -DGNURADIO_INSTALL_PREFIX=/home/user/target'
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@462 64b25241-fba3-4117-9849-534c7e92360d
2013-12-14 10:23:33 +00:00
Carles Fernandez
a8619337be Now GNSS-SDR also builds on Mac OS X 10.9 Mavericks using clang++ and libc++. Updated cmake scripts, some modification of code not accepted by clang. Updated README with instructions for Mavericks. Fixed file length computation in 64-bit architectures.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@435 64b25241-fba3-4117-9849-534c7e92360d
2013-11-09 10:51:11 +00:00
Carles Fernandez
2972272b3e Fixes compilation issues on Mac OS X. Now it builds successfully against gnuradio installed by Macports and using gcc 4.8. Upgrade version of Gtest. Some fixes and updates in documentation and code cleaning.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@423 64b25241-fba3-4117-9849-534c7e92360d
2013-10-18 18:26:06 +00:00
Javier Arribas
ee43872704 New feature: GNSS-SDR now reads the IFEN NSR 2bit sample file format. The GNSS-SDR receiver can now be used with the SX-NSR scientific navigation front-end receiver using its native .stream binary captures.
More information of this high-end front-end can be found here:  http://www.ifen.com/products/sx-scientific-gnss-solutions/nsr-software-receiver.html


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@421 64b25241-fba3-4117-9849-534c7e92360d
2013-10-14 16:51:47 +00:00
Luis Esteve
2f6c75be76 Adding new algorithms of adquisition:
gps_l1_ca_pcps_multithread_acquisition
     gps_l1_ca_pcps_tong_acquisition
     galileo_e1_pcps_cccwsr_ambiguous_acquisition
     galileo_e1_pcps_tong_ambiguous_acquisition
     galileo_e1_pcps_8ms_ambiguous_acquisition

and test for all the algorithms.


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@411 64b25241-fba3-4117-9849-534c7e92360d
2013-08-28 17:17:57 +00:00
Javier Arribas
9bfd2bb32a Front-end calibration utility is now fully operative for the following front-ends:
- RTLS-SDR + Elonics E4000

Some bug correction in PCPS acquisition

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@398 64b25241-fba3-4117-9849-534c7e92360d
2013-07-30 10:53:45 +00:00
Luis Esteve
8b10549fee Patch submitted by Marc Molina: Improving PCPS Acquisition with some VOLK instructions. Enabling the secondary spreading code in Galileo acquisition. Adding Signal Generator to GNSS-SDR.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@397 64b25241-fba3-4117-9849-534c7e92360d
2013-07-23 18:03:07 +00:00
Carles Fernandez
5e6e66e60b fixing some errors on compiling the gn3s signal source
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@396 64b25241-fba3-4117-9849-534c7e92360d
2013-07-21 22:18:19 +00:00
Carles Fernandez
180a1e3a46 fixes some old gnuradio definitions
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@395 64b25241-fba3-4117-9849-534c7e92360d
2013-07-21 21:57:42 +00:00
Carles Fernandez
36f70490d9 some small changes required by Pybombs
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@379 64b25241-fba3-4117-9849-534c7e92360d
2013-07-06 11:22:44 +00:00
Javier Arribas
6f8ef58802 Towards a front-end frequency and sample rate calibration tool. VERY experimental yet.
Bug fixes in acquisition assistance and in linker include files.


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@371 64b25241-fba3-4117-9849-534c7e92360d
2013-07-05 17:00:48 +00:00
Javier Arribas
58b280afb6 Switch to GNU Radio 3.7.x API
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@368 64b25241-fba3-4117-9849-534c7e92360d
2013-07-04 13:47:40 +00:00
Carles Fernandez
53fed8b3d4 Fix compilation problem in Mac Os X (thanks to Brian Kuschak)
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@355 64b25241-fba3-4117-9849-534c7e92360d
2013-04-05 20:28:20 +00:00
Javier Arribas
0bf9e44eb4 SUPL assistance support in progress:
- New SUPL parameters available in GNSS-SDR.conf
- Ephemeris assistance for real-time operation is now functional
- SUPL client now stores the received ephemeris in XML file. This file can be loaded on request to enable post-processing SUPL assistance and to enable SUPL assistance without internet connection. -> thowards a complete warm start GNSS-SDR.

BUG FIXES:
- GN3S driver firmware file copy operation in CmakeLists.txt had an error that mismatches the gn3s_firmware.ihx file location and prevents the correct firmware loading for GN3S SiGe USB dongles.


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@351 64b25241-fba3-4117-9849-534c7e92360d
2013-03-18 18:27:44 +00:00
Javier Arribas
12003ffa94 GNSS-SDR now uses CMAKE as the only build system. Goodbye BJAM!
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@347 64b25241-fba3-4117-9849-534c7e92360d
2013-03-15 18:03:01 +00:00
Carles Fernandez
bd84ebd1c4 improving documentation
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@339 64b25241-fba3-4117-9849-534c7e92360d
2013-02-04 00:16:22 +00:00
Carles Fernandez
ae1cb212de improving documentation
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@335 64b25241-fba3-4117-9849-534c7e92360d
2013-01-28 23:50:09 +00:00
Carles Fernandez
00a8007dc3 Adding Mac OS X support. Tested in Mountain Lion.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@333 64b25241-fba3-4117-9849-534c7e92360d
2013-01-27 20:50:38 +00:00
Javier Arribas
ab874b7ded BUG fixed in rtl-sdr signal_source cmake compiler script
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@308 64b25241-fba3-4117-9849-534c7e92360d
2013-01-10 11:38:58 +00:00
Carles Fernandez
20f4b4ceea Copy the GN3S v2 firmware binary file to the install folder if the variable GN3S_DRIVER is set.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@302 64b25241-fba3-4117-9849-534c7e92360d
2012-12-28 15:57:03 +00:00
Carles Fernandez
201b446c47 Added build support for the GN3S dongle. If the variable GN3S_DRIVER is set, CMake automatically builds the gr-gn3s project, adds the gn3s_signal_source and links the corresponding library. There is no need to have gr-gn3s already installed.
Example:
$ cd build
$ export GN3S_DRIVER=1
$ cmake ../
$ make
$ make install

The gr-gn3s project can be build and installed independently, for instance for using it as a source block in gnuradio-companion.


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@300 64b25241-fba3-4117-9849-534c7e92360d
2012-12-27 21:11:50 +00:00
Carles Fernandez
b52846e7fd Added support for RTL devices. If the variable RTLSDR_DRIVER is set, CMake looks for libosmosdr and gnuradio-osmosdr libraries and compiles the corresponding signal source.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@298 64b25241-fba3-4117-9849-534c7e92360d
2012-12-27 17:09:16 +00:00
Carles Fernandez
c6e974ab21 Starting CMake support. In the root directory of gnss-sdr, type:
$ mkdir build && cd build && cmake ../ && make && make install

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@290 64b25241-fba3-4117-9849-534c7e92360d
2012-12-24 02:33:50 +00:00
Carles Fernandez
818d9e14b5 Start migration to GNU Radio 3.7 new C++ API. This commit replaces some components of gnuradio-core by the new components gr-blocks, gr-fft and gr-filter.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@282 64b25241-fba3-4117-9849-534c7e92360d
2012-11-25 11:15:11 +00:00
Carles Fernandez
2c700a49a2 Code cleaning
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@272 64b25241-fba3-4117-9849-534c7e92360d
2012-11-01 16:47:10 +00:00
Carles Fernandez
e659ca96b2 Fix bug identifying the USRP
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@270 64b25241-fba3-4117-9849-534c7e92360d
2012-11-01 11:05:27 +00:00
Carles Fernandez
9727444b57 Fix device_address bug, added comments, code cleaning
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@269 64b25241-fba3-4117-9849-534c7e92360d
2012-11-01 10:56:33 +00:00
Carles Fernandez
ae4a867249 code cleaning
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@262 64b25241-fba3-4117-9849-534c7e92360d
2012-10-28 10:56:04 +00:00
Javier Arribas
2252797386 Post-processing of Baseband signals captured using IQ Interleaved short integers are now supported using the new data type adapter Ishort_To_Complex
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@221 64b25241-fba3-4117-9849-534c7e92360d
2012-08-01 14:17:40 +00:00
Javier Arribas
bc87ea4472 Added support for the Realtek RTL2832U OsmoSDR signal source. The Rtlsdr_Signal_Source adapter compilation is optional. See GNSS-SDR README for more information.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@220 64b25241-fba3-4117-9849-534c7e92360d
2012-08-01 13:11:02 +00:00
Javier Arribas
b849b20a8c Added optional support for Sparkfun SiGe GN3S USB GPS RF sampler:
- Added a pre-compiled custom GN3S firmware.
- Added a fully-compliant GNU Radio source block for GN3S USB dongle. It can be used also from GNU Radio companion and from Python applications.
- Added a new GN3S_Signal_Source block. It is possible to disable the GN3S signal source compilation. See README.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@217 64b25241-fba3-4117-9849-534c7e92360d
2012-07-30 15:46:07 +00:00
Carles Fernandez
5ff5e8e7bd Better exception handling for File_Signal_Source
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@214 64b25241-fba3-4117-9849-534c7e92360d
2012-07-15 11:08:10 +00:00
Carles Fernandez
d579d0d8e5 Gives and informative message and exits the program when the source file is not found, instead of abort and core dumping
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@210 64b25241-fba3-4117-9849-534c7e92360d
2012-07-15 00:47:20 +00:00
Luis Esteve
950765180f Restructuring the src/tests directory. Deleted old tests. Added new test cases. Added signal sample for the tests.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@198 64b25241-fba3-4117-9849-534c7e92360d
2012-06-22 14:17:28 +00:00
Javier Arribas
1c0fed749d Removed some debug messages from release compilation to debug compilation (Using DLOG() instead of LOG_AT_LEVEL() ) to speed up a bit the release execution.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@194 64b25241-fba3-4117-9849-534c7e92360d
2012-04-11 18:44:56 +00:00
Carles Fernandez
0d6462e52a Unnecessary include removed
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@190 64b25241-fba3-4117-9849-534c7e92360d
2012-03-24 03:01:55 +00:00
Javier Arribas
ddb5b0ebba Small bug in UHD Source corrected
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@187 64b25241-fba3-4117-9849-534c7e92360d
2012-03-16 14:01:14 +00:00
Carles Fernandez
e3f8b0aeaa Code cleaning
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@183 64b25241-fba3-4117-9849-534c7e92360d
2012-03-04 05:28:57 +00:00
Javier Arribas
1cb02b5df2 New signal source for real-time operation with Universal Hardware Driver (UHD) devices. RF Real-time milestone reached!!
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@180 64b25241-fba3-4117-9849-534c7e92360d
2012-03-02 18:50:21 +00:00
Carles Fernandez
3bff16b5d1 Code cleaning.
Test infrastructure reactivated. Now a run_tests executable is created and runs some tests.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@138 64b25241-fba3-4117-9849-534c7e92360d
2012-01-23 00:52:05 +00:00
Carles Fernandez
2ce62706af Adding documentation and improving code formatting.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@103 64b25241-fba3-4117-9849-534c7e92360d
2011-12-28 21:36:45 +00:00
Carles Fernandez
48719c3075 Improving documentation
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@102 64b25241-fba3-4117-9849-534c7e92360d
2011-12-28 03:05:37 +00:00
Carles Fernandez
27b5074152 gnss-sdr now accepts a --config_file flag for specifying the configuration file:
./gnss-sdr --config_file="my_receiver.conf" 

and another --signal_source flag that, if specified, overrides the file in the configuration:

./gnss-sdr --signal_source=/path/to/file.dat

Requires gflags 1.6 or later.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@100 64b25241-fba3-4117-9849-534c7e92360d
2011-12-26 05:04:27 +00:00
Carles Fernandez
fb6151c8b3 USRP1 source, that was build upon gnuradio-usrp, has been deactivated. Now GNSS-SDR is compatible with GNU Radio 3.5.0
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@87 64b25241-fba3-4117-9849-534c7e92360d
2011-12-21 00:21:20 +00:00
Javier Arribas
8fd6b662b7 Added GNURadio 3.4.2 and Ubuntu 11.10 compatibility. Environment variable GNURADIO_330_ROOT is now generic GNURADIO_ROOT
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@85 64b25241-fba3-4117-9849-534c7e92360d
2011-12-14 16:50:36 +00:00
Javier Arribas
69b8ac00dc - Major changes:
- The executable file and the default configuration file is now changed from "./install/mercurio" and "./conf/mercurio.conf" to "./install/gnss-sdr" and "./conf/gnss-sdr.conf", respectively.
        - Configuration file structure changed to define in a single entry the internal sampling frequency (after the signal conditioner). NOTICE that this change affects the all the adapters (acquisition, tracking, telemetry_decoder, observables, and PVT). All the adapters are now modified to work with this feature.
        - Moved several in-line GPS L1 CA parameters (a.k.a magic numbers..) to ./src/core/system_parameters/GPS_L1_CA.h definition file.
        - Tracking blocks now uses DOUBLE values in their outputs.
        - Observables and PVT now are separated. PVT and their associated libraries are moved to ./src/algorithms/PVT
        - Temporarily disabled the RINEX output (I am working on that!)
        - GNSS-SDR screen output now gives extended debug information of the receiver status and events. In the future, this output will be redirected to a log file.

- Bug fixes:
        - FILE_SIGNAL_SOURCE now works correctly when the user configures GNSS-SDR to process the entire file.
        - GPS_L1_CA_DLL_PLL now computes correctly the PRN start values.
        - GPS_L1_CA_DLL_FLL_PLL now computes correctly the PRN start values.
        - Several modifications in GPS_L1_CA_Telemetry_Decoder, GPS_L1_CA_Observables, and GPS_L1_CA_PVT modules to fix the GPS position computation.

- New features
        - Tracking blocks perform a signal integrity check against NaN outliers before the correlation process.
        - Tracking and PVT binary dump options are now documented and we provide MATLAB libraries and sample files to read it. Available in ./utils/matlab" and "./utils/matlab/libs"
        - Observables output rate can be configured. This option enables the GPS L1 CA PVT computation at a maximum rate of 1ms.
        - GPS_L1_CA_PVT now can perform a moving average Latitude, Longitude, and Altitude output for each of the Observables output. It is configurable using the configuration file.
        - Added Google Earth compatible Keyhole Markup Language (KML) output writer class (./src/algorithms/PVT/libs/kml_printer.h and ./src/algorithms/PVT/libs/kml_printer.cc ). You can see the receiver position directly using Google Earth.
        - We provide a master configuration file which includes an in-line documentation with all the new (and old) options. It can be found in ./conf/master.conf

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@84 64b25241-fba3-4117-9849-534c7e92360d
2011-12-07 17:59:34 +00:00
Javier Arribas
34d1c5110b GNSS-SDR Major changes:
New tracking libraries:
        -  tracking_discriminators: Library with a set of code tracking and carrier tracking discriminators that is used by the tracking algorithms. (fully documented, including math algorithms using doxygen!)
        -  tracking_2rd_DLL_filter: Class that implements 2 order DLL filter for code tracking loop.
        -  tracking_2rd_PLL_filter: Class that implements 2 order PLL filter for carrier tracking loop.
        -  tracking_FLL_PLL_filter:  Class that implements hybrid FLL and PLL filter for tracking carrier loop.
        -  CN_estimators: Library with a set of Carrier to Noise estimators and lock detectors. (fully documented, including math algorithms using doxygen!)

    Tracking:
        - gps_l1_ca_dll_pll_tracking: The existing DLL + PLL tracking module, which is the K.Borre and D.Akos one, is now completely re-factored. Now uses the above described libraries.
        - gps_l1_ca_dll_fll_pll_tracking: This is a brand new tracking module, which implements the FLL assisted PLL described in Kaplan (2nd edition). (also documentedwith references)

    Configuration options:
        - The following tracking parameters are added:
            ;######### TRACKING CONFIG ############
            ; Tracking.implementation=GPS_L1_CA_DLL_PLL_Tracking or GPS_L1_CA_DLL_FLL_PLL_Tracking 
            Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
            ;PLL filter bandwidth in Hz.
            Tracking.pll_bw_hz=50.0;
            ;DLL filter bandwidth in Hz.
            Tracking.dll_bw_hz=2.0;
            ;FLL filter bandwidth in Hz.
            Tracking.fll_bw_hz=50;
            ;filter order: choice between 2 or 3 at this moment, only for FLL assisted PLL
            Tracking.order=2;
            ;Correlator space in chips units
            Tracking.early_late_space_chips=0.5;

Other files have also been modified with minor changes to adapt to new modules or minor bug fixes.


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@80 64b25241-fba3-4117-9849-534c7e92360d
2011-11-22 17:21:54 +00:00
Javier Arribas
004cd776d9 BUG FIX: Now the file_signal_source obeys the SignalSource.samples configuration parameter in the conf file. This fix allows limiting the number of samples to be processed by the receiver.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@79 64b25241-fba3-4117-9849-534c7e92360d
2011-11-21 10:04:37 +00:00
Carles Fernandez
228fa3b797 moving things to trunk
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@72 64b25241-fba3-4117-9849-534c7e92360d
2011-10-01 18:45:20 +00:00