forked from sdr/gr-osmosdr
bladerf: Updates for libbladeRF v0.11.0 API changes
This commit is contained in:
parent
748ac00b25
commit
4a0d74f059
|
@ -196,7 +196,7 @@ bool bladerf_sink_c::start()
|
||||||
|
|
||||||
/* Initialize the stream */
|
/* Initialize the stream */
|
||||||
ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
|
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_transfers, this );
|
_samples_per_buffer, _num_transfers, this );
|
||||||
if ( ret != 0 ) {
|
if ( ret != 0 ) {
|
||||||
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
||||||
|
@ -513,8 +513,11 @@ void bladerf_sink_c::set_dc_offset( const std::complex<double> &offset, size_t c
|
||||||
val_i = (offset.real() > 0) ? val_i : -val_i;
|
val_i = (offset.real() > 0) ? val_i : -val_i;
|
||||||
val_q = (offset.imag() > 0) ? val_q : -val_q;
|
val_q = (offset.imag() > 0) ? val_q : -val_q;
|
||||||
|
|
||||||
ret = bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_TX_DC_I, val_i);
|
ret = bladerf_set_correction(_dev.get(), BLADERF_MODULE_TX,
|
||||||
ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_TX_DC_Q, val_q);
|
BLADERF_IQ_CORR_DC_I, val_i);
|
||||||
|
|
||||||
|
ret |= bladerf_set_correction(_dev.get(), BLADERF_MODULE_TX,
|
||||||
|
BLADERF_IQ_CORR_DC_Q, val_q);
|
||||||
|
|
||||||
if( ret ) {
|
if( ret ) {
|
||||||
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
||||||
|
@ -533,8 +536,11 @@ void bladerf_sink_c::set_iq_balance( const std::complex<double> &balance, size_t
|
||||||
//FPGA phase correction steps from -45 to 45 degrees
|
//FPGA phase correction steps from -45 to 45 degrees
|
||||||
val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE);
|
val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE);
|
||||||
|
|
||||||
ret = bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_TX_GAIN, val_gain);
|
ret = bladerf_set_correction(_dev.get(), BLADERF_MODULE_TX,
|
||||||
ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_TX_PHASE, val_phase);
|
BLADERF_IQ_CORR_GAIN, val_gain);
|
||||||
|
|
||||||
|
ret |= bladerf_set_correction(_dev.get(), BLADERF_MODULE_TX,
|
||||||
|
BLADERF_IQ_CORR_PHASE, val_phase);
|
||||||
|
|
||||||
if( ret ) {
|
if( ret ) {
|
||||||
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
||||||
|
|
|
@ -255,7 +255,7 @@ bool bladerf_source_c::start()
|
||||||
/* Initialize the stream */
|
/* Initialize the stream */
|
||||||
_buf_index = 0;
|
_buf_index = 0;
|
||||||
ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
|
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 );
|
_samples_per_buffer, _num_buffers, this );
|
||||||
if ( ret != 0 )
|
if ( ret != 0 )
|
||||||
std::cerr << _pfx << "bladerf_init_stream failed: "
|
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_i = (offset.real() > 0) ? val_i : -val_i;
|
||||||
val_q = (offset.imag() > 0) ? val_q : -val_q;
|
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_MODULE_RX,
|
||||||
ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_DC_Q, val_q);
|
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 ) {
|
if( ret ) {
|
||||||
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
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
|
//FPGA phase correction steps from -45 to 45 degrees
|
||||||
val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE);
|
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_MODULE_RX,
|
||||||
ret |= bladerf_set_correction(_dev.get(), BLADERF_IQ_CORR_RX_PHASE, val_phase);
|
BLADERF_IQ_CORR_GAIN, val_gain);
|
||||||
|
|
||||||
|
ret |= bladerf_set_correction(_dev.get(), BLADERF_MODULE_RX,
|
||||||
|
BLADERF_IQ_CORR_PHASE, val_phase);
|
||||||
|
|
||||||
if( ret ) {
|
if( ret ) {
|
||||||
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
throw std::runtime_error( std::string(__FUNCTION__) + " " +
|
||||||
|
|
|
@ -130,7 +130,7 @@ private: /* functions */
|
||||||
private: /* members */
|
private: /* members */
|
||||||
osmosdr::gain_range_t _lna_range;
|
osmosdr::gain_range_t _lna_range;
|
||||||
|
|
||||||
/* The stream callback converts SC16Q12 samples from the bladeRF to gr_complex
|
/* The stream callback converts SC16Q11 samples from the bladeRF to gr_complex
|
||||||
* values, and adds them to this FIFO. work() fetches the gr_complex values
|
* values, and adds them to this FIFO. work() fetches the gr_complex values
|
||||||
* from this queue */
|
* from this queue */
|
||||||
boost::circular_buffer<gr_complex> *_fifo;
|
boost::circular_buffer<gr_complex> *_fifo;
|
||||||
|
|
Loading…
Reference in New Issue