diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-06-09 09:03:54 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-06-09 09:03:54 +0200 |
| commit | ed627cea9c47da34c32ec40fe45212c4012c5292 (patch) | |
| tree | 1e5bfda2fa794b706aa30efec5da8de3cba94de6 /lib | |
| parent | f70550fe40c464348725d49f90efbdb9e743eae3 (diff) | |
hackrf: use new sample rate function introduced in libhackrf b892bc34ad
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hackrf/hackrf_sink_c.cc | 9 | ||||
| -rw-r--r-- | lib/hackrf/hackrf_source_c.cc | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc index d9865a2..6d3ec82 100644 --- a/lib/hackrf/hackrf_sink_c.cc +++ b/lib/hackrf/hackrf_sink_c.cc @@ -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 ) ) } } diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index fd4ee76..03058cc 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -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 ) ) } } |