mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-07 09:04:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into glonass

Browse Source
This commit is contained in:
Carles Fernandez 2018-01-24 00:52:51 +01:00
commit 0545905fef
5 changed files with 377 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/signal_source/adapters/gn3s_signal_source.h
View File

@ -29,8 +29,8 @@
*/ */
#ifndef GN3S_SIGNAL_SOURCE_H_ #ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
#define GN3S_SIGNAL_SOURCE_H_ #define GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
#include <string> #include <string>
#include <gnuradio/hier_block2.h> #include <gnuradio/hier_block2.h>
@ -90,4 +90,4 @@ private:
boost::shared_ptr<gr::msg_queue> queue_; boost::shared_ptr<gr::msg_queue> queue_;
}; };
#endif /*GN3S_SIGNAL_SOURCE_H_*/ #endif /*GNSS_SDR_GN3S_SIGNAL_SOURCE_H_*/

9
src/algorithms/signal_source/adapters/labsat_signal_source.cc
View File

@ -29,9 +29,6 @@
*/ */
#include "labsat_signal_source.h" #include "labsat_signal_source.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
#include <gflags/gflags.h>
#include <glog/logging.h> #include <glog/logging.h>
#include "labsat23_source.h" #include "labsat23_source.h"
#include "configuration_interface.h" #include "configuration_interface.h"
@ -61,10 +58,10 @@ LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration,
labsat23_source_ = labsat23_make_source(filename_.c_str(),channel_selector); labsat23_source_ = labsat23_make_source(filename_.c_str(),channel_selector);
DLOG(INFO) << "Item size " << item_size_; DLOG(INFO) << "Item size " << item_size_;
DLOG(INFO) << "labsat23_source_(" << labsat23_source_->unique_id() << ")"; DLOG(INFO) << "labsat23_source_(" << labsat23_source_->unique_id() << ")";
}else }
else
{ {
LOG(WARNING) << item_type_ LOG(WARNING) << item_type_ << " unrecognized item type for LabSat source";
<< " unrecognized item type for LabSat source";
item_size_ = sizeof(short); item_size_ = sizeof(short);
} }
if (dump_) if (dump_)

10
src/algorithms/signal_source/adapters/labsat_signal_source.h
View File

@ -29,8 +29,8 @@
*/ */
#ifndef LABSAT_SIGNAL_SOURCE_H_ #ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
#define LABSAT_SIGNAL_SOURCE_H_ #define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
#include <string> #include <string>
#include <gnuradio/hier_block2.h> #include <gnuradio/hier_block2.h>
@ -42,7 +42,7 @@
class ConfigurationInterface; class ConfigurationInterface;
/*! /*!
* \brief This class reads samples from a GN3S USB dongle, a RF front-end signal sampler * \brief This class reads samples stored by a LabSat 2 or LabSat 3 device
*/ */
class LabsatSignalSource: public GNSSBlockInterface class LabsatSignalSource: public GNSSBlockInterface
{ {
@ -59,7 +59,7 @@ public:
} }
/*! /*!
* \brief Returns "LabsatSignalSource". * \brief Returns "Labsat_Signal_Source".
*/ */
inline std::string implementation() override inline std::string implementation() override
{ {
@ -91,4 +91,4 @@ private:
boost::shared_ptr<gr::msg_queue> queue_; boost::shared_ptr<gr::msg_queue> queue_;
}; };
#endif /*LABSAT_SIGNAL_SOURCE_H_*/ #endif /*GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_*/

93
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
View File

@ -36,19 +36,21 @@
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <sstream> #include <sstream>
labsat23_source_sptr labsat23_make_source(const char *signal_file_basename, int channel_selector) labsat23_source_sptr labsat23_make_source(const char *signal_file_basename, int channel_selector)
{ {
return labsat23_source_sptr(new labsat23_source(signal_file_basename, channel_selector)); return labsat23_source_sptr(new labsat23_source(signal_file_basename, channel_selector));
} }
std::string labsat23_source::generate_filename() std::string labsat23_source::generate_filename()
{ {
std::ostringstream ss; std::ostringstream ss;
ss << std::setw(4) << std::setfill('0') << d_current_file_number; ss << std::setw(4) << std::setfill('0') << d_current_file_number;
return d_signal_file_basename + "_" + ss.str()+".LS3"; return d_signal_file_basename + "_" + ss.str()+".LS3";
} }
labsat23_source::labsat23_source(const char *signal_file_basename, int channel_selector) : gr::block("labsat23_source", labsat23_source::labsat23_source(const char *signal_file_basename, int channel_selector) : gr::block("labsat23_source",
gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0),
gr::io_signature::make(1, 1, sizeof(gr_complex))) gr::io_signature::make(1, 1, sizeof(gr_complex)))
@ -63,6 +65,8 @@ labsat23_source::labsat23_source(const char *signal_file_basename, int channel_s
d_bits_per_sample = 0; d_bits_per_sample = 0;
d_current_file_number = 0; d_current_file_number = 0;
d_labsat_version = 0; d_labsat_version = 0;
d_ref_clock = 0;
d_channel_selector = 0;
d_signal_file_basename = std::string(signal_file_basename); d_signal_file_basename = std::string(signal_file_basename);
std::string signal_file; std::string signal_file;
@ -73,12 +77,13 @@ labsat23_source::labsat23_source(const char *signal_file_basename, int channel_s
if (binary_input_file->is_open()) if (binary_input_file->is_open())
{ {
std::cout << "Labsat file source is reading samples from " << signal_file << std::endl; std::cout << "Labsat file source is reading samples from " << signal_file << std::endl;
}else{ }
else
{
std::cout << "Labsat file " << signal_file << " could not be opened!" << std::endl; std::cout << "Labsat file " << signal_file << " could not be opened!" << std::endl;
delete binary_input_file; delete binary_input_file;
exit(1); exit(1);
} }
} }
@ -91,11 +96,13 @@ labsat23_source::~labsat23_source()
delete binary_input_file; delete binary_input_file;
} }
int labsat23_source::getBit(uint8_t byte, int position) int labsat23_source::getBit(uint8_t byte, int position)
{ {
return (byte >> position) & 0x01; return (byte >> position) & 0x01;
} }
void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex* out, int type) void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex* out, int type)
{ {
std::bitset<16> bs(input_short); std::bitset<16> bs(input_short);
@ -127,7 +134,8 @@ void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex
out[i] += gr_complex(-2,0); out[i] += gr_complex(-2,0);
} }
} }
else{ else
{
if (bs[13-4*i]) //01 if (bs[13-4*i]) //01
{ {
out[i] += gr_complex(1,0); out[i] += gr_complex(1,0);
@ -146,7 +154,8 @@ void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex
out[i] += gr_complex(0,-2); out[i] += gr_complex(0,-2);
} }
} }
else{ else
{
if (bs[12-4*i]) //01 if (bs[12-4*i]) //01
{ {
out[i] += gr_complex(0,1); out[i] += gr_complex(0,1);
@ -158,17 +167,16 @@ void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex
} }
} }
int labsat23_source::general_work(int noutput_items, int labsat23_source::general_work(int noutput_items,
__attribute__((unused)) gr_vector_int &ninput_items, __attribute__((unused)) gr_vector_int &ninput_items,
__attribute__((unused)) gr_vector_const_void_star &input_items, __attribute__((unused)) gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items) gr_vector_void_star &output_items)
{ {
gr_complex *out = reinterpret_cast<gr_complex *>(output_items[0]); gr_complex *out = reinterpret_cast<gr_complex *>(output_items[0]);
if (d_header_parsed == false) if (d_header_parsed == false)
{ {
if (binary_input_file->eof() == false) if (binary_input_file->eof() == false)
{ {
char memblock[1024]; char memblock[1024];
@ -190,7 +198,6 @@ int labsat23_source::general_work(int noutput_items,
return -1; return -1;
} }
// check Labsat version // check Labsat version
if (memblock[byte_counter] == 0x4C and memblock[byte_counter+1] == 0x53 and memblock[byte_counter+2] == 0x32) if (memblock[byte_counter] == 0x4C and memblock[byte_counter+1] == 0x53 and memblock[byte_counter+2] == 0x32)
{ {
@ -210,10 +217,9 @@ int labsat23_source::general_work(int noutput_items,
return -1; return -1;
} }
byte_counter += 3; byte_counter += 3;
int sub_version=(int)memblock[byte_counter]; int sub_version = static_cast<int>(memblock[byte_counter]);
std::cout << "Labsat file sub version " << sub_version << std::endl; std::cout << "Labsat file sub version " << sub_version << std::endl;
@ -227,7 +233,7 @@ int labsat23_source::general_work(int noutput_items,
// read first section // read first section
// section ID (little-endian) // section ID (little-endian)
uint8_t section_id=(int)memblock[byte_counter]+(int)memblock[byte_counter+1]*256; uint8_t section_id = static_cast<int>(memblock[byte_counter]) + static_cast<int>(memblock[byte_counter+1]) * 256;
//std::cout << "Section ID: " << (int)section_id << std::endl; //std::cout << "Section ID: " << (int)section_id << std::endl;
byte_counter += 2; byte_counter += 2;
@ -238,7 +244,7 @@ int labsat23_source::general_work(int noutput_items,
byte_counter += 4; byte_counter += 4;
if (section_id == 2) if (section_id == 2)
{ {
d_ref_clock=(uint8_t)memblock[byte_counter]; d_ref_clock = static_cast<uint8_t>(memblock[byte_counter]);
switch(d_ref_clock) switch(d_ref_clock)
{ {
case 0: case 0:
@ -254,10 +260,10 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat reference clock: external 16.386 MHz" << std::endl; std::cout << "Labsat reference clock: external 16.386 MHz" << std::endl;
break; break;
default: default:
std::cout<<"Labsat Unknown reference clock ID "<<(int)d_ref_clock<<std::endl; std::cout << "Labsat Unknown reference clock ID " << static_cast<int>(d_ref_clock) << std::endl;
} }
byte_counter++; byte_counter++;
d_bits_per_sample=(uint8_t)memblock[byte_counter]; d_bits_per_sample = static_cast<uint8_t>(memblock[byte_counter]);
switch(d_bits_per_sample) switch(d_bits_per_sample)
{ {
case 2: case 2:
@ -267,12 +273,12 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat is using 4 bits per sample" << std::endl; std::cout << "Labsat is using 4 bits per sample" << std::endl;
break; break;
default: default:
std::cout<<"Labsat Unknown bits per sample ID "<<(int)d_bits_per_sample<<std::endl; std::cout << "Labsat Unknown bits per sample ID " << static_cast<int>(d_bits_per_sample) << std::endl;
return -1; return -1;
} }
byte_counter++; byte_counter++;
d_channel_selector=(uint8_t)memblock[byte_counter]; d_channel_selector = static_cast<uint8_t>(memblock[byte_counter]);
switch(d_channel_selector) switch(d_channel_selector)
{ {
case 0: case 0:
@ -291,7 +297,7 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Available channels: Channel B, 2 bit quantisation" << std::endl; std::cout << "Available channels: Channel B, 2 bit quantisation" << std::endl;
break; break;
default: default:
std::cout<<"Unknown channel selection ID "<<(int)d_channel_selector<<std::endl; std::cout << "Unknown channel selection ID " << static_cast<int>(d_channel_selector) << std::endl;
return -1; return -1;
} }
@ -309,7 +315,7 @@ int labsat23_source::general_work(int noutput_items,
return -1; return -1;
} }
byte_counter++; byte_counter++;
uint8_t quantization=(uint8_t)memblock[byte_counter]; uint8_t quantization = static_cast<uint8_t>(memblock[byte_counter]);
switch(quantization) switch(quantization)
{ {
case 1: case 1:
@ -319,10 +325,10 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "2 bit per sample" << std::endl; std::cout << "2 bit per sample" << std::endl;
break; break;
default: default:
std::cout<<"Unknown quantization ID "<<(int)quantization<<std::endl; std::cout << "Unknown quantization ID " << static_cast<int>(quantization) << std::endl;
} }
byte_counter++; byte_counter++;
uint8_t channel_a_constellation=(uint8_t)memblock[byte_counter]; uint8_t channel_a_constellation = static_cast<uint8_t>(memblock[byte_counter]);
switch(channel_a_constellation) switch(channel_a_constellation)
{ {
case 0: case 0:
@ -335,10 +341,10 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat Channel A is BDS" << std::endl; std::cout << "Labsat Channel A is BDS" << std::endl;
break; break;
default: default:
std::cout<<"Unknown channel A constellation ID "<<(int)channel_a_constellation<<std::endl; std::cout << "Unknown channel A constellation ID " << static_cast<int>(channel_a_constellation) << std::endl;
} }
byte_counter++; byte_counter++;
uint8_t channel_b_constellation=(uint8_t)memblock[byte_counter]; uint8_t channel_b_constellation = static_cast<uint8_t>(memblock[byte_counter]);
switch(channel_b_constellation) switch(channel_b_constellation)
{ {
case 0: case 0:
@ -351,7 +357,7 @@ int labsat23_source::general_work(int noutput_items,
std::cout << "Labsat Channel B is BDS" << std::endl; std::cout << "Labsat Channel B is BDS" << std::endl;
break; break;
default: default:
std::cout<<"Unknown channel B constellation ID "<<(int)channel_b_constellation<<std::endl; std::cout << "Unknown channel B constellation ID " << static_cast<int>(channel_b_constellation) << std::endl;
} }
//end of header //end of header
@ -360,16 +366,21 @@ int labsat23_source::general_work(int noutput_items,
binary_input_file->clear(); binary_input_file->clear();
binary_input_file->seekg(header_bytes, binary_input_file->beg); binary_input_file->seekg(header_bytes, binary_input_file->beg);
return 0; return 0;
}else{ }
else
{
std::cout << "Labsat file header error: section 2 is not available." << std::endl; std::cout << "Labsat file header error: section 2 is not available." << std::endl;
return -1; return -1;
} }
}
}else{ else
{
std::cout << "Labsat file read error: file is empty." << std::endl; std::cout << "Labsat file read error: file is empty." << std::endl;
return -1; return -1;
} }
}else{ }
else
{
//ready to start reading samples //ready to start reading samples
switch(d_bits_per_sample) switch(d_bits_per_sample)
{ {
@ -386,7 +397,7 @@ int labsat23_source::general_work(int noutput_items,
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
int16_t memblock[n_int16_to_read]; int16_t memblock[n_int16_to_read];
binary_input_file->read((char*)memblock,n_int16_to_read*2); binary_input_file->read(reinterpret_cast<char*>(memblock), n_int16_to_read * 2);
n_int16_to_read = binary_input_file->gcount() / 2; //from bytes to int16 n_int16_to_read = binary_input_file->gcount() / 2; //from bytes to int16
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
@ -397,7 +408,9 @@ int labsat23_source::general_work(int noutput_items,
output_pointer += 8; output_pointer += 8;
} }
return output_pointer; return output_pointer;
}else{ }
else
{
//trigger the read of the next file in the sequence //trigger the read of the next file in the sequence
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl; std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl;
@ -407,12 +420,16 @@ int labsat23_source::general_work(int noutput_items,
if (binary_input_file->is_open()) if (binary_input_file->is_open())
{ {
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}else{ }
else
{
std::cout << "Last file reached, LabSat source stop" << std::endl; std::cout << "Last file reached, LabSat source stop" << std::endl;
return -1; return -1;
} }
} }
}else{ }
else
{
return 0; return 0;
} }
}; };
@ -431,7 +448,7 @@ int labsat23_source::general_work(int noutput_items,
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
int16_t memblock[n_int16_to_read]; int16_t memblock[n_int16_to_read];
binary_input_file->read((char*)memblock,n_int16_to_read*2); binary_input_file->read(reinterpret_cast<char*>(memblock), n_int16_to_read * 2);
n_int16_to_read = binary_input_file->gcount() / 2; //from bytes to int16 n_int16_to_read = binary_input_file->gcount() / 2; //from bytes to int16
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
@ -442,7 +459,9 @@ int labsat23_source::general_work(int noutput_items,
output_pointer += 4; output_pointer += 4;
} }
return output_pointer; return output_pointer;
}else{ }
else
{
//trigger the read of the next file in the sequence //trigger the read of the next file in the sequence
std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl; std::cout << "End of current file, reading the next Labsat file in sequence: " << generate_filename() << std::endl;
@ -452,12 +471,16 @@ int labsat23_source::general_work(int noutput_items,
if (binary_input_file->is_open()) if (binary_input_file->is_open())
{ {
std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl;
}else{ }
else
{
std::cout << "Last file reached, LabSat source stop" << std::endl; std::cout << "Last file reached, LabSat source stop" << std::endl;
return -1; return -1;
} }
} }
}else{ }
else
{
return 0; return 0;
} }
} }

4
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
View File

@ -28,8 +28,8 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef LABSAT23_SOURCE_H #ifndef GNSS_SDR_LABSAT23_SOURCE_H
#define LABSAT23_SOURCE_H #define GNSS_SDR_LABSAT23_SOURCE_H
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <string> #include <string>