mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-28 18:04:51 +00:00
fixes from wrong merge
This commit is contained in:
parent
6f87e3fc17
commit
3a56e09772
@ -264,8 +264,8 @@ int gps_l1_ca_observables_cc::general_work (int noutput_items, gr_vector_int &ni
|
||||
d_dump_file.write((char*)&tmp_double, sizeof(double));
|
||||
//tmp_double = (double)(current_gnss_synchro[i].Flag_valid_pseudorange==true);
|
||||
//tmp_double = current_gnss_synchro[i].debug_var1;
|
||||
tmp_double = current_gnss_synchro[i].debug_var2;
|
||||
d_dump_file.write((char*)&tmp_double, sizeof(double));
|
||||
//tmp_double = current_gnss_synchro[i].debug_var2;
|
||||
//d_dump_file.write((char*)&tmp_double, sizeof(double));
|
||||
tmp_double = current_gnss_synchro[i].PRN;
|
||||
d_dump_file.write((char*)&tmp_double, sizeof(double));
|
||||
}
|
||||
|
@ -374,7 +374,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items,gr_vect
|
||||
//carrier phase accumulator for (K) Doppler estimation-
|
||||
d_acc_carrier_phase_rad -= GALILEO_TWO_PI * d_carrier_doppler_hz * static_cast<double>(d_current_prn_length_samples) / static_cast<double>(d_fs_in);
|
||||
//remnant carrier phase to prevent overflow in the code NCO
|
||||
d_rem_carr_phase_rad = d_rem_carr_phase_rad + GALILEO_TWO_PI * d_carrier_doppler_hz * d_current_prn_length_samples / static_cast<double>(d_fs_in);
|
||||
d_rem_carr_phase_rad = d_rem_carr_phase_rad + GALILEO_TWO_PI * d_carrier_doppler_hz * static_cast<double>(d_current_prn_length_samples) / static_cast<double>(d_fs_in);
|
||||
d_rem_carr_phase_rad = std::fmod(d_rem_carr_phase_rad, GALILEO_TWO_PI);
|
||||
|
||||
// ################## DLL ##########################################################
|
||||
|
@ -74,10 +74,6 @@ public:
|
||||
// Pseudorange
|
||||
double Pseudorange_m;
|
||||
bool Flag_valid_pseudorange;
|
||||
|
||||
//debug
|
||||
double debug_var1;
|
||||
double debug_var2;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user