diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-20 16:18:53 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-20 16:18:53 -0700 |
| commit | 72f4ce79c88d03b33d585a2ea48076e2010a21a8 (patch) | |
| tree | 43a074f5ae25eef5dd7a9e098b6250162e31202a /host | |
| parent | cf5a45b140163ae330f0017a85c0a9fd9a29cc0c (diff) | |
| parent | 698cfaef0c6dda64aa23793e5f32d3084c003ea5 (diff) | |
| download | uhd-72f4ce79c88d03b33d585a2ea48076e2010a21a8.tar.gz uhd-72f4ce79c88d03b33d585a2ea48076e2010a21a8.tar.bz2 uhd-72f4ce79c88d03b33d585a2ea48076e2010a21a8.zip | |
Merge branch 'win' of git@ettus.sourcerepo.com:ettus/uhdpriv into work
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 591e958cb..e9acddee6 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -300,11 +300,10 @@ float usrp2_dboard_iface::read_aux_adc(unit_t unit, int which){ unit_to_spi_adc[unit], config, ad7922_regs.get_reg(), 16, false /*no rb*/ ); - boost::uint16_t reg = _iface->transact_spi( + ad7922_regs.set_reg(boost::uint16_t(_iface->transact_spi( unit_to_spi_adc[unit], config, ad7922_regs.get_reg(), 16, true /*rb*/ - ); - ad7922_regs.set_reg(reg); + ))); //convert to voltage and return return float(3.3*ad7922_regs.result/4095); |