mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-07 10:43:58 +00:00
Code Issues Releases Wiki Activity

Introducing Gnss_Satellite into the receiver

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@130 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez
2012-01-19 07:35:49 +00:00
parent 115b36c722
commit d9aff36247
8 changed files with 112 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/algorithms/channel/adapters/channel.cc
View File

@@ -86,6 +86,7 @@ Channel::Channel(ConfigurationInterface *configuration, unsigned int channel,
connected_ = false;
message_ = 0;
gnss_satellite_ = Gnss_Satellite();
}
@@ -96,6 +97,7 @@ Channel::~Channel()
delete trk_;
delete nav_;
delete pass_through_;
//delete gnss_satellite_;
}
@@ -166,12 +168,12 @@ gr_basic_block_sptr Channel::get_right_block()
void Channel::set_satellite(unsigned int satellite)
void Channel::set_satellite(Gnss_Satellite satellite)
{
satellite_ = satellite;
acq_->set_satellite(satellite);
trk_->set_satellite(satellite);
nav_->set_satellite(satellite);
gnss_satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
acq_->set_satellite(satellite.get_PRN());
trk_->set_satellite(satellite.get_PRN());
nav_->set_satellite(satellite.get_PRN());
}
@@ -236,14 +238,14 @@ void Channel::process_channel_messages()
case 1:
LOG_AT_LEVEL(INFO) << "Channel " << channel_
<< " ACQ SUCCESS satellite " << satellite_;
<< " ACQ SUCCESS satellite " << gnss_satellite_;
channel_fsm_.Event_gps_valid_acquisition();
break;
case 2:
LOG_AT_LEVEL(INFO) << "Channel " << channel_
<< " ACQ FAILED satellite " << satellite_;
<< " ACQ FAILED satellite " << gnss_satellite_;
if (repeat_ == true)
{
channel_fsm_.Event_gps_failed_acquisition_repeat();
@@ -256,7 +258,7 @@ void Channel::process_channel_messages()
case 3:
LOG_AT_LEVEL(INFO) << "Channel " << channel_
<< " TRACKING FAILED satellite " << satellite_
<< " TRACKING FAILED satellite " << gnss_satellite_
<< ", reacquisition.";
channel_fsm_.Event_gps_failed_tracking();
break;

7
src/algorithms/channel/adapters/channel.h
View File

@@ -42,6 +42,7 @@
#include "control_message_factory.h"
#include "concurrent_queue.h"
class ConfigurationInterface;
class AcquisitionInterface;
class TrackingInterface;
@@ -77,7 +78,7 @@ public:
size_t item_size(){ return 0; }
unsigned int satellite(){ return satellite_; }
Gnss_Satellite satellite() const { return gnss_satellite_; }
AcquisitionInterface* acquisition(){ return acq_; }
@@ -86,7 +87,7 @@ public:
TelemetryDecoderInterface* telemetry(){ return nav_; }
void start_acquisition();
void set_satellite(unsigned int satellite);
void set_satellite(Gnss_Satellite satellite);
void start();
/*!
@@ -106,7 +107,7 @@ private:
std::string implementation_;
unsigned int channel_;
unsigned int satellite_;
Gnss_Satellite gnss_satellite_;
bool connected_;
bool stop_;
int message_;