argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

hackrf: use new sample rate function introduced in libhackrf b892bc34ad

Browse Source
standalone
Dimitri Stolnikov 10 years ago
parent 7b18254262
commit ef37d1caae
2 changed files with 8 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      lib/hackrf/hackrf_sink_c.cc
  2. 9
      lib/hackrf/hackrf_source_c.cc

9
lib/hackrf/hackrf_sink_c.cc
Unescape View File

@ -492,13 +492,12 @@ double hackrf_sink_c::set_sample_rate( double rate )
int ret;
if (_dev) {
//ret = hackrf_sample_rate_set( _dev, uint32_t(rate) );
ret = hackrf_set_fracrate( _dev, float(rate/1e6) );
ret = hackrf_set_sample_rate( _dev, rate );
if ( HACKRF_SUCCESS == ret ) {
_sample_rate = rate;
set_bandwidth( rate );
} else {
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_fracrate", rate ) )
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_sample_rate", rate ) )
}
}
@ -702,11 +701,11 @@ double hackrf_sink_c::set_bandwidth( double bandwidth, size_t chan )
if ( _dev ) {
/* compute best default value depending on sample rate (auto filter) */
uint32_t bw = hackrf_compute_baseband_filter_bw( uint32_t(bandwidth) );
ret = hackrf_baseband_filter_bandwidth_set( _dev, bw );
ret = hackrf_set_baseband_filter_bandwidth( _dev, bw );
if ( HACKRF_SUCCESS == ret ) {
_bandwidth = bw;
} else {
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_baseband_filter_bandwidth_set", bw ) )
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_baseband_filter_bandwidth", bw ) )
}
}

9
lib/hackrf/hackrf_source_c.cc
Unescape View File

@ -384,13 +384,12 @@ double hackrf_source_c::set_sample_rate( double rate )
int ret;
if (_dev) {
//ret = hackrf_sample_rate_set( _dev, uint32_t(rate) );
ret = hackrf_set_fracrate( _dev, float(rate/1e6) );
ret = hackrf_set_sample_rate( _dev, rate );
if ( HACKRF_SUCCESS == ret ) {
_sample_rate = rate;
set_bandwidth( rate );
} else {
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_fracrate", rate ) )
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_sample_rate", rate ) )
}
}
@ -621,11 +620,11 @@ double hackrf_source_c::set_bandwidth( double bandwidth, size_t chan )
if ( _dev ) {
/* compute best default value depending on sample rate (auto filter) */
uint32_t bw = hackrf_compute_baseband_filter_bw( uint32_t(bandwidth) );
ret = hackrf_baseband_filter_bandwidth_set( _dev, bw );
ret = hackrf_set_baseband_filter_bandwidth( _dev, bw );
if ( HACKRF_SUCCESS == ret ) {
_bandwidth = bw;
} else {
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_baseband_filter_bandwidth_set", bw ) )
HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_baseband_filter_bandwidth", bw ) )
}
}

Write Preview
Loading…
Cancel
Save