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

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

Browse Source
This commit is contained in:
Javier
2019-06-18 10:13:59 +02:00
parent bb8e7bc3a2 3bc8091745
commit b41369c397
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/signal_source/libs/gnss_sdr_valve.cc
View File

@@ -99,15 +99,15 @@ int Gnss_Sdr_Valve::work(int noutput_items,
{ {
return 0; return 0;
} }
//multichannel support // multichannel support
for (int ch = 0; ch < output_items.size(); ch++) for (unsigned int ch = 0; ch < output_items.size(); ch++)
{ {
memcpy(output_items[ch], input_items[ch], n * input_signature()->sizeof_stream_item(ch)); memcpy(output_items[ch], input_items[ch], n * input_signature()->sizeof_stream_item(ch));
} }
d_ncopied_items += n; d_ncopied_items += n;
return n; return n;
} }
for (int ch = 0; ch < output_items.size(); ch++) for (unsigned int ch = 0; ch < output_items.size(); ch++)
{ {
memcpy(output_items[ch], input_items[ch], noutput_items * input_signature()->sizeof_stream_item(ch)); memcpy(output_items[ch], input_items[ch], noutput_items * input_signature()->sizeof_stream_item(ch));
} }

2
src/core/receiver/gnss_flowgraph.cc
View File

@@ -218,7 +218,7 @@ void GNSSFlowgraph::connect()
// Signal Source (i) > Signal conditioner (i) > // Signal Source (i) > Signal conditioner (i) >
#ifndef ENABLE_FPGA #ifndef ENABLE_FPGA
int RF_Channels = 0; int RF_Channels = 0;
int signal_conditioner_ID = 0; unsigned int signal_conditioner_ID = 0;
for (int i = 0; i < sources_count_; i++) for (int i = 0; i < sources_count_; i++)
{ {
try try