Carles Fernandez
36d6e85f1b
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-09 00:10:32 +02:00
Carles Fernandez
204aef99d0
Hold back c++17 until GNU Radio allows for it
...
(already in next, so 3.8 will do)
2018-04-08 23:48:35 +02:00
Carles Fernandez
9b7c7b7875
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
2018-04-07 17:03:53 +02:00
Carles Fernandez
795ac97e12
Set -std=c++11, -std=c++14 or -std=c++17 where appropriate
2018-04-07 17:03:25 +02:00
Carles Fernandez
fc34bb4d98
Get rid of gr::random so it can be compiled with c++17
...
The error was:
In file included from
/Users/carlesfernandez/git/cttc/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc:31:
In file included from
/Users/carlesfernandez/git/cttc/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h:36:
In file included from /opt/local/include/gnuradio/random.h:30:
In file included from /opt/local/include/boost/random.hpp:83:
/opt/local/include/boost/random/uniform_on_sphere.hpp:229:37: error: no
member named 'bind2nd' in namespace 'std'
std::bind2nd(std::multiplies<RealType>(), 1/sqrt(sqsum)));
~~~~~^
1 error generated.
2018-04-07 14:15:48 +02:00
Carles Fernandez
04e400ffa7
Merge branch 'antonioramosdet-tracking_conf_structure' into next
2018-04-06 11:34:10 +02:00
Carles Fernandez
acff1656c2
Merge branch 'tracking_conf_structure' of https://github.com/antonioramosdet/gnss-sdr into antonioramosdet-tracking_conf_structure
2018-04-06 11:33:55 +02:00
Carles Fernandez
192332e72a
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-06 11:29:40 +02:00
Antonio Ramos
c40b0aa214
Solve conflict
2018-04-06 11:24:58 +02:00
Carles Fernandez
15ea4e6d71
Merge branch 'antonioramosdet-tracking_conf_structure' into next
2018-04-06 11:19:43 +02:00
Carles Fernandez
80749fbdcd
Merge branch 'tracking_conf_structure' of https://github.com/antonioramosdet/gnss-sdr into antonioramosdet-tracking_conf_structure
2018-04-06 11:19:18 +02:00
Antonio Ramos
b1a295d982
Fix bug
2018-04-06 10:48:10 +02:00
Carles Fernandez
77e0ec1072
Update reference
2018-04-06 10:26:09 +02:00
Antonio Ramos
5d9fb5af38
Migrate tracking adapters to new conf structure
2018-04-06 10:10:32 +02:00
Antonio Ramos
267e9d95c6
Merge branch 'next' into tracking_conf_structure
2018-04-06 09:56:08 +02:00
Carles Fernandez
e01a6ce740
Remove unused variable
2018-04-06 09:44:55 +02:00
Carles Fernandez
ac168cf274
Avoid warning
2018-04-06 09:39:11 +02:00
Carles Fernandez
02e4346e3c
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-05 23:09:51 +02:00
Carles Fernandez
a31f4fc7cc
Use dll_pll_veml_tracking tracking block for GPS L5
2018-04-05 21:49:32 +02:00
Carles Fernandez
32cfe3e228
Use dll_pll_veml_tracking tracking block for Galileo E5a
2018-04-05 21:35:01 +02:00
Carles Fernandez
c1eccf1a27
Delete unused member
2018-04-05 21:24:01 +02:00
Carles Fernandez
8a4b51bf38
Use dll_pll_veml_tracking tracking block for GPS L2C
2018-04-05 21:15:51 +02:00
Carles Fernandez
c9925e07db
Initialize missing parameter
2018-04-05 21:04:01 +02:00
Carles Fernandez
b9c2614fc3
Fix bug in saving data into a .mat file
2018-04-05 20:58:48 +02:00
Carles Fernandez
5aec66f85e
CMake fix
2018-04-05 20:31:53 +02:00
Carles Fernandez
6fd9a2d2ab
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
2018-04-05 19:19:09 +02:00
Carles Fernandez
343c8a5c53
Merge branch 'antonioramosdet-two_step_acquisition' into next
2018-04-05 19:18:18 +02:00
Carles Fernandez
9d239653f8
Merge branch 'two_step_acquisition' of https://github.com/antonioramosdet/gnss-sdr into antonioramosdet-two_step_acquisition
2018-04-05 19:06:55 +02:00
Antonio Ramos
dd04df5bc3
Add DLL PLL tracking configuration structure
2018-04-05 18:08:49 +02:00
Antonio Ramos
f283f7fab5
Fix test
2018-04-05 15:00:34 +02:00
Antonio Ramos
e42149c9e5
Add number of doppler bins and doppler step in two step acquisition
2018-04-05 12:42:28 +02:00
Carles Fernandez
ff1583e974
Merge branch 'next' of https://gitlab.com/gnss-sdr/gnss-sdr into next
2018-04-05 11:55:24 +02:00
Carles Fernandez
9931799e34
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-05 11:55:11 +02:00
Carles Fernandez
23468d1b29
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-05 00:38:08 +02:00
Carles Fernandez
2f0de7e6d6
Merge branch 'antonioramosdet-fix_data_type_sample_counter' into next
2018-04-04 19:49:51 +02:00
Antonio Ramos
44635a41b3
Add two step acquisition funcionality
2018-04-04 14:59:28 +02:00
Antonio Ramos
1e7d9ef794
Fix test. Wrong data type
2018-04-04 11:52:24 +02:00
Antonio Ramos
fc0e973adf
Fix unit test
2018-04-04 11:29:38 +02:00
Antonio Ramos
46bc52ce9e
Sample counter now accepts any data type
2018-04-04 11:16:35 +02:00
Carles Fernandez
f8d3283d47
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
2018-04-04 07:50:19 +02:00
Carles Fernandez
59215870c6
Fix debian8.10
2018-04-04 00:07:02 +02:00
Carles Fernandez
ba07f5ef85
Fix Ubuntu 14.04
2018-04-04 00:00:58 +02:00
Carles Fernandez
bc6a568414
Reorder headers
2018-04-03 23:45:06 +02:00
Carles Fernandez
93acaa43a2
Merge branch 'next' of https://gitlab.com/gnss-sdr/gnss-sdr into next
2018-04-03 23:25:18 +02:00
Carles Fernandez
05a9607cc4
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
2018-04-03 23:24:35 +02:00
Carles Fernandez
7bb4b0e065
Colors for everyone
2018-04-03 23:22:20 +02:00
Carles Fernandez
2d347740d0
Fix time reporting
2018-04-03 23:21:44 +02:00
Carles Fernandez
cff55496db
Allow debian10 to fail
2018-04-03 21:13:59 +02:00
Carles Fernandez
ec2550f996
Remove unused variable
2018-04-03 20:09:34 +02:00
Carles Fernandez
a3296bd719
Fix possible uninitialization
2018-04-03 19:39:35 +02:00