1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00

Add missing FLL configuration flag to tracking adapters

This commit is contained in:
Javier 2019-08-28 12:42:55 +02:00
parent b211b1a5fd
commit 4bedcc7dae
9 changed files with 20 additions and 0 deletions

View File

@ -126,6 +126,10 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param.enable_fll_pull_in = enable_fll_pull_in; trk_param.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param.fll_bw_hz = fll_bw_hz; trk_param.fll_bw_hz = fll_bw_hz;
trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s); trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s);

View File

@ -126,6 +126,8 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in; trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param_fpga.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param_fpga.fll_bw_hz = fll_bw_hz; trk_param_fpga.fll_bw_hz = fll_bw_hz;
float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0); float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0);

View File

@ -121,6 +121,8 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param.enable_fll_pull_in = enable_fll_pull_in; trk_param.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param.fll_bw_hz = fll_bw_hz; trk_param.fll_bw_hz = fll_bw_hz;
trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s); trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s);

View File

@ -117,6 +117,8 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in; trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param_fpga.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param_fpga.fll_bw_hz = fll_bw_hz; trk_param_fpga.fll_bw_hz = fll_bw_hz;
float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0); float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0);

View File

@ -127,6 +127,8 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param.enable_fll_pull_in = enable_fll_pull_in; trk_param.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param.fll_bw_hz = fll_bw_hz; trk_param.fll_bw_hz = fll_bw_hz;
trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s); trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s);

View File

@ -126,6 +126,8 @@ GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in; trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param_fpga.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param_fpga.fll_bw_hz = fll_bw_hz; trk_param_fpga.fll_bw_hz = fll_bw_hz;
float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0); float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0);

View File

@ -115,6 +115,8 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param.enable_fll_pull_in = enable_fll_pull_in; trk_param.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param.fll_bw_hz = fll_bw_hz; trk_param.fll_bw_hz = fll_bw_hz;
trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s); trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s);

View File

@ -128,6 +128,8 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param.enable_fll_pull_in = enable_fll_pull_in; trk_param.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param.fll_bw_hz = fll_bw_hz; trk_param.fll_bw_hz = fll_bw_hz;
trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s); trk_param.pull_in_time_s = configuration->property(role + ".pull_in_time_s", trk_param.pull_in_time_s);

View File

@ -130,6 +130,8 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false); bool enable_fll_pull_in = configuration->property(role + ".enable_fll_pull_in", false);
trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in; trk_param_fpga.enable_fll_pull_in = enable_fll_pull_in;
bool enable_fll_steady_state = configuration->property(role + ".enable_fll_steady_state", false);
trk_param_fpga.enable_fll_steady_state = enable_fll_steady_state;
float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0); float fll_bw_hz = configuration->property(role + ".fll_bw_hz", 35.0);
trk_param_fpga.fll_bw_hz = fll_bw_hz; trk_param_fpga.fll_bw_hz = fll_bw_hz;
float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0); float pull_in_time_s = configuration->property(role + ".pull_in_time_s", 2.0);