mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-08-20 00:58:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' into bds_b3i. Keep code up to date

Browse Source
This commit is contained in:
Damian Miralles
2019-03-17 18:58:44 -05:00
parent 5a4227507d b409f1c15e
commit 10910269f4
24 changed files with 181 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
+2 -1
View File
@@ -522,6 +522,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
// try to decode frame
DLOG(INFO) << "Starting page decoder for Galileo satellite " << this->d_satellite;
d_preamble_index = d_sample_counter; // record the preamble sample stamp
d_CRC_error_counter = 0;
d_stat = 2;
}
else
@@ -555,7 +556,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
{
for (uint32_t i = 0; i < d_frame_length_symbols; i++)
{
d_page_part_symbols[i] = d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now!
d_page_part_symbols[i] = -d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now!
}
}
decode_INAV_word(d_page_part_symbols, d_frame_length_symbols);
src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
+3 -3
View File
@@ -29,8 +29,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef LIBSWIFTNAV_BITS_H
#define LIBSWIFTNAV_BITS_H
#ifndef GNSS_SDR_BITS_H_
#define GNSS_SDR_BITS_H_
#include "swift_common.h"
@@ -47,4 +47,4 @@ uint8_t count_bits_u32(uint32_t v, uint8_t bv);
uint8_t count_bits_u16(uint16_t v, uint8_t bv);
uint8_t count_bits_u8(uint8_t v, uint8_t bv);
#endif /* LIBSWIFTNAV_BITS_H */
#endif /* GNSS_SDR_BITS_H_ */
src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+3 -3
View File
@@ -30,8 +30,8 @@
*/
#ifndef LIBSWIFTNAV_CNAV_MSG_H
#define LIBSWIFTNAV_CNAV_MSG_H
#ifndef GNSS_SDR_CNAV_MSG_H_
#define GNSS_SDR_CNAV_MSG_H_
#include "fec.h"
#include "swift_common.h"
@@ -117,4 +117,4 @@ bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
/** \} */
/** \} */
#endif /* LIBSWIFTNAV_CNAV_MSG_H */
#endif /* GNSS_SDR_CNAV_MSG_H_ */
src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
+3 -3
View File
@@ -30,12 +30,12 @@
*/
#ifndef LIBSWIFTNAV_EDC_H
#define LIBSWIFTNAV_EDC_H
#ifndef GNSS_SDR_EDC_H_
#define GNSS_SDR_EDC_H_
#include "swift_common.h"
uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc);
uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert);
#endif /* LIBSWIFTNAV_EDC_H */
#endif /* GNSS_SDR_EDC_H_ */
src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h
+2 -2
View File
@@ -29,8 +29,8 @@
*/
#ifndef LIBSWIFTNAV_FEC_H_
#define LIBSWIFTNAV_FEC_H_
#ifndef GNSS_SDR_FEC_H_
#define GNSS_SDR_FEC_H_
/* r=1/2 k=7 convolutional encoder polynomials
* The NASA-DSN convention is to use V27POLYA inverted, then V27POLYB
src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
+3 -3
View File
@@ -32,8 +32,8 @@
*/
#ifndef LIBSWIFTNAV_COMMON_H
#define LIBSWIFTNAV_COMMON_H
#ifndef GNSS_SDR_SWIFT_COMMON_H_
#define GNSS_SDR_SWIFT_COMMON_H_
/** \defgroup common Common definitions
* Common definitions used throughout the library.
@@ -50,4 +50,4 @@
/** \} */
#endif /* LIBSWIFTNAV_COMMON_H */
#endif /* GNSS_SDR_SWIFT_COMMON_H_ */