mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Fix message typos, improve messages, clean code

Browse Source
This commit is contained in:
Carles Fernandez 2019-05-12 10:59:11 +02:00
parent f959428321
commit da5e21a5b1
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 128 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,6 +198,8 @@ void labsat23_source::decode_samples_one_channel(int16_t input_short, gr_complex
//out[i] += gr_complex(0.5, 0.5); //out[i] += gr_complex(0.5, 0.5);
} }
break; break;
default:
break;
} }
} }
@ -225,7 +227,6 @@ int labsat23_source::general_work(int noutput_items,
{ {
preamble_ok = false; preamble_ok = false;
} }
//std::cout << "H[" << i << "]:" << (int)memblock[byte_counter] << std::endl;
byte_counter++; byte_counter++;
} }
@ -266,17 +267,14 @@ int labsat23_source::general_work(int noutput_items,
header_bytes += memblock[byte_counter] | (memblock[byte_counter + 1] << 8) | (memblock[byte_counter + 2] << 16) | (memblock[byte_counter + 3] << 24); header_bytes += memblock[byte_counter] | (memblock[byte_counter + 1] << 8) | (memblock[byte_counter + 2] << 16) | (memblock[byte_counter + 3] << 24);
byte_counter += 4; byte_counter += 4;
//std::cout << "header_bytes=" << header_bytes << std::endl;
// read first section // read first section
// section ID (little-endian) // section ID (little-endian)
uint8_t section_id = static_cast<int>(memblock[byte_counter]) + static_cast<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;
byte_counter += 2; byte_counter += 2;
//uint8_t section_lenght_bytes = 0; //uint8_t section_lenght_bytes = 0;
//section_lenght_bytes += memblock[byte_counter] | (memblock[byte_counter + 1] << 8) | (memblock[byte_counter + 2] << 16) | (memblock[byte_counter + 3] << 24); //section_lenght_bytes += memblock[byte_counter] | (memblock[byte_counter + 1] << 8) | (memblock[byte_counter + 2] << 16) | (memblock[byte_counter + 3] << 24);
//std::cout << "section_lenght_bytes=" << (int)section_lenght_bytes << std::endl;
byte_counter += 4; byte_counter += 4;
if (section_id == 2) if (section_id == 2)
@ -285,10 +283,10 @@ int labsat23_source::general_work(int noutput_items,
switch (d_ref_clock) switch (d_ref_clock)
{ {
case 0: case 0:
std::cout << "Labsat reference clock: internal OXCO" << std::endl; std::cout << "Labsat reference clock: internal OCXO" << std::endl;
break; break;
case 1: case 1:
std::cout << "Labsat reference clock: internal TXCO" << std::endl; std::cout << "Labsat reference clock: internal TCXO" << std::endl;
break; break;
case 2: case 2:
std::cout << "Labsat reference clock: external 10 MHz" << std::endl; std::cout << "Labsat reference clock: external 10 MHz" << std::endl;
@ -319,19 +317,19 @@ int labsat23_source::general_work(int noutput_items,
switch (d_channel_selector) switch (d_channel_selector)
{ {
case 0: case 0:
std::cout << "Available channels: Channel A + B, 1 bit quantisation" << std::endl; std::cout << "Available channels: Channel A + B, 1 bit quantisation (I & Q)" << std::endl;
break; break;
case 1: case 1:
std::cout << "Available channels: Channel A, 1 bit quantisation" << std::endl; std::cout << "Available channels: Channel A, 1 bit quantisation (I & Q)" << std::endl;
break; break;
case 2: case 2:
std::cout << "Available channels: Channel B, 1 bit quantisation" << std::endl; std::cout << "Available channels: Channel B, 1 bit quantisation (I & Q)" << std::endl;
break; break;
case 3: case 3:
std::cout << "Available channels: Channel A, 2 bit quantisation" << std::endl; std::cout << "Available channels: Channel A, 2 bit quantisation (I & Q)" << std::endl;
break; break;
case 4: case 4:
std::cout << "Available channels: Channel B, 2 bit quantisation" << std::endl; std::cout << "Available channels: Channel B, 2 bit quantisation (I & Q)" << std::endl;
break; break;
default: default:
std::cout << "Unknown channel selection ID " << static_cast<int>(d_channel_selector) << std::endl; std::cout << "Unknown channel selection ID " << static_cast<int>(d_channel_selector) << std::endl;
@ -420,7 +418,6 @@ int labsat23_source::general_work(int noutput_items,
switch (d_bits_per_sample) switch (d_bits_per_sample)
{ {
case 2: case 2:
{
switch (d_channel_selector) switch (d_channel_selector)
{ {
case 0: case 0:
@ -479,11 +476,9 @@ int labsat23_source::general_work(int noutput_items,
{ {
return 0; return 0;
} }
};
break;
} }
break;
case 4: case 4:
{
switch (d_channel_selector) switch (d_channel_selector)
{ {
case 0: case 0:
@ -497,7 +492,7 @@ int labsat23_source::general_work(int noutput_items,
{ {
int16_t memblock[n_int16_to_read]; int16_t memblock[n_int16_to_read];
binary_input_file->read(reinterpret_cast<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)
{ {
int output_pointer = 0; int output_pointer = 0;
@ -544,12 +539,9 @@ int labsat23_source::general_work(int noutput_items,
} }
} }
break; break;
}
default: default:
{
return -1; return -1;
} }
}
std::cout << "Warning!!" << std::endl; std::cout << "Warning!!" << std::endl;
return 0; return 0;