mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity
9,184 Commits 7 Branches 21 Tags 211 MiB
caef6acdd4
Commit Graph

375 Commits

Author SHA1 Message Date
Javier Arribas
81a1712082 Removing the GNURadio sample forecast requirements from telemetry decoders, thus to reduce the positioning delay and alleviate the GNURadio buffering requirements 2017-05-17 12:48:57 +02:00
Javier Arribas
7a2a15b37d Adding the path of Galileo E5 observations to RTKLIB solver. Some bug fixes. Work with Galileo in progress 2017-05-12 17:58:04 +02:00
Javier Arribas
b2531cb926 Bug fixes in Galileo E5a telemetry decoding. Code cleaning in Galileo E5a tracking 2017-05-11 12:53:58 +02:00
Carles Fernandez
deb916b342 Remove reference to old block implementation 2017-05-11 06:15:35 +02:00
Carles Fernandez
0253f4ba05 Merge remote-tracking branch 'upstream/common_solver' into next 
This commit Integrates RTKLIB positioning libraries in a universal PVT
block implementation called RTKLIB_PVT. This results in an improved
positioning accuracy and precision with a wide range of options
(including Precise Point Positioning and ionospheric/troposphreic
models).

Not all the RTKLIB features have been ported. Some of them will be
progressively added. The ported options and how to configure them have
been documented in the website, see
http://gnss-sdr.org/docs/sp-blocks/pvt/

This commit also introduces a multi-band, multi system Observables block
implementation.

Relevant architectural changes that reduce latency and makes
multi-system, multi band signal handling easier.

Redundant blocks have been deleted. Old configurations are automatically
redirected to the new blocks for Observables and PVT, so the commit does
not break any existing configuration. The user should just notice a
relevant improvement in positioning performance.

# Conflicts:
#	src/core/receiver/gnss_flowgraph.cc
 2017-05-10 22:16:18 +02:00
Carles Fernandez
9fef3fbfe9 Merge branch 'next_fpga' of https://github.com/gnss-sdr/gnss-sdr into next 2017-05-08 22:48:04 +02:00
Carles Fernandez
278040a73c Update conf files to new implementation for PVT 2017-05-08 21:12:32 +02:00
mmajoral
de2043ca00 cleaned the acquisition code that runs in the Zynq SoC, cleaned some tracking files that run in the Zynq SoC as well. 2017-05-08 17:03:27 +02:00
mmajoral
28058000de set up the receiver to work with the FPGA 2017-05-05 17:08:49 +02:00
Javier Arribas
2ee29af3bd Adding FPGA accelerators support in gnss-sdr configuration options 2017-05-05 16:37:29 +02:00
Carles Fernandez
417dc1daf1 Store work 2017-04-21 16:14:46 +02:00
Javier Arribas
e90a9aa2bf Migration of the internal LS PVT solver to RTKLIB solver in progress. First working version for GPS L1. Removing SBAS duplicated code. 2017-04-20 16:10:12 +02:00
Javier Arribas
807ca24fc2 Refactoring code. Adding new experimental tests and new common TX time observables algorithm 2017-04-12 17:04:51 +02:00
Javier Arribas
e0b0605545 Removing unused code, improving ref satellite selection in observables and partial correction of the gps L2 TOW offset bug 2017-03-30 19:25:46 +02:00
Javier Arribas
b745ebf0a8 GPS CNAV satellite positioning bug fixes. 2017-03-29 18:32:17 +02:00
Javier Arribas
d42696bfd3 Consolidation of all the observables and PVT algorithms in hybrid observables and hybrid PVT supporting multi-signals and multi-system operations 2017-03-24 15:25:17 +01:00
Javier Arribas
d5656e65a8 Adding experimental input filter Pulse Blanking algorithm implementation 2017-02-21 11:35:18 +01:00
Carles Fernandez
0db1ecce32 Fiw wrong commit 2017-02-03 16:42:16 +01:00
Carles Fernandez
9664b65720 Merge branch 'mako' of https://github.com/carlesfernandez/gnss-sdr into 
no-cheetah

# Conflicts:
#	src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
 2016-12-25 19:10:02 +01:00
Carles Fernandez
05f8b78751 Change blocks name from L2_M to L2C 2016-11-03 19:33:04 +01:00
Carles Fernandez
0f514e51f2 Merging the work on macOS Sierra 2016-09-22 20:20:18 +02:00
Carles Fernandez
a6df9f8c6f Clean configuration files 
Added information on how to retrieve SUPL parameters, and indicators to
userd on where to point to their own file or IP address. Removed unused
parameter wait_for_flowgraph.
 2016-05-15 14:27:51 +02:00
Carles Fernandez
05e7ca7b38 Clean configuration files 
Old configurations folder removed. Names ending by "short" but reading
files of interleaved data have been renamed to "ishort". Some spare
fixes. Added examples of configuring the period and port of RTCM
messages.
 2016-05-13 17:36:11 +02:00
Carles Fernandez
8d3a03a370 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.
 2016-05-12 23:34:46 +02:00
Carles Fernandez
37215a66ad Server supl.nokia.com is not working anymore 
Replaced by supl.google.com
 2016-05-07 10:00:49 +02:00
Carles Fernandez
9cbb88bc9f TCP port and RTCM station ID are now configured by the printer 
Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
 2016-05-06 21:00:08 +02:00
Carles Fernandez
0f2a08f49d 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.
 2016-04-22 18:41:24 +02:00
Javier Arribas
60b6b98c52 Bug fix in L2CM CNAV message decoder. The decoder is still experimental. 2016-04-22 16:49:12 +02:00
Javier Arribas
4cee7965c4 Code cleaning and config simplifications 2016-04-22 12:04:08 +02:00
Javier Arribas
0a5573f666 several receiver configuration mechanism simplifications and several bug fixes. Work in progress 2016-04-21 18:54:08 +02:00
Carles Fernandez
1f8f63a462 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.
 2016-04-18 18:07:59 +02:00
Carles Fernandez
2b7175083f Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next 2016-04-13 18:26:19 +02:00
Carles Fernandez
8041325602 deleting old references to the FLL 2016-04-08 18:19:42 +02:00
Javier Arribas
b4e8966691 Removing the unused Output_filter block from the gnss_sdr flowgraph 2016-04-06 16:12:06 +02:00
Javier Arribas
9db0990adc Deleted obsolete DLL_FLL_PLL GPS tracking. Deleted obsolete correlator.h 
and migrated all tracking in order to use the newer and optimized
cpu_multicorrelator. Code simplification and code cleaning
 2016-04-06 14:58:18 +02:00
Javier Arribas
b2034896e1 Merge branch next_gps_20ms_corr with next. Removing obsolete code and code cleaning 2016-03-30 15:03:25 +02:00
Javier Arribas
d15066fda6 Bug fix in Hybrid PVT date/time computation. Removed the obsolete GPS L1 Optim tracking block 2016-03-29 18:40:00 +02:00
Javier Arribas
500dc59516 Release candidate of the GPS L1 C/A telemetry decoder supporting variable tracking correlation length 2016-03-22 18:07:12 +01:00
Javier Arribas
083350bd61 Refactoring of GPS L1 CA telemetry decoder. PVT is not yet fully tested 2016-03-18 17:36:29 +01:00
Carles Fernandez
754e4436ee Revert "Experimental extended correlation for GPS L1 CA C_Aid tracking" 
This reverts commit d664dc63b3.
 2016-03-15 10:01:08 +01:00
Javier Arribas
6e076e8143 Fixing bugs in extended correlator for GPS L1 2016-03-11 18:32:56 +01:00
Carles Fernandez
1e9a9d1a55 reverting wrong commit 2016-03-09 15:56:07 +01:00
Javier Arribas
d664dc63b3 Experimental extended correlation for GPS L1 CA C_Aid tracking 2016-03-08 18:30:56 +01:00
Javier Arribas
4480c12d94 Added a non CFAR PCPS acquisition algorithm based on the estimation of 
the post correlation noise floor. If enabled
(.Acquisition_1C.use_CFAR_algorithm=true) as an option in the
acquisition configuration, it allows setting more stable thresholds in
the presence of non-gaussian front-end noise (which is the usual
behavior of front-ends....)
 2016-02-25 18:21:30 +01:00
Javier Arribas
5a716840ab tracking dll pll cAid can work now with gr_complex and cshort just 
setting the data imput type in config file. All the internal receiver
signal chain can work in complex short for the first time. Speed
improvement using custom gnss-sdr volk kernels for cshort data input
types.
 2016-01-19 18:37:30 +01:00
Carles Fernandez
601dc7a85c Merge branch 'new_next' of git://github.com/Arribas/gnss-sdr into 
new_volk_module
 2016-01-12 20:57:06 +01:00
Javier Arribas
c2676ec491 Added missing includes (to be removed in future versions). Steps towards 
the integration of new standalone kernels into volk_gnsssdr library.
 2016-01-12 18:58:00 +01:00
Javier Arribas
5ba12c6fdb Added 16 bits short int complex ultra-fast resampler, 
carrier wipe-off and correlator kernels (250% faster than
gr_complex) enabled in tracking GPS_L1_CA_DLL_PLL_C_Aid_Tracking_16sc
tracking
 2016-01-11 16:49:37 +01:00
Carles Fernandez
217ed14b0a change input type short by ishort 
so the file lenght in seconds is correctly diplayed. Some obsolete
comments removed and typos fixed
 2015-12-26 13:41:54 +01:00
Carles Fernandez
cc3de3132d change input signal type from short to ishort 
So the file length in seconds is correctly displayed
 2015-12-26 13:08:12 +01:00
Carles Fernandez
286ee3b561 Integrating the RTCM printer 
Now the Galileo E1 receiver generates RTCM messages 1045 (ephemeris) and
MSM7 / 1097 (observables). Parameters related to RTCM included in conf
files. The TCP/IP server can be activated by setting flag_rtcm_server to
true.
 2015-12-25 10:25:22 +01:00
Javier Arribas
9acc7e7a20 Replaced fix point NCO by VOLK phase rotator in CPU multicorrelator 
(around 5% faster).
This optimization is enabled at this time only in
Tracking_DLL_PLL_C_Aid. Sample config can be found in
gnss-sdr_Hybrid_byte_sim.conf
 2015-12-21 11:59:15 +01:00
Javier Arribas
847716428e Updated GPU tracking implementation. Bug fixed in cuda correlator and 
performance improvements
 2015-12-11 13:53:43 +01:00
Javier Arribas
424e7abe68 Migrating cuda tracking internal DLL/PLL vars from float to double 2015-12-02 19:00:29 +01:00
Carles Fernandez
23ce240483 Merge branch 'carrier_phase_bug_fix' of 
git+ssh://github.com/gnss-sdr/gnss-sdr into odrisci-contrib

# Conflicts:
#	conf/gnss-sdr_Hybrid_byte_sim.conf
#	src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
#	src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
#	src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
#	src/algorithms/tracking/libs/cpu_multicorrelator.cc
#	src/algorithms/tracking/libs/cpu_multicorrelator.h
#	src/algorithms/tracking/libs/cuda_multicorrelator.h
#	src/algorithms/tracking/libs/tracking_discriminators.cc
#	src/core/receiver/gnss_block_factory.cc
#	src/core/system_parameters/GPS_L1_CA.h
 2015-11-30 13:59:31 +01:00
Javier Arribas
8c22e5846d Carrier phase observable bug fix for GPS L1 CA trackings, new GPS L1 carrier aided tracking using nex multitap correlator library, and some CUDA multitap correlator performance improvements 2015-11-30 11:43:37 +01:00
Carles Fernandez
bfbea68c8f Merge branch 'next' of git://github.com/Arribas/gnss-sdr into 
tracking_arribas

# Conflicts:
#	src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
#	src/core/receiver/gnss_block_factory.cc
 2015-11-27 14:53:33 +01:00
Carles Fernandez
2a6381c6fa Merging branch 'next' of git://github.com/Arribas/gnss-sdr 2015-11-27 13:32:21 +01:00
Javier Arribas
38e8feefa8 Name change in new DLL PLL algorithm implementation. We introduce DLL 
PLL Carrier Aided Tracking.
 2015-11-27 12:53:27 +01:00
Javier Arribas
c8f7e08127 Updated all GPS and Galileo trackings for double floating point internal 
computations and bug fixes in the carrier phase accumulator.
(all, except Matlab-Simulink linked trackings)
 2015-11-26 18:44:04 +01:00
Javier Arribas
19e1328fda Fine tunning the config file for PPP in simulation scenario 2015-11-25 19:08:54 +01:00
Javier Arribas
aed688f3b4 DLL/PLL and phase accumulator bug correction and verification almost 
done. Still some outliers detected in PPP using RTKLIB but the
positioning performande is good.
 2015-11-25 18:32:32 +01:00
Javier Arribas
15c4882af9 Linear regressor implemented in observables 2015-11-24 13:37:01 +01:00
Carles Fernandez
0e8663a1fc Merge branch 'next' of git+ssh://github.com/carlesfernandez/gnss-sdr 
into next

# Conflicts:
#	src/core/system_parameters/rtcm.cc
#	src/core/system_parameters/rtcm.h
#	src/tests/formats/rtcm_test.cc
 2015-11-24 00:44:19 +01:00
Javier Arribas
411c8cedb0 experimental interpolator in observables 2015-11-23 23:05:52 +01:00
Javier Arribas
27588fa83b Artemisa tracking is almost working. Code cleaning, refactoring and renaming is in progress! 2015-11-16 19:23:25 +01:00
Carles Fernandez
48c4bb9084 cleaning config files 2015-11-01 13:00:56 +01:00
Javier Arribas
2039e998ff Pinned memory (Zero copy) huge improvement for GPU tracking. 2015-10-15 19:09:09 +02:00
Cillian O'Driscoll
19fad75a80 Added NSR conf file as e.g. use of two bit packed 
file sample source. NOTE: This has not been tested with a real NSR front
end. The assumption is, based on reading the NSRFileSignalSource, that
the data is:
 o byte item type
 o real
 o bytes are little endian (least significant bits output first)
 2015-10-14 09:53:47 +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
26cf90cdd4 First working version of the GPU GPS tracking block (it requires NVIDIA 
CUDA
3.0 GPU hardware)
 2015-07-24 17:21:25 +02:00
Carles Fernandez
75ae5abf24 updating configuration file 2015-07-22 23:47:46 +02:00
Carles Fernandez
24f8f61249 removing unused parameters 2015-07-21 19:32:16 +02:00
Carles Fernandez
7be5343b2a removing uneeded parameters 2015-07-21 19:18:49 +02:00
Carles Fernandez
f7d9438801 Updating configuration files 2015-07-21 19:14:17 +02:00
Carles Fernandez
c8426bb3f8 moving SBAS conf to old 2015-07-21 18:22:12 +02:00
Carles Fernandez
1de57855ef updating conf notation 2015-07-21 18:13:06 +02:00
Carles Fernandez
27f32d3bd6 updating configuration notation 2015-07-21 18:03:26 +02:00
Carles Fernandez
2fa73c350e updating configuration 2015-07-21 17:15:41 +02:00
Carles Fernandez
3039af393a Updating configuration files to the new notation 2015-07-21 11:34:51 +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
69a76990fc Adding Galileo E5 CN0 tracking debug print on std::cout 
Adding more configuration sample files:

- GPS L1 + GPS L2CM realtime tracking for Flexiband
frontend
- GPS L1 + GPS L2CM + Galileo E1 realtime tracking for Flexiband
frontend
- GPS L2CM realtime tracking on USRP1 (requieres stable sample clock)
 2015-06-22 16:12:53 +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
Javier
df48bf7342 - Small adjustments in GPS L2M tracking lock detector static thresholds. 
- Added sample configuration file for dual frequency GPS L1 + L2
realtime operation for Teleorbit Flexiband Frontends (requires a
external hardware driver installed)
 2015-06-16 17:16:20 +02:00
Javier
26a6bbd37a bug found in PRN resampler code. Disabled optimization 2015-06-12 19:28:56 +02:00
Javier
adf73e0610 Work in progress for GPS L2C support: 
- Patched GPS L2CM tracking pull-in code.
- Workaround for ViterbiDecoder bug
 2015-06-12 15:49:25 +02:00
Javier
b8d3f293f1 GPS L2C bug fixes. Added skeleton for a Mixed (multi-frequency and 
multi-system) observables block.
 2015-06-05 18:46:00 +02:00
Carles Fernandez
4bb256cc7d adding GPS L2C conf file for USRP 2015-05-30 13:27:12 +02:00
Carles Fernandez
0fa39f6e3b Merge pull request #9 from anthony-arnold/tcp 
A new signal source block for rtl_tcp.
 2015-05-19 17:00:13 +02:00
Carles Fernandez
ed06936992 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-19 07:58:23 +02:00
Carles Fernandez
d270705013 updating configuration 2015-05-11 22:20:27 +02:00
Carles Fernandez
6ec6be2e4c updating configuration, some code cleaning 2015-05-11 21:36:39 +02:00
Carles Fernandez
3d238a3a33 updating configuration 2015-05-11 21:30:46 +02:00
Anthony Arnold
5f3ae0c66b Refactored out rtl_tcp stuff to libs 2015-05-10 22:57:43 +10:00
Carles Fernandez
a543e6b9e4 upgrading configuration style 2015-05-10 13:02:05 +02:00
Carles Fernandez
1536ab7be0 More fixes to make old and new configuration notations compatible 2015-05-08 16:06:30 +02:00
Carles Fernandez
8d60aeab3d Working in the new configuration system 2015-05-08 13:11:41 +02:00
Anthony Arnold
128a7452d5 rtl_tcp specific signal source block 2015-05-08 16:59:38 +10:00
Carles Fernandez
4b6c9e1b12 required updates 2015-05-07 20:49:06 +02:00
Carles Fernandez
04b6507267 Merge branch 'next' into multisignals 
# Conflicts:
#	src/core/receiver/gnss_block_factory.cc
 2015-05-06 18:10:11 +02:00
Javier
37a346f3f6 Merge branch 'next' into arribas_next 
Conflicts:
	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
 2015-05-06 16:49:11 +02:00
Javier
d8d5daa5d8 GPS L2C M acquisition and tracking ready. Old configuration file format. 
Bug fix on GPS L1 DLL PLL that prevented the output of gnss_synchro
during the acqusition to tracking transition.
 2015-05-06 16:33:51 +02:00
Javier
4c5efd1e8b GPS L1 C/A + GPS L2C M dual frequency offline acquisition and tracking 
READY. Issues on PRN numbering are being investigated...
 2015-05-05 18:30:57 +02:00
Carles Fernandez
4fb3ec2af3 small fix for packaging 2015-04-30 20:15:06 +02:00
Javier
60b7fe8e08 Added GPS L2M Tracking and its unit test. Still experimental! 2015-04-30 17:48:21 +02:00
Anthony Arnold
9d61617769 Example config 2015-04-30 23:36:47 +10:00
Javier
6618c220d0 Added L2C_M simple PCPS acquisition adapter and its associated unit test 2015-04-29 14:19:17 +02:00
Javier
12b5d798a7 GPS L2C M acquisition incremental update: Added preliminarly support of 
multiple signals on the same system in GNSS-SDR architecture
 2015-04-24 19:11:45 +02:00
Javier
a97d98766e Added config file sample to use the CTTC's Flexiband GNURadio driver 
with binary multiplexed multichannel GNSS signal captures
 2015-04-22 17:23:43 +02: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
Javier
acb35ccdd9 Adding more Teleorbit Flexiband frontend configurations (gnss-sdr config 
files)
 2015-03-25 14:34:53 +01:00
Carles Fernandez
ce5783ca61 Merge branch 'cross-compile' of 
https://github.com/anthony-arnold/gnss-sdr into anthony-cross-compile

# 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-03-20 21:14:56 +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
4ab6f67733 fixing conf files 2015-03-01 22:34:04 +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
304f38b81a Added multichannel frontend support. Enabled in UHD signal source. Multisource configuration minor changes 2015-03-01 20:25:50 +01:00
Carles Fernandez
e4fb7a294d Merging multichannel stuff. Merge branch 'next' of https://github.com/Arribas/gnss-sdr into next 2015-02-27 11:20:41 +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
304261e7a7 Merge branch 'next' of git+ssh://github.com/carlesfernandez/gnss-sdr 
into next

Fixing tests
 2015-02-14 12:03:57 +01:00
Javier
d275a3612f -Added multichannel support in the receiver core (multiple signal 
sources
and signal conditioners)

-Some simplifications done in gnss_flowgraph
 2015-02-12 18:56:05 +01:00
Carles Fernandez
056158e198 Adding SPIR file data source, by Fran Fabra 2015-01-14 17:26:41 +01:00
Carles Fernandez
dd5dd7fc73 Changing Rtlsdr_Signal_Source by Osmosdr_Signal_Source 2014-12-15 17:41:34 +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
f92b20ddcf small fix 2014-11-13 18:35:19 +01:00
Carles Fernandez
e0125c18ea Merge branch 'next' of git+ssh://github.com/carlesfernandez/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.
 2014-11-13 18:33:49 +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
8f6859fb5e Removing personal folders names in configuration files 2014-09-08 15:54:34 +02:00
Carles Fernandez
689e25e2f4 Fixing configuration of hybrid solution. It was not working after 
Galileo E5a integration
 2014-09-06 02:09:00 +02:00
Carles Fernandez
43aeec0303 Updating Galileo Quicksync acquisition with new configuration 2014-09-06 00:31:47 +02:00
Carles Fernandez
b4b51562c5 Updating configuration file for testing the QuickSync implementation in 
a GPS L1 receiver
 2014-09-05 20:44:57 +02:00
Carles Fernandez
4e663e9367 Updating configuration format 2014-09-05 19:47:29 +02:00
Carles Fernandez
dfd9be34a9 Merge branch 'galileo_e5a' of https://github.com/marc-sales/gnss-sdr 
into next

Conflicts:
	src/core/receiver/gnss_block_factory.cc
	src/core/receiver/gnss_flowgraph.cc
 2014-09-05 18:51:08 +02:00
Javier Arribas
862a0d7940 Enabling tropo correction in hybrid solution. 
Updating configuration files for new satellite selection engine
 2014-09-04 17:31:48 +02:00
Javier Arribas
b2cd611b6e Merge remote-tracking branch 'origin/next' into gps_galileo_hybrid 
Conflicts:
	src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
	src/core/receiver/control_thread.cc
 2014-09-04 10:50:12 +02:00
Javier Arribas
3ec9b7841c Config files updated 2014-08-28 16:48:41 +02:00
Javier Arribas
32a66b8a41 Merge remote-tracking branch 'origin/next' into gps_galileo_hybrid 2014-08-28 15:47:04 +02:00
marc-sales
1d3d40cefd final version 2014-08-20 10:59:47 +02:00
Carles Fernandez
b746d1c619 Merging quicksync branch by Damian Miralles (GSoC 2014) 2014-08-19 18:52:05 +02:00
Damian Miralles
741c091e18 Final editing of the QuickSync algorithm in the GNSS-SDR platform. Cahnges include a better layout of 
the code test, bugs correction and the most significant is the modifiable option in the folding factor
if the user requires it.
 2014-08-13 14:51:25 -04:00
Carles Fernandez
2445620e76 Changing build type to RelWithDebInfo if ENABLE_GPERFTOOLS option is ON 2014-08-10 20:00:10 +02:00
marc-sales
3b3c809dab Unified acquisition 2014-08-05 02:01:37 +02:00
Carles Fernandez
42ae5cbd88 First commit of the acquisition method based on the QuickSync algorithm. 
Code developed by Damian Miralles.
 2014-07-24 01:38:58 +02:00
marc-sales
7d6ec42f24 coherent 2or3 ms adding noncoherently I+Q acquisition, 
dll+pll tracking still diverges
 2014-07-07 21:06:26 +02:00
Javier Arribas
abe9ca9450 Hybrid PVT working!! It was a problem with the timestamp account in the 
correlators due to the differences in the correlation time (PRN length).
Only corrected on GPS_DLL_PLL and Galileo veml correlator.
 2014-06-30 17:48:01 +02:00
marc-sales
841ae59d6a Added two acquisition strategies. Flowgraph is changed to produce 
default signal when doing sky search.
 2014-06-26 00:11:44 +02:00
marc-sales
4b5526ec7e E5a Dll/Pll tracking + tracking test + Secondary code delay generator 
+ PCPS acquisition of 1ms code 1ms filled with zeros (to avoid sec code
ambiguity)
 2014-06-20 18:23:44 +02:00
marc-sales
dbad4b5742 E5a signal generator and minor bug fixes. 2014-06-17 19:13:24 +02:00
Javier Arribas
b0d33328d5 Simultaneous multi-GNSS system acquisition, tracking and telemetry 
decoding: Changes in the flowgraph and in the configuration files to mix
channels from different GNSS systems in the same receiver. Hybrid
observables and PVT under construction.

The changes in the configuration file parameter names are NOT backward
compatible. The receiver can still work as usual in single GNSS system
mode but some modification on configuration files are required. Use the
example provided of Hybrid configuration file.
 2014-06-10 18:58:17 +02:00
Javier Arribas
a161d15366 Bug fixes and GPS to Galileo delta_t debug test implentation 2014-05-09 19:05:50 +02:00
Javier Arribas
75598c07d4 Adding GPS to Galileo time conversion parameters in Galileo almanac. 
Adding Galileo almanac push to Galileo almanac queues
 2014-05-09 13:04:05 +02:00
Carles Fernandez
72dcffa241 restore default conf file 2014-04-26 20:44:58 +02:00
Carles Fernandez
949c9fa972 Merge remote-tracking branch 'origin/modern_factory' into next 
Conflicts:
	src/core/receiver/control_thread.h
 2014-04-26 19:12:19 +02: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
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
4ebeb950fc - Bug correction in Galileo telemetry decoder. 
- Improved Galileo configuration to work with real-life captures (4 IOV SV)

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@434 64b25241-fba3-4117-9849-534c7e92360d
 2013-11-07 15:15:20 +00:00
Javier Arribas
87c5c212a4 FIRST GALILEO STANDALONE PVT FIX!! 
- Bug fixes at Galileo telemetry decoder state machine
- Bug fixes at Galileo Ephemeris decoder (two complement's data interpreted as unsigned, mismatch at the LSB weights)

Galileo KML output is avalable!!

Galileo RINEX is still under construction

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@433 64b25241-fba3-4117-9849-534c7e92360d
 2013-11-06 20:14:40 +00:00
Javier Arribas
83a9d41b05 Progress in Galileo E1: 
Bug fix in galileo tracking
Several improvements in Galileo telemetry decoder.
Code cleaning in observables
Galileo PVT is able to decode Galileo time and get satellite ECEF positions

Galileo PVT soluton is still under development


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@432 64b25241-fba3-4117-9849-534c7e92360d
 2013-10-30 18:08:25 +00:00
Javier Arribas
4d66f6c6ab - Galileo channels now supports all the published PRN IDs in acquisition and tracking 
- Changes in Galileo telemetry decoding (still under construction)
- Bug correction in tracking blocks that could cause random segmentation faults on some configurations

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@431 64b25241-fba3-4117-9849-534c7e92360d
 2013-10-25 16:07:24 +00:00
Javier Arribas
3a1b711e9f Updated configuration files for RTLSDR front-end and Front-end calibration 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@428 64b25241-fba3-4117-9849-534c7e92360d
 2013-10-23 15:54:35 +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
52aa4cac1a Fixing some warnings 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@412 64b25241-fba3-4117-9849-534c7e92360d
 2013-08-28 17:44:49 +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
b34a85c642 front-end-cal code cleaning, documentation and tunning tasks 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@400 64b25241-fba3-4117-9849-534c7e92360d
 2013-08-01 14:01:07 +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
Carles Fernandez
10318d6b7d Patch submitted by Daniel Fehr: Enabling EGNOS tracking and minor bugfixes 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@392 64b25241-fba3-4117-9849-534c7e92360d
 2013-07-20 07:58:59 +00:00
Javier Arribas
b0a323095d Towards a Galileo INAV Navigation decoder: First version of the Galileo_E1_Telemetry_Decoder block. In this version only the preamble detection and page part synchro is functional. 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@389 64b25241-fba3-4117-9849-534c7e92360d
 2013-07-15 17:07:10 +00:00
Javier Arribas
641692e005 Incremental update for the front-end calibration utility 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@383 64b25241-fba3-4117-9849-534c7e92360d
 2013-07-08 16:17:57 +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
Luis Esteve
bb747fa059 Changes in configuration file gnss-sdr_Galileo_E1.conf 
The file is now adapted to the new characteristics of acquisition.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@365 64b25241-fba3-4117-9849-534c7e92360d
 2013-06-13 23:58:23 +00:00
Luis Esteve
09c6ac095a Adapting the configuration files: gnss-sdr.conf and gnss-sdr_gn3s_realtime.conf to the new features of the receiver (now, the calculation of acquisition threshold is made from the probability of false alarm). 
Fixed a little bug in channel.cc

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@363 64b25241-fba3-4117-9849-534c7e92360d
 2013-06-09 09:11:36 +00:00
Luis Esteve
e6dfa1971d Simplifying the configuration file: 
- Some channel and acquisition properties are now common for all channels
- You can choose between channel-specific properties or properties common to all
- Updating config file with the new options 

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@360 64b25241-fba3-4117-9849-534c7e92360d
 2013-05-26 23:59:04 +00:00
Luis Esteve
b9ac964654 FEATURE FE02: Adding the function that calculates the threshold from false alarm probability. 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@357 64b25241-fba3-4117-9849-534c7e92360d
 2013-05-16 16:25:51 +00:00
Javier Arribas
cfeae47a29 Acquisition assistance is now working! 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@353 64b25241-fba3-4117-9849-534c7e92360d
 2013-04-02 14:02:55 +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
d7b014e373 Experimental GPS assistence using Secure User Plane Protocol (SUPL) initial tests. Not usable yet! 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@348 64b25241-fba3-4117-9849-534c7e92360d
 2013-03-15 18:05:37 +00:00
Javier Arribas
8b2d21c1c9 Major changes: 
- Gps telemetry decoder and PVT now uses independent queues for ephemeris, iono, utc_model and almanac. The old gps_navigation_queue is now deprecated and it is removed from the implementation. This affect almost all the PVT and Rinex printer classes.
- Rinex printer class updated to use the new ephemeris, iono, utc_model objects
Bug fixes and correction:
- The pseudorange generation now is based on the computed TOW for each received symbol. The History_Shift computation become simplier in this way. This modification is also a solution for a bug where the pseudoranges became temporally invalid when the TOW is updated (that happen every 6 secons!) 

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@343 64b25241-fba3-4117-9849-534c7e92360d
 2013-03-14 12:52:32 +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
0760fa0f3e - New NCO library for carrier signal generation: Provides a fixed point optimized wrapper for GNU Radio fxp CORDIC and SSE2 floating point implementation ( sse_mathfunc.h implementation). The library is available as nco_lib.h 
- Updated Unit Test to benchmark all the current NCO implementations (./run_tests --gtest_filter=Cordic_Test.StandardCIsFasterThanCordic)

-Gps_L1_Ca_Dll_Pll_Optim_Tracking algorithm updated with new NCO library for carrier wipeoff and some other optimizations.



git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@281 64b25241-fba3-4117-9849-534c7e92360d
 2012-11-22 17:43:24 +00:00
Javier Arribas
d85f65ed4c Galileo E1b/c tracking improvement and code cleaning 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@255 64b25241-fba3-4117-9849-534c7e92360d
 2012-10-24 08:02:51 +00:00
David Pubill
c241b7b1d6 - Added TCP connector for Galileo E1 simulink tracking 
- Added simulink-based Galileo_E1_DLL_PLL_VEML_Tracking

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@250 64b25241-fba3-4117-9849-534c7e92360d
 2012-10-19 13:38:25 +00:00
Luis Esteve
01c80dac80 Fixed bug in gnss_flowgraph.cc. 
Galileo satellites added to available_GNSS_signals_

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@239 64b25241-fba3-4117-9849-534c7e92360d
 2012-09-03 11:58:28 +00:00
Javier Arribas
cc02888dad Freq_xlating_fir_filter decimation factor now can be configured using GNSS-SDR configuration file. 
gnss-sdr_gn3s_realtime.conf was updated to use this feature.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@237 64b25241-fba3-4117-9849-534c7e92360d
 2012-08-30 15:50:10 +00:00
Javier Arribas
cee0dd320d Added TTY serial device NMEA output (Linux only) 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@236 64b25241-fba3-4117-9849-534c7e92360d
 2012-08-29 15:32:00 +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
fb82c2246d Correlator class now takes profit of the GNU Radio memory alignment, used by Volk SIMD functions 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@218 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-31 12:35:07 +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
Luis Esteve
721004b838 Changing nouns of variables of freq_xlating_fir_filter. Improving configuration files. 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@216 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-18 15:47:59 +00:00
Luis Esteve
6f7b4f5aea Added freq_xlating_fir_filter class, this class implements a FIR filter and a composite frequency translation that shifts center_frequency down to zero Hz. 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@215 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-18 13:29:18 +00:00
Carles Fernandez
e503ab9e0b Change from a personal data path to a generic ../data/my_capture.dat 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@213 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-15 01:23:29 +00:00
Carles Fernandez
bff49cd862 Added some info stating that this is the default configuration file and the usage of the --config_file flag 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@212 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-15 01:21:20 +00:00
Luis Esteve
c9a06f702a Major update: 
1) Galileo E1 Acquisition adapter block added (Gnuradio block modification to use the same block with the 2 systems with 2 adapters)
2) Tests and signal samples for Galileo E1 Acquisition signal block
3) Library for Galileo E1 signal processing
4) Galileo_E1.h with constant variables for this system

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@209 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-12 21:17:37 +00:00
David Pubill
aab40c963d Simulink tracking block updated: generation of the Simulink model from a script MATLAB and improvement of the tracking algorithm (both PLL and DLL). Added multi-threading support for MATLAB. 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@208 64b25241-fba3-4117-9849-534c7e92360d
 2012-07-03 12:52:12 +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
9d34147e0f Major update to improve the GNSS-SDR pseudorange precision and correct some PVT bugs: 
- Updated all available trackings to generate the tracking_timestamp_secs taking into account the remainder code phase.
- Updated the telemetry decoder to track the number of symbol shifted from the preamble start symbol (to be used in observables).
- Updated observables to align the reference channel symbol with the corresponding symbols in the other channels and compute pseudorranges using the common transmission time algorithm.
- Updated PVT to independize the display output rate from the RINEX and KML log files. New options available in config file!
- Some minor improvements and code cleaning.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@193 64b25241-fba3-4117-9849-534c7e92360d
 2012-04-11 10:43:35 +00:00