mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 19:50:34 +00:00
Code Issues Releases Wiki Activity

Reduce excessive padding

Browse Source
This commit is contained in:
Carles Fernandez 2021-10-10 20:24:16 +02:00
parent 7cca04da15
commit c087c63d42
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/system_parameters/galileo_fnav_message.h
View File

@ -162,15 +162,15 @@ private:
double FNAV_ai0_1{};
double FNAV_ai1_1{};
double FNAV_ai2_1{};
double FNAV_BGD_1{};
int32_t FNAV_E5ahs_1{};
int32_t FNAV_WN_1{};
int32_t FNAV_TOW_1{};
bool FNAV_region1_1{};
bool FNAV_region2_1{};
bool FNAV_region3_1{};
bool FNAV_region4_1{};
bool FNAV_region5_1{};
double FNAV_BGD_1{};
int32_t FNAV_E5ahs_1{};
int32_t FNAV_WN_1{};
int32_t FNAV_TOW_1{};
bool FNAV_E5advs_1{};
// WORD 2 Ephemeris (1/3) and GST

25
src/core/system_parameters/galileo_has_data.h
View File

@ -56,12 +56,7 @@ public:
std::vector<std::string> get_signals_in_mask(uint8_t nsys) const;
uint8_t get_gnss_id(int nsat) const;
mt1_header header;
uint8_t has_status;
uint8_t message_id;
// Mask
uint8_t Nsys;
std::vector<uint8_t> gnss_id_mask;
std::vector<uint64_t> satellite_mask;
std::vector<uint16_t> signal_mask;
@ -70,21 +65,17 @@ public:
std::vector<uint8_t> nav_message;
// Orbit corrections
uint8_t validity_interval_index_orbit_corrections;
std::vector<uint16_t> gnss_iod;
std::vector<int16_t> delta_radial;
std::vector<int16_t> delta_along_track;
std::vector<int16_t> delta_cross_track;
// Clock full-set corrections
uint8_t validity_interval_index_clock_fullset_corrections;
std::vector<uint8_t> delta_clock_c0_multiplier;
std::vector<bool> iod_change_flag;
std::vector<int16_t> delta_clock_c0;
// Clock subset corrections
uint8_t validity_interval_index_clock_subset_corrections;
uint8_t Nsysprime;
std::vector<uint8_t> gnss_id_clock_subset;
std::vector<uint8_t> delta_clock_c0_multiplier_clock_subset;
std::vector<uint64_t> satellite_submask;
@ -92,17 +83,27 @@ public:
std::vector<std::vector<int16_t>> delta_clock_c0_clock_subset;
// Code bias
uint8_t validity_interval_index_code_bias_corrections;
std::vector<std::vector<int16_t>> code_bias;
// Phase bias
uint8_t validity_interval_index_phase_bias_corrections;
std::vector<std::vector<int16_t>> phase_bias;
std::vector<std::vector<uint8_t>> phase_discontinuity_indicator;
// URA
uint8_t validity_interval_index_ura_corrections;
std::vector<uint8_t> ura;
mt1_header header;
uint8_t has_status;
uint8_t message_id;
uint8_t Nsys; // in Mask
uint8_t validity_interval_index_orbit_corrections; // in Orbit corrections
uint8_t validity_interval_index_clock_fullset_corrections; // in Clock full-set corrections
uint8_t validity_interval_index_clock_subset_corrections; // in Clock subset corrections
uint8_t Nsysprime; // in Clock subset corrections
uint8_t validity_interval_index_code_bias_corrections; // in Code bias
uint8_t validity_interval_index_phase_bias_corrections; // in Phase bias
uint8_t validity_interval_index_ura_corrections; // in URA
};

23
src/core/system_parameters/galileo_inav_message.h
View File

@ -238,6 +238,10 @@ private:
std::string page_Even{};
std::vector<uint8_t> rs_buffer; // Reed-Solomon buffer
std::unique_ptr<ReedSolomon> rs; // The Reed-Solomon decoder
std::vector<int> inav_rs_pages; // Pages 1,2,3,4,17,18,19,20. Holds 1 if the page has arrived, 0 otherwise.
int32_t Page_type_time_stamp{};
int32_t IOD_ephemeris{};
@ -257,13 +261,13 @@ private:
// Word type 3: Ephemeris (3/4) and SISA
int32_t IOD_nav_3{}; //
int32_t SISA_3{};
double OMEGA_dot_3{}; // Rate of right ascension [semi-circles/sec]
double delta_n_3{}; // Mean motion difference from computed value [semi-circles/sec]
double C_uc_3{}; // Amplitude of the cosine harmonic correction term to the argument of latitude [radians]
double C_us_3{}; // Amplitude of the sine harmonic correction term to the argument of latitude [radians]
double C_rc_3{}; // Amplitude of the cosine harmonic correction term to the orbit radius [meters]
double C_rs_3{}; // Amplitude of the sine harmonic correction term to the orbit radius [meters]
int32_t SISA_3{};
// Word type 4: Ephemeris (4/4) and Clock correction parameters*/
int32_t IOD_nav_4{}; //
@ -283,6 +287,10 @@ private:
double ai0_5{}; // Effective Ionisation Level 1st order parameter [sfu]
double ai1_5{}; // Effective Ionisation Level 2st order parameter [sfu/degree]
double ai2_5{}; // Effective Ionisation Level 3st order parameter [sfu/degree]
double BGD_E1E5a_5{}; // E1-E5a Broadcast Group Delay [s]
double BGD_E1E5b_5{}; // E1-E5b Broadcast Group Delay [s]
int32_t E5b_HS_5{}; // E5b Signal Health Status
int32_t E1B_HS_5{}; // E1B Signal Health Status
// Ionospheric disturbance flag
bool Region1_flag_5{}; // Ionospheric Disturbance Flag for region 1
@ -290,11 +298,6 @@ private:
bool Region3_flag_5{}; // Ionospheric Disturbance Flag for region 3
bool Region4_flag_5{}; // Ionospheric Disturbance Flag for region 4
bool Region5_flag_5{}; // Ionospheric Disturbance Flag for region 5
double BGD_E1E5a_5{}; // E1-E5a Broadcast Group Delay [s]
double BGD_E1E5b_5{}; // E1-E5b Broadcast Group Delay [s]
int32_t E5b_HS_5{}; // E5b Signal Health Status
int32_t E1B_HS_5{}; // E1B Signal Health Status
bool E5b_DVS_5{}; // E5b Data Validity Status
bool E1B_DVS_5{}; // E1B Data Validity Status
@ -329,11 +332,11 @@ private:
// Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)
int32_t IOD_a_8{};
double af0_8{};
double af1_8{};
int32_t E5b_HS_8{};
int32_t E1B_HS_8{};
int32_t SVID2_8{};
double af0_8{};
double af1_8{};
double DELTA_A_8{};
double e_8{};
double omega_8{};
@ -391,10 +394,6 @@ private:
int32_t current_IODnav{};
std::vector<uint8_t> rs_buffer; // Reed-Solomon buffer
std::unique_ptr<ReedSolomon> rs; // The Reed-Solomon decoder
std::vector<int> inav_rs_pages; // Pages 1,2,3,4,17,18,19,20. Holds 1 if the page has arrived, 0 otherwise.
uint8_t IODnav_LSB17{};
uint8_t IODnav_LSB18{};
uint8_t IODnav_LSB19{};