mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-27 01:14:51 +00:00
Code Issues Releases Wiki Activity

bds b1i: quick fixes to b1i code, preparing for merge

Browse Source
This commit is contained in:
Damian Miralles 2018-11-28 14:18:35 -06:00
parent c20cd33038
commit 0507febd7f
5 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
conf/gnss-sdr_BDS_B1I_byte.conf
View File

@ -9,16 +9,16 @@
;######### GLOBAL OPTIONS ################## ;######### GLOBAL OPTIONS ##################
;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second]. ;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second].
GNSS-SDR.internal_fs_sps=99375000 GNSS-SDR.internal_fs_sps=25000000
;######### CONTROL_THREAD CONFIG ############ ;######### CONTROL_THREAD CONFIG ############
ControlThread.wait_for_flowgraph=false ControlThread.wait_for_flowgraph=false
;######### SIGNAL_SOURCE CONFIG ############ ;######### SIGNAL_SOURCE CONFIG ############
SignalSource.implementation=File_Signal_Source SignalSource.implementation=File_Signal_Source
SignalSource.filename=/media/dmiralles/Seagate Backup Plus Drive/GNSS Data/Beidou_B1_IF_signal.bin SignalSource.filename=/home/dmiralles/Documents/GNSS-Metadata-Standard/install/BdsB1IStr01.dat
SignalSource.item_type=byte SignalSource.item_type=byte
SignalSource.sampling_frequency=99375000 SignalSource.sampling_frequency=25000000
SignalSource.samples=0 SignalSource.samples=0
SignalSource.repeat=false SignalSource.repeat=false
SignalSource.dump=false SignalSource.dump=false
@ -45,27 +45,37 @@ InputFilter.band1_error=1.0
InputFilter.band2_error=1.0 InputFilter.band2_error=1.0
InputFilter.filter_type=bandpass InputFilter.filter_type=bandpass
InputFilter.grid_density=16 InputFilter.grid_density=16
InputFilter.sampling_frequency=99375000 InputFilter.sampling_frequency=25000000
InputFilter.IF=28902000 InputFilter.IF=6250000
Resampler.implementation=Pass_Through Resampler.implementation=Pass_Through
Resampler.sample_freq_in=99375000 Resampler.sample_freq_in=25000000
Resampler.sample_freq_out=99375000 Resampler.sample_freq_out=25000000
Resampler.item_type=gr_complex Resampler.item_type=gr_complex
;######### CHANNELS GLOBAL CONFIG ############ ;######### CHANNELS GLOBAL CONFIG ############
Channels_B1.count=8 Channels_B1.count=10
Channels.in_acquisition=1 Channels.in_acquisition=1
Channel.signal=B1 Channel.signal=B1
Channel0.satellite = 1;
Channel1.satellite = 2;
Channel2.satellite = 3;
Channel3.satellite = 4;
Channel4.satellite = 5;
Channel5.satellite = 6;
Channel6.satellite = 8;
Channel7.satellite = 9;
Channel8.satellite = 13;
Channel9.satellite = 17;
;######### ACQUISITION GLOBAL CONFIG ############ ;######### ACQUISITION GLOBAL CONFIG ############
Acquisition_B1.implementation=BEIDOU_B1I_PCPS_Acquisition Acquisition_B1.implementation=BEIDOU_B1I_PCPS_Acquisition
Acquisition_B1.item_type=gr_complex Acquisition_B1.item_type=gr_complex
Acquisition_B1.coherent_integration_time_ms=1 Acquisition_B1.coherent_integration_time_ms=1
Acquisition_B1.threshold=0.00005 Acquisition_B1.threshold=0.004
;Acquisition_B1.pfa=0.0000001; ;Acquisition_B1.pfa=0.0000001;
Acquisition_B1.doppler_max=10000 Acquisition_B1.doppler_max=12000
Acquisition_B1.doppler_step=100 Acquisition_B1.doppler_step=100
Acquisition_B1.dump=true Acquisition_B1.dump=true
Acquisition_B1.dump_filename=./bds_acq Acquisition_B1.dump_filename=./bds_acq

14
src/algorithms/libs/rtklib/rtklib_conversions.cc
View File

@ -262,12 +262,12 @@ eph_t eph_to_rtklib(const Beidou_Dnav_Ephemeris& bei_eph)
rtklib_sat.tgd[2] = 0.0; rtklib_sat.tgd[2] = 0.0;
rtklib_sat.tgd[3] = 0.0; rtklib_sat.tgd[3] = 0.0;
rtklib_sat.toes = bei_eph.d_Toe; rtklib_sat.toes = bei_eph.d_Toe;
rtklib_sat.toc = gpst2time(rtklib_sat.week, bei_eph.d_Toc); rtklib_sat.toc = bdt2time(rtklib_sat.week, bei_eph.d_Toc);
rtklib_sat.ttr = gpst2time(rtklib_sat.week, bei_eph.d_TOW); rtklib_sat.ttr = bdt2time(rtklib_sat.week, bei_eph.d_TOW);
/* adjustment for week handover */ /* adjustment for week handover */
double tow, toc; double tow, toc;
tow = time2gpst(rtklib_sat.ttr, &rtklib_sat.week); tow = time2bdt(rtklib_sat.ttr, &rtklib_sat.week);
toc = time2gpst(rtklib_sat.toc, NULL); toc = time2bdt(rtklib_sat.toc, NULL);
if (rtklib_sat.toes < tow - 302400.0) if (rtklib_sat.toes < tow - 302400.0)
{ {
rtklib_sat.week++; rtklib_sat.week++;
@ -278,9 +278,9 @@ eph_t eph_to_rtklib(const Beidou_Dnav_Ephemeris& bei_eph)
rtklib_sat.week--; rtklib_sat.week--;
tow += 604800.0; tow += 604800.0;
} }
rtklib_sat.toe = gpst2time(rtklib_sat.week, rtklib_sat.toes); rtklib_sat.toe = bdt2time(rtklib_sat.week, rtklib_sat.toes);
rtklib_sat.toc = gpst2time(rtklib_sat.week, toc); rtklib_sat.toc = bdt2time(rtklib_sat.week, toc);
rtklib_sat.ttr = gpst2time(rtklib_sat.week, tow); rtklib_sat.ttr = bdt2time(rtklib_sat.week, tow);
return rtklib_sat; return rtklib_sat;
} }

12
src/algorithms/telemetry_decoder/libs/beidou_b1i_subframe_fsm.h
View File

@ -33,12 +33,12 @@
#define GNSS_SDR_BEIDOU_B1I_SUBFRAME_FSM_H_ #define GNSS_SDR_BEIDOU_B1I_SUBFRAME_FSM_H_
#include <boost/statechart/state_machine.hpp> #include <boost/statechart/state_machine.hpp>
#include "../../../core/system_parameters/beidou_dnav_almanac.h" #include "beidou_dnav_almanac.h"
#include "../../../core/system_parameters/beidou_dnav_ephemeris.h" #include "beidou_dnav_ephemeris.h"
#include "../../../core/system_parameters/beidou_dnav_iono.h" #include "beidou_dnav_iono.h"
#include "../../../core/system_parameters/beidou_dnav_navigation_message.h" #include "beidou_dnav_navigation_message.h"
#include "../../../core/system_parameters/beidou_dnav_utc_model.h" #include "beidou_dnav_utc_model.h"
#include "../../../core/system_parameters/Beidou_B1I.h" #include "Beidou_B1I.h"
namespace sc = boost::statechart; namespace sc = boost::statechart;
namespace mpl = boost::mpl; namespace mpl = boost::mpl;

2
src/core/receiver/gnss_flowgraph.cc
View File

@ -1211,7 +1211,7 @@ void GNSSFlowgraph::set_signals_list()
std::set<unsigned int> available_beidou_prn = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, std::set<unsigned int> available_beidou_prn = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35}; 30, 31, 32, 33, 34, 35, 36, 37};
std::string sv_list = configuration_->property("Galileo.prns", std::string("")); std::string sv_list = configuration_->property("Galileo.prns", std::string(""));

20
src/core/system_parameters/beidou_dnav_navigation_message.cc
View File

@ -165,15 +165,11 @@ void Beidou_Dnav_Navigation_Message::reset()
} }
} }
Beidou_Dnav_Navigation_Message::Beidou_Dnav_Navigation_Message() Beidou_Dnav_Navigation_Message::Beidou_Dnav_Navigation_Message()
{ {
reset(); reset();
} }
void Beidou_Dnav_Navigation_Message::print_beidou_word_bytes(unsigned int BEIDOU_word) void Beidou_Dnav_Navigation_Message::print_beidou_word_bytes(unsigned int BEIDOU_word)
{ {
std::cout << " Word ="; std::cout << " Word =";
@ -181,8 +177,6 @@ void Beidou_Dnav_Navigation_Message::print_beidou_word_bytes(unsigned int BEIDOU
std::cout << std::endl; std::cout << std::endl;
} }
bool Beidou_Dnav_Navigation_Message::read_navigation_bool(std::bitset<BEIDOU_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int>> parameter) bool Beidou_Dnav_Navigation_Message::read_navigation_bool(std::bitset<BEIDOU_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int>> parameter)
{ {
bool value; bool value;
@ -198,7 +192,6 @@ bool Beidou_Dnav_Navigation_Message::read_navigation_bool(std::bitset<BEIDOU_SUB
return value; return value;
} }
unsigned long int Beidou_Dnav_Navigation_Message::read_navigation_unsigned(std::bitset<BEIDOU_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int>> parameter) unsigned long int Beidou_Dnav_Navigation_Message::read_navigation_unsigned(std::bitset<BEIDOU_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int>> parameter)
{ {
unsigned long int value = 0; unsigned long int value = 0;
@ -292,7 +285,6 @@ double Beidou_Dnav_Navigation_Message::check_t(double time)
return corrTime; return corrTime;
} }
// User Algorithm for SV Clock Correction.
double Beidou_Dnav_Navigation_Message::sv_clock_correction(double transmitTime) double Beidou_Dnav_Navigation_Message::sv_clock_correction(double transmitTime)
{ {
double dt; double dt;
@ -396,10 +388,6 @@ void Beidou_Dnav_Navigation_Message::satellitePosition(double transmitTime)
d_satvel_Z = d_satpos_Y * sin(i); d_satvel_Z = d_satpos_Y * sin(i);
} }
int Beidou_Dnav_Navigation_Message::subframe_decoder(char *subframe) int Beidou_Dnav_Navigation_Message::subframe_decoder(char *subframe)
{ {
int subframe_ID = 0; int subframe_ID = 0;
@ -786,9 +774,6 @@ int Beidou_Dnav_Navigation_Message::subframe_decoder(char *subframe)
return subframe_ID; return subframe_ID;
} }
double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_corrected) const double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_corrected) const
{ {
double t_utc; double t_utc;
@ -836,8 +821,6 @@ double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_correcte
return t_utc; return t_utc;
} }
Beidou_Dnav_Ephemeris Beidou_Dnav_Navigation_Message::get_ephemeris() Beidou_Dnav_Ephemeris Beidou_Dnav_Navigation_Message::get_ephemeris()
{ {
Beidou_Dnav_Ephemeris ephemeris; Beidou_Dnav_Ephemeris ephemeris;
@ -889,7 +872,6 @@ Beidou_Dnav_Ephemeris Beidou_Dnav_Navigation_Message::get_ephemeris()
return ephemeris; return ephemeris;
} }
Beidou_Dnav_Iono Beidou_Dnav_Navigation_Message::get_iono() Beidou_Dnav_Iono Beidou_Dnav_Navigation_Message::get_iono()
{ {
Beidou_Dnav_Iono iono; Beidou_Dnav_Iono iono;
@ -907,7 +889,6 @@ Beidou_Dnav_Iono Beidou_Dnav_Navigation_Message::get_iono()
return iono; return iono;
} }
Beidou_Dnav_Utc_Model Beidou_Dnav_Navigation_Message::get_utc_model() Beidou_Dnav_Utc_Model Beidou_Dnav_Navigation_Message::get_utc_model()
{ {
Beidou_Dnav_Utc_Model utc_model; Beidou_Dnav_Utc_Model utc_model;
@ -926,7 +907,6 @@ Beidou_Dnav_Utc_Model Beidou_Dnav_Navigation_Message::get_utc_model()
return utc_model; return utc_model;
} }
bool Beidou_Dnav_Navigation_Message::satellite_validation() bool Beidou_Dnav_Navigation_Message::satellite_validation()
{ {
bool flag_data_valid = false; bool flag_data_valid = false;