mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-07-31 16:22:56 +00:00
Include cleaning
This commit is contained in:
parent
0a1aa50c4a
commit
5abc7b8b6a
@ -30,22 +30,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "channel.h"
|
#include "channel.h"
|
||||||
#include <cstring>
|
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <boost/thread/thread.hpp>
|
|
||||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
|
||||||
#include <boost/chrono.hpp>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include <gnuradio/io_signature.h>
|
|
||||||
#include <gnuradio/message.h>
|
|
||||||
#include "acquisition_interface.h"
|
#include "acquisition_interface.h"
|
||||||
#include "tracking_interface.h"
|
#include "tracking_interface.h"
|
||||||
#include "telemetry_decoder_interface.h"
|
#include "telemetry_decoder_interface.h"
|
||||||
#include "configuration_interface.h"
|
#include "configuration_interface.h"
|
||||||
#include "gnss_flowgraph.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -197,7 +187,7 @@ void Channel::start_acquisition()
|
|||||||
|
|
||||||
void Channel::start()
|
void Channel::start()
|
||||||
{
|
{
|
||||||
ch_thread_ = boost::thread(&Channel::run, this);
|
ch_thread_ = std::thread(&Channel::run, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -228,14 +218,14 @@ void Channel::stop()
|
|||||||
{
|
{
|
||||||
stop_ = true;
|
stop_ = true;
|
||||||
channel_internal_queue_.push(0); //message to stop channel
|
channel_internal_queue_.push(0); //message to stop channel
|
||||||
/* When the boost::thread object that represents a thread of execution
|
/* When the std::thread object that represents a thread of execution
|
||||||
* is destroyed the thread becomes detached. Once a thread is detached,
|
* is destroyed the thread becomes detached. Once a thread is detached,
|
||||||
* it will continue executing until the invocation of the function or
|
* it will continue executing until the invocation of the function or
|
||||||
* callable object supplied on construction has completed,
|
* callable object supplied on construction has completed,
|
||||||
* or the program is terminated. In order to wait for a thread of
|
* or the program is terminated. In order to wait for a thread of
|
||||||
* execution to finish, the join() or timed_join() member functions of
|
* execution to finish, the join() member function of
|
||||||
* the boost::thread object must be used. join() will block the calling
|
* the std::thread object must be used. join() will block the calling
|
||||||
* thread until the thread represented by the boost::thread object
|
* thread until the thread represented by the std::thread object
|
||||||
* has completed.
|
* has completed.
|
||||||
*/
|
*/
|
||||||
ch_thread_.join();
|
ch_thread_.join();
|
||||||
|
@ -36,12 +36,11 @@
|
|||||||
#define GNSS_SDR_CHANNEL_H_
|
#define GNSS_SDR_CHANNEL_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <thread>
|
||||||
#include <gnuradio/msg_queue.h>
|
#include <gnuradio/msg_queue.h>
|
||||||
#include "channel_interface.h"
|
#include "channel_interface.h"
|
||||||
#include "channel_fsm.h"
|
#include "channel_fsm.h"
|
||||||
#include "control_message_factory.h"
|
|
||||||
#include "concurrent_queue.h"
|
#include "concurrent_queue.h"
|
||||||
#include "gnss_signal.h"
|
|
||||||
#include "gnss_synchro.h"
|
#include "gnss_synchro.h"
|
||||||
|
|
||||||
|
|
||||||
@ -107,7 +106,7 @@ private:
|
|||||||
ChannelFsm channel_fsm_;
|
ChannelFsm channel_fsm_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
boost::shared_ptr<gr::msg_queue> queue_;
|
||||||
concurrent_queue<int> channel_internal_queue_;
|
concurrent_queue<int> channel_internal_queue_;
|
||||||
boost::thread ch_thread_;
|
std::thread ch_thread_;
|
||||||
void run();
|
void run();
|
||||||
void process_channel_messages();
|
void process_channel_messages();
|
||||||
};
|
};
|
||||||
|
@ -29,11 +29,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "channel_fsm.h"
|
#include "channel_fsm.h"
|
||||||
#include <list>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <boost/statechart/simple_state.hpp>
|
||||||
|
#include <boost/statechart/state.hpp>
|
||||||
|
#include <boost/statechart/transition.hpp>
|
||||||
|
#include <boost/statechart/custom_reaction.hpp>
|
||||||
|
#include <boost/mpl/list.hpp>
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "control_message_factory.h"
|
#include "control_message_factory.h"
|
||||||
#include "channel.h"
|
|
||||||
|
|
||||||
|
|
||||||
struct Ev_channel_start_acquisition: sc::event<Ev_channel_start_acquisition>
|
struct Ev_channel_start_acquisition: sc::event<Ev_channel_start_acquisition>
|
||||||
|
@ -32,17 +32,8 @@
|
|||||||
#ifndef GNSS_SDR_CHANNEL_FSM_H
|
#ifndef GNSS_SDR_CHANNEL_FSM_H
|
||||||
#define GNSS_SDR_CHANNEL_FSM_H
|
#define GNSS_SDR_CHANNEL_FSM_H
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <iostream>
|
|
||||||
#include <queue>
|
|
||||||
#include <boost/statechart/state_machine.hpp>
|
#include <boost/statechart/state_machine.hpp>
|
||||||
#include <boost/statechart/simple_state.hpp>
|
|
||||||
#include <boost/statechart/state.hpp>
|
|
||||||
#include <boost/statechart/transition.hpp>
|
|
||||||
#include <boost/statechart/custom_reaction.hpp>
|
|
||||||
#include <boost/mpl/list.hpp>
|
|
||||||
#include <boost/thread/mutex.hpp>
|
|
||||||
#include <boost/thread/thread.hpp>
|
|
||||||
#include <gnuradio/msg_queue.h>
|
#include <gnuradio/msg_queue.h>
|
||||||
#include "acquisition_interface.h"
|
#include "acquisition_interface.h"
|
||||||
#include "tracking_interface.h"
|
#include "tracking_interface.h"
|
||||||
|
@ -30,14 +30,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "array_signal_conditioner.h"
|
#include "array_signal_conditioner.h"
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/thread/thread.hpp>
|
|
||||||
#include <gnuradio/io_signature.h>
|
|
||||||
#include <gnuradio/message.h>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "gnss_flowgraph.h"
|
|
||||||
|
|
||||||
|
|
||||||
using google::LogMessage;
|
using google::LogMessage;
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/msg_queue.h>
|
#include <gnuradio/msg_queue.h>
|
||||||
#include "gnss_block_interface.h"
|
#include "gnss_block_interface.h"
|
||||||
#include "control_message_factory.h"
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigurationInterface;
|
class ConfigurationInterface;
|
||||||
|
@ -30,14 +30,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "signal_conditioner.h"
|
#include "signal_conditioner.h"
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/thread/thread.hpp>
|
|
||||||
#include <gnuradio/io_signature.h>
|
|
||||||
#include <gnuradio/message.h>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "gnss_flowgraph.h"
|
|
||||||
|
|
||||||
|
|
||||||
using google::LogMessage;
|
using google::LogMessage;
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/msg_queue.h>
|
#include <gnuradio/msg_queue.h>
|
||||||
#include "gnss_block_interface.h"
|
#include "gnss_block_interface.h"
|
||||||
#include "control_message_factory.h"
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigurationInterface;
|
class ConfigurationInterface;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user