Rectifying a great embarassement in UHD. %s/Mhz/MHz.

10 files changed, 20 insertions, 20 deletions

diff --git a/host/examples/rx_samples_to_udp.cpp b/host/examples/rx_samples_to_udp.cpp
index e397dbbf9..a8f0e0c36 100644
--- a/host/examples/rx_samples_to_udp.cpp
+++ b/host/examples/rx_samples_to_udp.cpp
@@ -80,11 +80,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     std::cout << boost::format("Actual RX Rate: %f Msps...") % (usrp->get_rx_rate()/1e6) << std::endl << std::endl;
 
     //set the rx center frequency
-    std::cout << boost::format("Setting RX Freq: %f Mhz...") % (freq/1e6) << std::endl;
+    std::cout << boost::format("Setting RX Freq: %f MHz...") % (freq/1e6) << std::endl;
     uhd::tune_request_t tune_request(freq);
     if(vm.count("int-n")) tune_request.args = uhd::device_addr_t("mode_n=integer");
     usrp->set_rx_freq(tune_request);
-    std::cout << boost::format("Actual RX Freq: %f Mhz...") % (usrp->get_rx_freq()/1e6) << std::endl << std::endl;
+    std::cout << boost::format("Actual RX Freq: %f MHz...") % (usrp->get_rx_freq()/1e6) << std::endl << std::endl;
 
     //set the rx rf gain
     std::cout << boost::format("Setting RX Gain: %f dB...") % gain << std::endl;
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
index 4c52b4506..6560ad8b9 100644
--- a/host/include/uhd/usrp/multi_usrp.hpp
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -282,7 +282,7 @@ public:
     /*!
      * Set the clock configuration for the usrp device.
      * DEPRECATED in favor of set time and clock source calls.
-     * This tells the usrp how to get a 10Mhz reference and PPS clock.
+     * This tells the usrp how to get a 10MHz reference and PPS clock.
      * See the documentation for clock_config_t for more info.
      * \param clock_config the clock configuration to set
      * \param mboard which motherboard to set the config
@@ -315,7 +315,7 @@ public:
 
     /*!
      * Set the clock source for the usrp device.
-     * This sets the source for a 10 Mhz reference clock.
+     * This sets the source for a 10 MHz reference clock.
      * Typical options for source: internal, external, MIMO.
      * \param source a string representing the clock source
      * \param mboard which motherboard to set the config
diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp
index a64110fc7..db7f84932 100644
--- a/host/lib/usrp/dboard/db_cbx.cpp
+++ b/host/lib/usrp/dboard/db_cbx.cpp
@@ -44,7 +44,7 @@ sbx_xcvr::cbx::~cbx(void){
  **********************************************************************/
 double sbx_xcvr::cbx::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
     UHD_LOGV(often) << boost::format(
-        "CBX tune: target frequency %f Mhz"
+        "CBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -223,7 +223,7 @@ double sbx_xcvr::cbx::set_lo_freq(dboard_iface::unit_t unit, double target_freq)
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "%s tune: actual frequency %f Mhz"
+        "%s tune: actual frequency %f MHz"
     ) % board_name.c_str() % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index cf3b29ddc..1342c913d 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -340,7 +340,7 @@ double rfx_xcvr::set_lo_freq(
     double target_freq
 ){
     UHD_LOGV(often) << boost::format(
-        "RFX tune: target frequency %f Mhz"
+        "RFX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     //clip the input
@@ -443,7 +443,7 @@ double rfx_xcvr::set_lo_freq(
     //return the actual frequency
     if (_div2[unit]) actual_freq /= 2;
     UHD_LOGV(often) << boost::format(
-        "RFX tune: actual frequency %f Mhz"
+        "RFX tune: actual frequency %f MHz"
     ) % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_sbx_version3.cpp b/host/lib/usrp/dboard/db_sbx_version3.cpp
index 463de5e15..b848097d1 100644
--- a/host/lib/usrp/dboard/db_sbx_version3.cpp
+++ b/host/lib/usrp/dboard/db_sbx_version3.cpp
@@ -44,7 +44,7 @@ sbx_xcvr::sbx_version3::~sbx_version3(void){
  **********************************************************************/
 double sbx_xcvr::sbx_version3::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
     UHD_LOGV(often) << boost::format(
-        "SBX tune: target frequency %f Mhz"
+        "SBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -144,7 +144,7 @@ double sbx_xcvr::sbx_version3::set_lo_freq(dboard_iface::unit_t unit, double tar
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "SBX tune: actual frequency %f Mhz"
+        "SBX tune: actual frequency %f MHz"
     ) % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_sbx_version4.cpp b/host/lib/usrp/dboard/db_sbx_version4.cpp
index ff4e19163..8f7e747bc 100644
--- a/host/lib/usrp/dboard/db_sbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_sbx_version4.cpp
@@ -45,7 +45,7 @@ sbx_xcvr::sbx_version4::~sbx_version4(void){
  **********************************************************************/
 double sbx_xcvr::sbx_version4::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
     UHD_LOGV(often) << boost::format(
-        "SBX tune: target frequency %f Mhz"
+        "SBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -149,7 +149,7 @@ double sbx_xcvr::sbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "%s tune: actual frequency %f Mhz"
+        "%s tune: actual frequency %f MHz"
     ) % board_name.c_str() % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp
index c5945483d..93047fb7a 100644
--- a/host/lib/usrp/dboard/db_wbx_version2.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version2.cpp
@@ -166,7 +166,7 @@ double wbx_base::wbx_version2::set_lo_freq(dboard_iface::unit_t unit, double tar
     target_freq = wbx_v2_freq_range.clip(target_freq);
 
     UHD_LOGV(often) << boost::format(
-        "WBX tune: target frequency %f Mhz"
+        "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -279,7 +279,7 @@ double wbx_base::wbx_version2::set_lo_freq(dboard_iface::unit_t unit, double tar
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "WBX tune: actual frequency %f Mhz"
+        "WBX tune: actual frequency %f MHz"
     ) % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp
index 80ecb426b..6927ae4e4 100644
--- a/host/lib/usrp/dboard/db_wbx_version3.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version3.cpp
@@ -197,7 +197,7 @@ double wbx_base::wbx_version3::set_lo_freq(dboard_iface::unit_t unit, double tar
     target_freq = wbx_v3_freq_range.clip(target_freq);
 
     UHD_LOGV(often) << boost::format(
-        "WBX tune: target frequency %f Mhz"
+        "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -310,7 +310,7 @@ double wbx_base::wbx_version3::set_lo_freq(dboard_iface::unit_t unit, double tar
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "WBX tune: actual frequency %f Mhz"
+        "WBX tune: actual frequency %f MHz"
     ) % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp
index 80ff3f998..f80aeda77 100644
--- a/host/lib/usrp/dboard/db_wbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp
@@ -205,7 +205,7 @@ double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
     target_freq = wbx_v4_freq_range.clip(target_freq);
 
     UHD_LOGV(often) << boost::format(
-        "WBX tune: target frequency %f Mhz"
+        "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) << std::endl;
 
     /*
@@ -322,7 +322,7 @@ double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
 
     //return the actual frequency
     UHD_LOGV(often) << boost::format(
-        "%s tune: actual frequency %f Mhz"
+        "%s tune: actual frequency %f MHz"
     ) % board_name.c_str() % (actual_freq/1e6) << std::endl;
 
     return actual_freq;
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp
index cfbfe5f20..656cdf45a 100644
--- a/host/utils/uhd_usrp_probe.cpp
+++ b/host/utils/uhd_usrp_probe.cpp
@@ -58,7 +58,7 @@ static std::string get_dsp_pp_string(const std::string &type, property_tree::spt
     ss << boost::format("%s DSP: %s") % type % path.leaf() << std::endl;
     //ss << std::endl;
     meta_range_t freq_range = tree->access<meta_range_t>(path / "freq/range").get();
-    ss << boost::format("Freq range: %.3f to %.3f Mhz") % (freq_range.start()/1e6) % (freq_range.stop()/1e6) << std::endl;;
+    ss << boost::format("Freq range: %.3f to %.3f MHz") % (freq_range.start()/1e6) % (freq_range.stop()/1e6) << std::endl;;
     return ss.str();
 }
 
@@ -80,7 +80,7 @@ static std::string get_frontend_pp_string(const std::string &type, property_tree
     ss << boost::format("Sensors: %s") % prop_names_to_pp_string(tree->list(path / "sensors")) << std::endl;
 
     meta_range_t freq_range = tree->access<meta_range_t>(path / "freq/range").get();
-    ss << boost::format("Freq range: %.3f to %.3f Mhz") % (freq_range.start()/1e6) % (freq_range.stop()/1e6) << std::endl;
+    ss << boost::format("Freq range: %.3f to %.3f MHz") % (freq_range.start()/1e6) % (freq_range.stop()/1e6) << std::endl;
 
     std::vector<std::string> gain_names = tree->list(path / "gains");
     if (gain_names.size() == 0) ss << "Gain Elements: None" << std::endl;