diff options
| author | Josh Morman <jmorman@gnuradio.org> | 2021-10-27 13:41:36 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-10-28 13:17:06 -0400 |
| commit | bcba1acbee1e5b6ded326b4962c1eb5dcf040e28 (patch) | |
| tree | 8f1981792bc66038cac3a95949f5daff64760403 | |
| parent | 6af36c3c20b82efcf0bd0fe80f3f03de9752d0c0 (diff) | |
iio: make fmcomms freq parameter double
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
| -rw-r--r-- | gr-iio/include/gnuradio/iio/fmcomms2_sink.h | 2 | ||||
| -rw-r--r-- | gr-iio/include/gnuradio/iio/fmcomms2_source.h | 2 | ||||
| -rw-r--r-- | gr-iio/lib/fmcomms2_sink_impl.cc | 5 | ||||
| -rw-r--r-- | gr-iio/lib/fmcomms2_sink_impl.h | 2 | ||||
| -rw-r--r-- | gr-iio/lib/fmcomms2_source_impl.cc | 5 | ||||
| -rw-r--r-- | gr-iio/lib/fmcomms2_source_impl.h | 2 | ||||
| -rw-r--r-- | gr-iio/python/iio/bindings/fmcomms2_sink_python.cc | 2 | ||||
| -rw-r--r-- | gr-iio/python/iio/bindings/fmcomms2_source_python.cc | 2 |
8 files changed, 12 insertions, 10 deletions
diff --git a/gr-iio/include/gnuradio/iio/fmcomms2_sink.h b/gr-iio/include/gnuradio/iio/fmcomms2_sink.h index 9bf86cfddc..2830bbda20 100644 --- a/gr-iio/include/gnuradio/iio/fmcomms2_sink.h +++ b/gr-iio/include/gnuradio/iio/fmcomms2_sink.h @@ -55,7 +55,7 @@ public: virtual void set_bandwidth(unsigned long bandwidth) = 0; virtual void set_rf_port_select(const std::string& rf_port_select) = 0; - virtual void set_frequency(unsigned long long frequency) = 0; + virtual void set_frequency(double frequency) = 0; virtual void set_samplerate(unsigned long samplerate) = 0; virtual void set_attenuation(size_t chan, double gain) = 0; virtual void set_filter_params(const std::string& filter_source, diff --git a/gr-iio/include/gnuradio/iio/fmcomms2_source.h b/gr-iio/include/gnuradio/iio/fmcomms2_source.h index 9be4186bf1..3978eb2df4 100644 --- a/gr-iio/include/gnuradio/iio/fmcomms2_source.h +++ b/gr-iio/include/gnuradio/iio/fmcomms2_source.h @@ -44,7 +44,7 @@ public: */ virtual void set_len_tag_key(const std::string& len_tag_key = "packet_len") = 0; - virtual void set_frequency(unsigned long long frequency) = 0; + virtual void set_frequency(double frequency) = 0; virtual void set_samplerate(unsigned long samplerate) = 0; virtual void set_gain_mode(size_t chan, const std::string& mode) = 0; virtual void set_gain(size_t chan, double gain) = 0; diff --git a/gr-iio/lib/fmcomms2_sink_impl.cc b/gr-iio/lib/fmcomms2_sink_impl.cc index ee72aca655..21d22c655d 100644 --- a/gr-iio/lib/fmcomms2_sink_impl.cc +++ b/gr-iio/lib/fmcomms2_sink_impl.cc @@ -194,10 +194,11 @@ void fmcomms2_sink_impl<T>::set_rf_port_select(const std::string& rf_port_select } template <typename T> -void fmcomms2_sink_impl<T>::set_frequency(unsigned long long frequency) +void fmcomms2_sink_impl<T>::set_frequency(double frequency) { iio_param_vec_t params; - params.emplace_back("out_altvoltage1_TX_LO_frequency", frequency); + params.emplace_back("out_altvoltage1_TX_LO_frequency", + static_cast<unsigned long long>(frequency)); device_source_impl::set_params(this->phy, params); d_frequency = frequency; } diff --git a/gr-iio/lib/fmcomms2_sink_impl.h b/gr-iio/lib/fmcomms2_sink_impl.h index c900bdf3c8..7bb8f80229 100644 --- a/gr-iio/lib/fmcomms2_sink_impl.h +++ b/gr-iio/lib/fmcomms2_sink_impl.h @@ -60,7 +60,7 @@ public: virtual void set_len_tag_key(const std::string& len_tag_key); virtual void set_bandwidth(unsigned long bandwidth); virtual void set_rf_port_select(const std::string& rf_port_select); - virtual void set_frequency(unsigned long long frequency); + virtual void set_frequency(double frequency); virtual void set_samplerate(unsigned long samplerate); virtual void set_attenuation(size_t chan, double gain); virtual void set_filter_params(const std::string& filter_source, diff --git a/gr-iio/lib/fmcomms2_source_impl.cc b/gr-iio/lib/fmcomms2_source_impl.cc index b3c7d39f91..532689fcf6 100644 --- a/gr-iio/lib/fmcomms2_source_impl.cc +++ b/gr-iio/lib/fmcomms2_source_impl.cc @@ -302,10 +302,11 @@ void fmcomms2_source_impl<T>::set_len_tag_key(const std::string& len_tag_key) } template <typename T> -void fmcomms2_source_impl<T>::set_frequency(unsigned long long frequency) +void fmcomms2_source_impl<T>::set_frequency(double frequency) { iio_param_vec_t params; - params.emplace_back("out_altvoltage0_RX_LO_frequency", frequency); + params.emplace_back("out_altvoltage0_RX_LO_frequency", + static_cast<unsigned long long>(frequency)); device_source_impl::set_params(params); } diff --git a/gr-iio/lib/fmcomms2_source_impl.h b/gr-iio/lib/fmcomms2_source_impl.h index 1fa848eba4..2c8b9d31ab 100644 --- a/gr-iio/lib/fmcomms2_source_impl.h +++ b/gr-iio/lib/fmcomms2_source_impl.h @@ -51,7 +51,7 @@ public: ~fmcomms2_source_impl(); virtual void set_len_tag_key(const std::string& len_tag_key); - virtual void set_frequency(unsigned long long frequency); + virtual void set_frequency(double frequency); virtual void set_samplerate(unsigned long samplerate); virtual void set_gain_mode(size_t chan, const std::string& mode); virtual void set_gain(size_t chan, double gain_value); diff --git a/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc b/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc index c6c879f3ca..c3a06f0285 100644 --- a/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc +++ b/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(fmcomms2_sink.h) */ -/* BINDTOOL_HEADER_FILE_HASH(0cc01ab33946f58b5c4056a61d6043c4) */ +/* BINDTOOL_HEADER_FILE_HASH(4091be0f4f1dfd199a2c384dbb344a79) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-iio/python/iio/bindings/fmcomms2_source_python.cc b/gr-iio/python/iio/bindings/fmcomms2_source_python.cc index a69a1424e1..ce51e558ea 100644 --- a/gr-iio/python/iio/bindings/fmcomms2_source_python.cc +++ b/gr-iio/python/iio/bindings/fmcomms2_source_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(fmcomms2_source.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c286f60f1afed36dfc335cf4ce1b949e) */ +/* BINDTOOL_HEADER_FILE_HASH(fa03b55be5aef63e677fb47024d3ad6e) */ /***********************************************************************************/ #include <pybind11/complex.h> |