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

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2018-08-31 10:07:54 +02:00
commit 35dbb42918
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
5 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/PVT/libs/rtklib_solver.cc
View File

@ -599,8 +599,8 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro>& gnss_observables_
tmp_double = pvt_sol.thres; tmp_double = pvt_sol.thres;
d_dump_file.write(reinterpret_cast<char*>(&pvt_sol.thres), sizeof(float)); d_dump_file.write(reinterpret_cast<char*>(&pvt_sol.thres), sizeof(float));
//GDOP//PDOP//HDOP//VDOP // GDOP / PDOP/ HDOP/ VDOP
d_dump_file.write(reinterpret_cast<char*>(&dop_[0]), sizeof(dop_)); d_dump_file.write(reinterpret_cast<char*>(&dop_[0]), sizeof(double) * 4);
} }
catch (const std::ifstream::failure& e) catch (const std::ifstream::failure& e)
{ {

2
src/algorithms/libs/galileo_e1_signal_processing.cc
View File

@ -108,7 +108,7 @@ void galileo_e1_sinboc_61_gen_int(int* _dest, int* _prn, uint32_t _length_out)
void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t _prn) void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t _prn)
{ {
std::string _galileo_signal = _Signal; std::string _galileo_signal = _Signal;
const uint32_t _codeLength = static_cast<const uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS); const uint32_t _codeLength = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
int32_t primary_code_E1_chips[4092]; // _codeLength not accepted by Clang int32_t primary_code_E1_chips[4092]; // _codeLength not accepted by Clang
galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); //generate Galileo E1 code, 1 sample per chip galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); //generate Galileo E1 code, 1 sample per chip
for (uint32_t i = 0; i < _codeLength; i++) for (uint32_t i = 0; i < _codeLength; i++)

11
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
View File

@ -133,6 +133,17 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
break; break;
} }
default: default:
d_bits_per_preamble = 0;
d_samples_per_preamble = 0;
d_preamble_period_symbols = 0;
d_preamble_samples = nullptr;
d_secondary_code_samples = nullptr;
d_samples_per_symbol = 0U;
d_PRN_code_period_ms = 0U;
d_required_symbols = 0U;
d_frame_length_symbols = 0.0;
CodeLength = 0;
DataLength = 0;
std::cout << "Galileo unified telemetry decoder error: Unknown frame type " << std::endl; std::cout << "Galileo unified telemetry decoder error: Unknown frame type " << std::endl;
} }

2
src/utils/reproducibility/ieee-access18/L2-access18.conf
View File

@ -133,7 +133,7 @@ PVT.display_rate_ms=500
;# KML, GeoJSON, NMEA and RTCM output configuration ;# KML, GeoJSON, NMEA and RTCM output configuration
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump. ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./data/PVT PVT.dump_filename=./data/access18
;#nmea_dump_filename: NMEA log path and filename ;#nmea_dump_filename: NMEA log path and filename
PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea

44
src/utils/reproducibility/ieee-access18/plot_dump.m
View File

@ -62,26 +62,46 @@ ylabel('Navigation data bits','fontname','Times','fontsize', fontsize)
grid on grid on
fileID = fopen('data/PVT_ls_pvt.dat', 'r'); fileID = fopen('data/access18_pvt.dat', 'r');
dinfo = dir('data/PVT_ls_pvt.dat'); dinfo = dir('data/access18_pvt.dat');
filesize = dinfo.bytes; filesize = dinfo.bytes;
aux = 1; aux = 1;
while ne(ftell(fileID), filesize) while ne(ftell(fileID), filesize)
navsol.RX_time(aux) = fread(fileID, 1, 'double'); navsol.TOW_at_current_symbol_ms(aux) = fread(fileID, 1, 'uint32');
navsol.X(aux) = fread(fileID, 1, 'double'); navsol.week(aux) = fread(fileID, 1, 'uint32');
navsol.Y(aux) = fread(fileID, 1, 'double'); navsol.RX_time(aux) = fread(fileID, 1, 'double');
navsol.Z(aux) = fread(fileID, 1, 'double'); navsol.user_clock_offset(aux) = fread(fileID, 1, 'double');
navsol.user_clock(aux) = fread(fileID, 1, 'double'); navsol.X(aux) = fread(fileID, 1, 'double');
navsol.lat(aux) = fread(fileID, 1, 'double'); navsol.Y(aux) = fread(fileID, 1, 'double');
navsol.long(aux) = fread(fileID, 1, 'double'); navsol.Z(aux) = fread(fileID, 1, 'double');
navsol.height(aux) = fread(fileID, 1, 'double'); navsol.VX(aux) = fread(fileID, 1, 'double');
navsol.VY(aux) = fread(fileID, 1, 'double');
navsol.VZ(aux) = fread(fileID, 1, 'double');
navsol.varXX(aux) = fread(fileID, 1, 'double');
navsol.varYY(aux) = fread(fileID, 1, 'double');
navsol.varZZ(aux) = fread(fileID, 1, 'double');
navsol.varXY(aux) = fread(fileID, 1, 'double');
navsol.varYZ(aux) = fread(fileID, 1, 'double');
navsol.varZX(aux) = fread(fileID, 1, 'double');
navsol.latitude(aux) = fread(fileID, 1, 'double');
navsol.longitude(aux) = fread(fileID, 1, 'double');
navsol.height(aux) = fread(fileID, 1, 'double');
navsol.number_sats(aux) = fread(fileID, 1, 'uint8');
navsol.solution_status(aux) = fread(fileID, 1, 'uint8');
navsol.solution_type(aux) = fread(fileID, 1, 'uint8');
navsol.AR_ratio_factor(aux) = fread(fileID, 1, 'float');
navsol.AR_ratio_threshold(aux) = fread(fileID, 1, 'float');
navsol.GDOP(aux) = fread(fileID, 1, 'double');
navsol.PDOP(aux) = fread(fileID, 1, 'double');
navsol.HDOP(aux) = fread(fileID, 1, 'double');
navsol.VDOP(aux) = fread(fileID, 1, 'double');
aux = aux + 1; aux = aux + 1;
end end
fclose(fileID); fclose(fileID);
mean_Latitude = mean(navsol.lat); mean_Latitude = mean(navsol.latitude);
mean_Longitude = mean(navsol.long); mean_Longitude = mean(navsol.longitude);
mean_h = mean(navsol.height); mean_h = mean(navsol.height);
utmZone = findUtmZone(mean_Latitude, mean_Longitude); utmZone = findUtmZone(mean_Latitude, mean_Longitude);
[ref_X_cart, ref_Y_cart, ref_Z_cart] = geo2cart(dms2mat(deg2dms(mean_Latitude)), dms2mat(deg2dms(mean_Longitude)), mean_h, 5); [ref_X_cart, ref_Y_cart, ref_Z_cart] = geo2cart(dms2mat(deg2dms(mean_Latitude)), dms2mat(deg2dms(mean_Longitude)), mean_h, 5);