1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-12-03 07:08:08 +00:00

Merge branch 'next' into smart_acq_resampler

This commit is contained in:
Carles Fernandez
2018-12-10 14:24:42 +01:00
447 changed files with 2958 additions and 2939 deletions

View File

@@ -35,15 +35,15 @@
#ifndef GNSS_SDR_CHANNEL_H_
#define GNSS_SDR_CHANNEL_H_
#include "channel_interface.h"
#include "channel_fsm.h"
#include "gnss_synchro.h"
#include "channel_interface.h"
#include "channel_msg_receiver_cc.h"
#include <gnuradio/msg_queue.h>
#include "gnss_synchro.h"
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <memory>
#include <string>
#include <mutex>
#include <string>
class ConfigurationInterface;
class AcquisitionInterface;

View File

@@ -33,8 +33,8 @@
#define GNSS_SDR_CHANNEL_FSM_H
#include "acquisition_interface.h"
#include "tracking_interface.h"
#include "telemetry_decoder_interface.h"
#include "tracking_interface.h"
#include <gnuradio/msg_queue.h>
#include <cstdint>
#include <memory>

View File

@@ -30,9 +30,9 @@
#include "channel_msg_receiver_cc.h"
#include <glog/logging.h>
#include <gnuradio/gr_complex.h>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
#include <cstdint>
using google::LogMessage;