Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

Conflicts:
	host/examples/CMakeLists.txt

1 files changed, 3 insertions, 1 deletions

diff --git a/host/examples/tx_from_file.cpp b/host/examples/tx_from_file.cpp
index df6446c0c..9611cf47c 100644
--- a/host/examples/tx_from_file.cpp
+++ b/host/examples/tx_from_file.cpp
@@ -36,6 +36,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     size_t samps_per_packet;
     double tx_rate, freq;
     float ampl;
+    float tx_gain;
 
     //setup the program options
     po::options_description desc("Allowed options");
@@ -47,6 +48,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         ("txrate", po::value<double>(&tx_rate)->default_value(100e6/16), "rate of outgoing samples")
         ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
         ("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of each sample")
+        ("gain", po::value<float>(&tx_gain)->default_value(float(0)), "amplitude of each sample")
         ("dilv", "specify to disable inner-loop verbose")
     ;
     po::variables_map vm;
@@ -76,7 +78,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     sdev->set_tx_freq(freq);
     sdev->set_time_now(uhd::time_spec_t(0.0));
 
-    sdev->set_tx_gain(0);
+    sdev->set_tx_gain(tx_gain);
 
     //allocate data to send
     std::vector<std::complex<short> > buff;