diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-02 16:58:45 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-02 16:58:45 -0700 |
| commit | d66766f86ae19c9e20f89ec4f60e81d88983f9c7 (patch) | |
| tree | b8f9f079ca4b94e8a8e6741627360379e01fe3ef | |
| parent | 4c6394f1dc4529f84febb3c02e2db9319c061003 (diff) | |
| parent | cbf580374dbc131febdd7f65efc65879ee3842ac (diff) | |
| download | uhd-d66766f86ae19c9e20f89ec4f60e81d88983f9c7.tar.gz uhd-d66766f86ae19c9e20f89ec4f60e81d88983f9c7.tar.bz2 uhd-d66766f86ae19c9e20f89ec4f60e81d88983f9c7.zip | |
Merge branch 'rfx_rssi'
| -rw-r--r-- | host/docs/dboards.rst | 1 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_rfx.cpp | 35 |
2 files changed, 30 insertions, 6 deletions
diff --git a/host/docs/dboards.rst b/host/docs/dboards.rst index d9f8069ad..42965b32f 100644 --- a/host/docs/dboards.rst +++ b/host/docs/dboards.rst @@ -130,6 +130,7 @@ Bandwidths (Hz): Sensors: * **lo_locked**: boolean for LO lock state +* **rssi**: float for rssi in dBm ^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCVR 2450 diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp index 725b5cc03..231757365 100644 --- a/host/lib/usrp/dboard/db_rfx.cpp +++ b/host/lib/usrp/dboard/db_rfx.cpp @@ -121,6 +121,22 @@ private: bool get_locked(dboard_iface::unit_t unit){ return (this->get_iface()->read_gpio(unit) & LOCKDET_MASK) != 0; } + + /*! + * Read the RSSI from the aux adc + * \return the rssi in dB + */ + double get_rssi(void){ + //RSSI from VAGC vs RF Power, Fig 34, pg 13 + double max_power = -3.0; + + //constants for the rssi calculation + static const double min_v = 0.35, max_v = 1.0; + static const double rssi_dyn_range = 60; + //calculate the rssi from the voltage + double voltage = this->get_iface()->read_aux_adc(dboard_iface::UNIT_RX, dboard_iface::AUX_ADC_B); + return max_power - rssi_dyn_range*(voltage - min_v)/(max_v - min_v); + } }; /*********************************************************************** @@ -454,12 +470,19 @@ void rfx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_SENSOR: - UHD_ASSERT_THROW(key.name == "lo_locked"); - val = sensor_value_t("LO", this->get_locked(dboard_iface::UNIT_RX), "locked", "unlocked"); - return; - - case SUBDEV_PROP_SENSOR_NAMES: - val = prop_names_t(1, "lo_locked"); + if (key.name == "lo_locked") + val = sensor_value_t("LO", this->get_locked(dboard_iface::UNIT_RX), "locked", "unlocked"); + else if ((key.name == "rssi") and (get_rx_id() != 0x0024)) + val = sensor_value_t("RSSI", this->get_rssi(), "dBm"); + else + UHD_THROW_INVALID_CODE_PATH(); + return; + + case SUBDEV_PROP_SENSOR_NAMES:{ + prop_names_t names = list_of("lo_locked"); + if (get_rx_id() != 0x0024) names.push_back("rssi"); + val = names; + } return; case SUBDEV_PROP_BANDWIDTH: |