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

uhd: catch exceptions from dc offset & iq imbalance setters 

since dc offset / iq imbalance is not implemented for recent USRPs this
might cause undesired behavior in GRC. As a workaround we do not pass
them to the caller but print them to the stderr.
This commit is contained in:
Dimitri Stolnikov 2014-05-03 18:15:22 +02:00
parent 376884f6a0
commit e6701ca621
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/uhd/uhd_sink_c.cc
View File

@ -387,12 +387,20 @@ std::string uhd_sink_c::get_antenna( size_t chan )
void uhd_sink_c::set_dc_offset( const std::complex<double> &offset, size_t chan )
{
_snk->set_dc_offset( offset, chan );
try {
_snk->set_dc_offset( offset, chan );
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
void uhd_sink_c::set_iq_balance( const std::complex<double> &balance, size_t chan )
{
_snk->set_iq_balance( balance, chan );
try {
_snk->set_iq_balance( balance, chan );
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
double uhd_sink_c::set_bandwidth( double bandwidth, size_t chan )

46
lib/uhd/uhd_source_c.cc
View File

@ -385,35 +385,51 @@ std::string uhd_source_c::get_antenna( size_t chan )
void uhd_source_c::set_dc_offset_mode( int mode, size_t chan )
{
if ( osmosdr_source_c::DCOffsetOff == mode ) {
_src->set_auto_dc_offset( false, chan );
_src->set_dc_offset( std::complex<double>(0.0, 0.0), chan ); /* uhd default */
} else if ( osmosdr_source_c::DCOffsetManual == mode ) {
_src->set_auto_dc_offset( false, chan );
} else if ( osmosdr_source_c::DCOffsetAutomatic == mode ) {
_src->set_auto_dc_offset( true, chan );
try {
if ( osmosdr_source_c::DCOffsetOff == mode ) {
_src->set_auto_dc_offset( false, chan );
_src->set_dc_offset( std::complex<double>(0.0, 0.0), chan ); /* uhd default */
} else if ( osmosdr_source_c::DCOffsetManual == mode ) {
_src->set_auto_dc_offset( false, chan );
} else if ( osmosdr_source_c::DCOffsetAutomatic == mode ) {
_src->set_auto_dc_offset( true, chan );
}
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
void uhd_source_c::set_dc_offset( const std::complex<double> &offset, size_t chan )
{
_src->set_dc_offset( offset, chan );
try {
_src->set_dc_offset( offset, chan );
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
void uhd_source_c::set_iq_balance_mode( int mode, size_t chan )
{
if ( osmosdr_source_c::IQBalanceOff == mode ) {
_src->set_iq_balance( std::complex<double>(0.0, 0.0), chan ); /* uhd default */
} else if ( osmosdr_source_c::IQBalanceManual == mode ) {
/* nothing to do */
} else if ( osmosdr_source_c::IQBalanceAutomatic == mode ) {
throw std::runtime_error("Automatic IQ imbalance correction not implemented");
try {
if ( osmosdr_source_c::IQBalanceOff == mode ) {
_src->set_iq_balance( std::complex<double>(0.0, 0.0), chan ); /* uhd default */
} else if ( osmosdr_source_c::IQBalanceManual == mode ) {
/* nothing to do */
} else if ( osmosdr_source_c::IQBalanceAutomatic == mode ) {
throw std::runtime_error("Automatic IQ imbalance correction not implemented");
}
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
void uhd_source_c::set_iq_balance( const std::complex<double> &balance, size_t chan )
{
_src->set_iq_balance( balance, chan );
try {
_src->set_iq_balance( balance, chan );
} catch ( const std::exception &ex ) {
std::cerr << __FUNCTION__ << ": " << ex.what() << std::endl;
}
}
double uhd_source_c::set_bandwidth( double bandwidth, size_t chan )