diff options
| author | Jon Szymaniak <jon.szymaniak@gmail.com> | 2014-01-11 23:49:43 -0500 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2014-01-13 17:31:07 +0100 |
| commit | 4a0d74f059727268de262746d224ee301f66ecf4 (patch) | |
| tree | ee3ea01aafd8afd209fd13a3bb7f60daa6d9777a /lib/bladerf/bladerf_source_c.cc | |
| parent | 748ac00b257044646a8bdaf090b61d0ff760582f (diff) | |
bladerf: Updates for libbladeRF v0.11.0 API changes
Diffstat (limited to 'lib/bladerf/bladerf_source_c.cc')
| -rw-r--r-- | lib/bladerf/bladerf_source_c.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc index 89680b5..e5d2167 100644 --- a/lib/bladerf/bladerf_source_c.cc +++ b/lib/bladerf/bladerf_source_c.cc @@ -255,7 +255,7 @@ bool bladerf_source_c::start() /* Initialize the stream */ _buf_index = 0; ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback, - &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q12, + &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q11, _samples_per_buffer, _num_buffers, this ); if ( ret != 0 ) std::cerr << _pfx << "bladerf_init_stream failed: " @@ -570,8 +570,11 @@ void bladerf_source_c::set_dc_offset( const std::complex<double> &offset, size_t val_i = (offset.real() > 0) ? val_i : -val_i; val_q = (offset.imag() > 0) ? val_q : -val_q; - ret = bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_DC_I, val_i); - ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_DC_Q, val_q); + ret = bladerf_set_correction(_dev.get(), BLADERF_MODULE_RX, + BLADERF_IQ_CORR_DC_I, val_i); + + ret |= bladerf_set_correction(_dev.get(), BLADERF_MODULE_RX, + BLADERF_IQ_CORR_DC_Q, val_q); if( ret ) { throw std::runtime_error( std::string(__FUNCTION__) + " " + @@ -603,8 +606,11 @@ void bladerf_source_c::set_iq_balance( const std::complex<double> &balance, size //FPGA phase correction steps from -45 to 45 degrees val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE); - ret = bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_GAIN, val_gain); - ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_PHASE, val_phase); + ret = bladerf_set_correction(_dev.get(), BLADERF_MODULE_RX, + BLADERF_IQ_CORR_GAIN, val_gain); + + ret |= bladerf_set_correction(_dev.get(), BLADERF_MODULE_RX, + BLADERF_IQ_CORR_PHASE, val_phase); if( ret ) { throw std::runtime_error( std::string(__FUNCTION__) + " " + |