diff options
author | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
commit | 4378ad458441e1431ea3bdaafd8d663d3061f6f3 (patch) | |
tree | 75dc6a1b06e80c051f39ce101b72c2c10b0e1b54 /host/lib/usrp/dboard/db_tvrx2.cpp | |
parent | f84d7579aecaf2a90965331b200f6b298cd0c1d4 (diff) | |
parent | 81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff) | |
download | uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.gz uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.bz2 uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.zip |
Merge branch 'master' into next
Diffstat (limited to 'host/lib/usrp/dboard/db_tvrx2.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_tvrx2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp index 628221527..0bfa5229a 100644 --- a/host/lib/usrp/dboard/db_tvrx2.cpp +++ b/host/lib/usrp/dboard/db_tvrx2.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010,2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -955,7 +955,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){ // Register properties //////////////////////////////////////////////////////////////////// this->get_rx_subtree()->create<std::string>("name") - .set(get_rx_id().to_pp_string()); + .set("TVRX2"); this->get_rx_subtree()->create<sensor_value_t>("sensors/lo_locked") .publish(boost::bind(&tvrx2::get_locked, this)); this->get_rx_subtree()->create<sensor_value_t>("sensors/rssi") |