From a0c50c2df121741fc460856ac72b5790b013a3c0 Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Tue, 30 Apr 2013 21:44:31 +0200 Subject: [PATCH] source/sink: rename antennas to express their function --- lib/fcd/fcd_source.cc | 2 +- lib/file/file_source_c.cc | 8 ++------ lib/hackrf/hackrf_sink_c.cc | 2 +- lib/hackrf/hackrf_source_c.cc | 2 +- lib/miri/miri_source_c.cc | 2 +- lib/osmosdr/osmosdr_src_c.cc | 2 +- lib/rtl/rtl_source_c.cc | 2 +- lib/rtl_tcp/rtl_tcp_source_c.cc | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/fcd/fcd_source.cc b/lib/fcd/fcd_source.cc index 785a67f..e75616b 100644 --- a/lib/fcd/fcd_source.cc +++ b/lib/fcd/fcd_source.cc @@ -241,5 +241,5 @@ std::string fcd_source::set_antenna( const std::string & antenna, size_t chan ) std::string fcd_source::get_antenna( size_t chan ) { - return "ANT"; + return "RX"; } diff --git a/lib/file/file_source_c.cc b/lib/file/file_source_c.cc index 72bee04..0ee151d 100644 --- a/lib/file/file_source_c.cc +++ b/lib/file/file_source_c.cc @@ -200,11 +200,7 @@ double file_source_c::get_gain( const std::string & name, size_t chan ) std::vector< std::string > file_source_c::get_antennas( size_t chan ) { - std::vector< std::string > antennas; - - antennas += get_antenna(chan); - - return antennas; + return std::vector< std::string >(); } std::string file_source_c::set_antenna( const std::string & antenna, size_t chan ) @@ -214,5 +210,5 @@ std::string file_source_c::set_antenna( const std::string & antenna, size_t chan std::string file_source_c::get_antenna( size_t chan ) { - return "ANT"; + return ""; } diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc index 470509b..c5d4572 100644 --- a/lib/hackrf/hackrf_sink_c.cc +++ b/lib/hackrf/hackrf_sink_c.cc @@ -665,7 +665,7 @@ std::string hackrf_sink_c::set_antenna( const std::string & antenna, size_t chan std::string hackrf_sink_c::get_antenna( size_t chan ) { - return "ANT"; + return "TX/RX"; } double hackrf_sink_c::set_bandwidth( double bandwidth, size_t chan ) diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index 76eb5fd..677bf36 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -643,7 +643,7 @@ std::string hackrf_source_c::set_antenna( const std::string & antenna, size_t ch std::string hackrf_source_c::get_antenna( size_t chan ) { - return "ANT"; + return "TX/RX"; } double hackrf_source_c::set_bandwidth( double bandwidth, size_t chan ) diff --git a/lib/miri/miri_source_c.cc b/lib/miri/miri_source_c.cc index 29e01ee..e36328e 100644 --- a/lib/miri/miri_source_c.cc +++ b/lib/miri/miri_source_c.cc @@ -448,5 +448,5 @@ std::string miri_source_c::set_antenna( const std::string & antenna, size_t chan std::string miri_source_c::get_antenna( size_t chan ) { - return "ANT"; + return "RX"; } diff --git a/lib/osmosdr/osmosdr_src_c.cc b/lib/osmosdr/osmosdr_src_c.cc index f053589..261f06d 100644 --- a/lib/osmosdr/osmosdr_src_c.cc +++ b/lib/osmosdr/osmosdr_src_c.cc @@ -543,5 +543,5 @@ std::string osmosdr_src_c::set_antenna( const std::string & antenna, size_t chan std::string osmosdr_src_c::get_antenna( size_t chan ) { - return "ANT"; + return "RX"; } diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index 9f8e5a4..b78f5f8 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -682,5 +682,5 @@ std::string rtl_source_c::set_antenna( const std::string & antenna, size_t chan std::string rtl_source_c::get_antenna( size_t chan ) { - return "ANT"; + return "RX"; } diff --git a/lib/rtl_tcp/rtl_tcp_source_c.cc b/lib/rtl_tcp/rtl_tcp_source_c.cc index dcedda7..8caf6f0 100644 --- a/lib/rtl_tcp/rtl_tcp_source_c.cc +++ b/lib/rtl_tcp/rtl_tcp_source_c.cc @@ -461,5 +461,5 @@ std::string rtl_tcp_source_c::set_antenna( const std::string & antenna, size_t c std::string rtl_tcp_source_c::get_antenna( size_t chan ) { - return "ANT"; + return "RX"; }