diff options
| -rw-r--r-- | host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.cpp | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp index 455027f3c..5e7ab9199 100644 --- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp +++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp @@ -37,7 +37,7 @@ namespace { const double EISCAT_TICK_RATE = 208e6; // Hz const double EISCAT_RADIO_RATE = 104e6; // Hz - const double EISCAT_CENTER_FREQ = 104e6; // Hz + const double EISCAT_CENTER_FREQ = 208e6; // Hz const double EISCAT_DEFAULT_NULL_GAIN = 0.0; // dB. This is not the digital antenna gain, this a fake stub value. const double EISCAT_DEFAULT_BANDWIDTH = 52e6; // Hz const char* EISCAT_DEFAULT_ANTENNA = "BF"; @@ -205,8 +205,8 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(eiscat_radio_ctrl) ; _tree->create<double>(fe_path / fe_idx / "freq" / "value") .set(EISCAT_CENTER_FREQ) - //.set_coercer(boost::bind(&eiscat_radio_ctrl_impl::set_rx_frequency, this, _1, 0)) - ////.set_publisher(boost::bind(&radio_ctrl_impl::get_rx_frequency, this, 0)) + .set_coercer(boost::bind(&eiscat_radio_ctrl_impl::set_rx_frequency, this, _1, 0)) + .set_publisher(boost::bind(&radio_ctrl_impl::get_rx_frequency, this, 0)) ; _tree->create<meta_range_t>(fe_path / fe_idx / "freq" / "range") .set(meta_range_t(EISCAT_CENTER_FREQ, EISCAT_CENTER_FREQ)) diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index 8ae7d79d7..23a90976c 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -25,6 +25,7 @@ #include <uhd/transport/udp_zero_copy.hpp> #include <uhd/utils/static.hpp> #include <uhd/utils/tasks.hpp> +#include <uhd/types/sensors.hpp> #include <boost/algorithm/string.hpp> #include <boost/asio.hpp> #include <boost/make_shared.hpp> @@ -93,6 +94,21 @@ namespace { ); }) ; + tree->create<sensor_value_t>( + mb_path / "sensors/ref_locked") + .set_publisher([](){ + return sensor_value_t ( + "Ref", true, "locked", "unlocked" // FIXME: Remove hardcoded "true" + ); + }) + ; + tree->create<int>( + mb_path / "rx_codecs" / "A" / "gains") + .set_publisher([](){ + return 1 // FIXME: Remove hardcoding + ; + }) + ; } } |