mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-16 04:05:46 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
Carles Fernandez
commit
01eb6ae9cf
@ -108,7 +108,7 @@ public:
|
||||
//std::cout << "Enter Channel_waiting_S3 " << std::endl;
|
||||
context<ChannelFsm> ().request_satellite();
|
||||
}
|
||||
~channel_waiting_fsm_S3(){}
|
||||
// ~channel_waiting_fsm_S3(){}
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -300,7 +300,7 @@ rtl_tcp_signal_source_c::handle_read (const boost::system::error_code &ec,
|
||||
while (!not_full( )) {
|
||||
// uh-oh, buffer overflow
|
||||
// wait until there's space for more
|
||||
not_empty_.notify_one ();
|
||||
not_empty_.notify_one (); // needed?
|
||||
not_full_.wait (lock,
|
||||
boost::bind (&rtl_tcp_signal_source_c::not_full,
|
||||
this));
|
||||
|
||||
@ -69,6 +69,7 @@ SbasL1TelemetryDecoder::SbasL1TelemetryDecoder(ConfigurationInterface* configura
|
||||
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
|
||||
// make telemetry decoder object
|
||||
telemetry_decoder_ = sbas_l1_make_telemetry_decoder_cc(satellite_, 0, (long)fs_in, vector_length_, queue_, dump_); // TODO fix me
|
||||
channel_ = 0;
|
||||
DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
|
||||
// set the queues;
|
||||
telemetry_decoder_->set_raw_msg_queue(&global_sbas_raw_msg_queue);
|
||||
|
||||
@ -75,6 +75,7 @@ sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc(
|
||||
LOG(INFO) << "SBAS L1 TELEMETRY PROCESSING: satellite " << d_satellite;
|
||||
d_fs_in = fs_in;
|
||||
d_block_size = d_samples_per_symbol * d_symbols_per_bit * d_block_size_in_bits;
|
||||
d_channel = 0;
|
||||
set_output_multiple (1);
|
||||
}
|
||||
|
||||
|
||||
@ -35,7 +35,16 @@
|
||||
#include <utility>
|
||||
|
||||
gnss_sdr_supl_client::gnss_sdr_supl_client()
|
||||
{}
|
||||
{
|
||||
mcc = 0;
|
||||
mns = 0;
|
||||
lac = 0;
|
||||
ci = 0;
|
||||
supl_ctx_new(&ctx);
|
||||
assist = {0};
|
||||
server_port = 0;
|
||||
request = 0;
|
||||
}
|
||||
|
||||
gnss_sdr_supl_client::~gnss_sdr_supl_client()
|
||||
{}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* \file Gps_CNAV_Ephemeris.cc
|
||||
* \file gps_cnav_ephemeris.cc
|
||||
* \brief Interface of a GPS CNAV EPHEMERIS storage and orbital model functions
|
||||
*
|
||||
* See http://www.gps.gov/technical/icwg/IS-GPS-200E.pdf Appendix II
|
||||
@ -65,45 +65,6 @@ Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris()
|
||||
b_alert_flag = false; // If true, indicates that the SV URA may be worse than indicated in d_SV_accuracy, use that SV at our own risk.
|
||||
b_antispoofing_flag = false; // If true, the AntiSpoofing mode is ON in that SV
|
||||
|
||||
//Plane A (info from http://www.navcen.uscg.gov/?Do=constellationStatus)
|
||||
satelliteBlock[9] = "IIA";
|
||||
satelliteBlock[31] = "IIR-M";
|
||||
satelliteBlock[8] = "IIA";
|
||||
satelliteBlock[7] = "IIR-M";
|
||||
satelliteBlock[27] = "IIA";
|
||||
//Plane B
|
||||
satelliteBlock[16] = "IIR";
|
||||
satelliteBlock[25] = "IIF";
|
||||
satelliteBlock[28] = "IIR";
|
||||
satelliteBlock[12] = "IIR-M";
|
||||
satelliteBlock[30] = "IIA";
|
||||
//Plane C
|
||||
satelliteBlock[29] = "IIR-M";
|
||||
satelliteBlock[3] = "IIA";
|
||||
satelliteBlock[19] = "IIR";
|
||||
satelliteBlock[17] = "IIR-M";
|
||||
satelliteBlock[6] = "IIA";
|
||||
//Plane D
|
||||
satelliteBlock[2] = "IIR";
|
||||
satelliteBlock[1] = "IIF";
|
||||
satelliteBlock[21] = "IIR";
|
||||
satelliteBlock[4] = "IIA";
|
||||
satelliteBlock[11] = "IIR";
|
||||
satelliteBlock[24] = "IIA"; // Decommissioned from active service on 04 Nov 2011
|
||||
//Plane E
|
||||
satelliteBlock[20] = "IIR";
|
||||
satelliteBlock[22] = "IIR";
|
||||
satelliteBlock[5] = "IIR-M";
|
||||
satelliteBlock[18] = "IIR";
|
||||
satelliteBlock[32] = "IIA";
|
||||
satelliteBlock[10] = "IIA";
|
||||
//Plane F
|
||||
satelliteBlock[14] = "IIR";
|
||||
satelliteBlock[15] = "IIR-M";
|
||||
satelliteBlock[13] = "IIR";
|
||||
satelliteBlock[23] = "IIR";
|
||||
satelliteBlock[26] = "IIA";
|
||||
|
||||
d_satClkDrift = 0.0;
|
||||
d_dtr = 0.0;
|
||||
d_satpos_X = 0.0;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*!
|
||||
* \file Gps_CNAV_Ephemeris.h
|
||||
* \brief Interface of a GPS EPHEMERIS storage
|
||||
* \author Javier Arribas, 2013. jarribas(at)cttc.es
|
||||
* \file gps_cnav_ephemeris.h
|
||||
* \brief Interface of a GPS CNAV EPHEMERIS storage
|
||||
* \author Javier Arribas, 2015. jarribas(at)cttc.es
|
||||
*
|
||||
* -------------------------------------------------------------------------
|
||||
*
|
||||
@ -29,8 +29,8 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifndef GNSS_SDR_Gps_CNAV_Ephemeris_H_
|
||||
#define GNSS_SDR_Gps_CNAV_Ephemeris_H_
|
||||
#ifndef GNSS_SDR_GPS_CNAV_EPHEMERIS_H_
|
||||
#define GNSS_SDR_GPS_CNAV_EPHEMERIS_H_
|
||||
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
@ -54,17 +54,17 @@ public:
|
||||
|
||||
//Message Types 10 and 11 Parameters (1 of 2)
|
||||
int i_GPS_week; //!< GPS week number, aka WN [week]
|
||||
int i_URA; //!< ED Accuracy Index
|
||||
int i_signal_health; //!< Signal health (L1/L2/L5)
|
||||
double d_Top; //!< Data predict time of week
|
||||
double d_DELTA_A; //!< Semi-major axis difference at reference time
|
||||
double d_A_DOT; //!< Change rate in semi-major axis
|
||||
int i_URA; //!< ED Accuracy Index
|
||||
int i_signal_health; //!< Signal health (L1/L2/L5)
|
||||
double d_Top; //!< Data predict time of week
|
||||
double d_DELTA_A; //!< Semi-major axis difference at reference time
|
||||
double d_A_DOT; //!< Change rate in semi-major axis
|
||||
double d_Delta_n; //!< Mean Motion Difference From Computed Value [semi-circles/s]
|
||||
double d_DELTA_DOT_N; // Rate of mean motion difference from computed value
|
||||
double d_DELTA_DOT_N; //!< Rate of mean motion difference from computed value
|
||||
double d_M_0; //!< Mean Anomaly at Reference Time [semi-circles]
|
||||
double d_e_eccentricity; //< Eccentricity
|
||||
double d_e_eccentricity; //!< Eccentricity
|
||||
double d_OMEGA; //!< Argument of Perigee [semi-cicles]
|
||||
double d_OMEGA0; //!< Longitude of Ascending Node of Orbit Plane at Weekly Epoch [semi-cicles]
|
||||
double d_OMEGA0; //!< Longitude of Ascending Node of Orbit Plane at Weekly Epoch [semi-cicles]
|
||||
double d_Toe; //!< Ephemeris data reference time of week (Ref. 20.3.3.4.3 IS-GPS-200E) [s]
|
||||
double d_DELTA_OMEGA_DOT; //!< Rate of Right Ascension difference [semi-circles/s]
|
||||
double d_i_0; //!< Inclination Angle at Reference Time [semi-circles]
|
||||
@ -78,13 +78,13 @@ public:
|
||||
|
||||
//Clock Correction and Accuracy Parameters
|
||||
double d_Toc; //!< clock data reference time (Ref. 20.3.3.3.3.1 IS-GPS-200E) [s]
|
||||
double d_A_f0; //!< Coefficient 0 of code phase offset model [s]
|
||||
double d_A_f1; //!< Coefficient 1 of code phase offset model [s/s]
|
||||
double d_A_f2; //!< Coefficient 2 of code phase offset model [s/s^2]
|
||||
double d_A_f0; //!< Coefficient 0 of code phase offset model [s]
|
||||
double d_A_f1; //!< Coefficient 1 of code phase offset model [s/s]
|
||||
double d_A_f2; //!< Coefficient 2 of code phase offset model [s/s^2]
|
||||
|
||||
double d_URA0; //!<NED Accuracy Index
|
||||
double d_URA1; //!<NED Accuracy Change Index
|
||||
double d_URA2; //!< NED Accuracy Change Rate Index
|
||||
double d_URA0; //!<NED Accuracy Index
|
||||
double d_URA1; //!<NED Accuracy Change Index
|
||||
double d_URA2; //!< NED Accuracy Change Rate Index
|
||||
|
||||
|
||||
//Group Delay Differential Parameters
|
||||
@ -96,9 +96,6 @@ public:
|
||||
|
||||
double d_TOW; //!< Time of GPS Week of the ephemeris set (taken from subframes TOW) [s]
|
||||
|
||||
|
||||
|
||||
|
||||
// Flags
|
||||
|
||||
/*! \brief If true, enhanced level of integrity assurance.
|
||||
@ -129,8 +126,6 @@ public:
|
||||
double d_satvel_Y; //!< Earth-fixed velocity coordinate y of the satellite [m]
|
||||
double d_satvel_Z; //!< Earth-fixed velocity coordinate z of the satellite [m]
|
||||
|
||||
std::map<int,std::string> satelliteBlock; //!< Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
|
||||
|
||||
template<class Archive>
|
||||
|
||||
/*!
|
||||
|
||||
@ -160,10 +160,9 @@ int main(int argc, char **argv)
|
||||
google::InitGoogleLogging(argv[0]);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
catch(const testing::internal::GoogleTestFailureException& e)
|
||||
{
|
||||
std::cout << e.what() << std::endl;
|
||||
}
|
||||
catch(...)
|
||||
{}
|
||||
{
|
||||
LOG(WARNING) << "Unexpected catch";
|
||||
}
|
||||
google::ShutDownCommandLineFlags();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user