mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into tracking_debug
This commit is contained in:
commit
b41369c397
@ -99,15 +99,15 @@ int Gnss_Sdr_Valve::work(int noutput_items,
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
//multichannel support
|
||||
for (int ch = 0; ch < output_items.size(); ch++)
|
||||
// multichannel support
|
||||
for (unsigned int ch = 0; ch < output_items.size(); ch++)
|
||||
{
|
||||
memcpy(output_items[ch], input_items[ch], n * input_signature()->sizeof_stream_item(ch));
|
||||
}
|
||||
d_ncopied_items += 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));
|
||||
}
|
||||
|
@ -218,7 +218,7 @@ void GNSSFlowgraph::connect()
|
||||
// Signal Source (i) > Signal conditioner (i) >
|
||||
#ifndef ENABLE_FPGA
|
||||
int RF_Channels = 0;
|
||||
int signal_conditioner_ID = 0;
|
||||
unsigned int signal_conditioner_ID = 0;
|
||||
for (int i = 0; i < sources_count_; i++)
|
||||
{
|
||||
try
|
||||
|
Loading…
Reference in New Issue
Block a user