mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-17 20:53:02 +00:00
Solve conflicts
This commit is contained in:
parent
385055e884
commit
2eea1a66aa
@ -63,7 +63,7 @@ hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in,
|
|||||||
d_dump_filename = dump_filename;
|
d_dump_filename = dump_filename;
|
||||||
T_rx_s = 0.0;
|
T_rx_s = 0.0;
|
||||||
T_rx_step_s = 0.001; // 1 ms
|
T_rx_step_s = 0.001; // 1 ms
|
||||||
max_delta = 2.5; // 2.5 s
|
max_delta = 3.0; // 3 s
|
||||||
d_latency = 0.08; // 80 ms
|
d_latency = 0.08; // 80 ms
|
||||||
valid_channels.resize(d_nchannels, false);
|
valid_channels.resize(d_nchannels, false);
|
||||||
d_num_valid_channels = 0;
|
d_num_valid_channels = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user