From d8ad6e8e04226d9edf0a7d6d06955ed5db68dfab Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 10 Mar 2012 11:09:10 -0800 Subject: fcd: moved items to current layout standard * Public header files moved from lib/ to include/fcd * Contents of apps/ moved to examples/ to get into gnuradio/examples, apps for programs to be installed into $PREFIX/bin --- gr-fcd/include/fcd/Makefile.am | 24 +++++++ gr-fcd/include/fcd/fcd_source_c.h | 136 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 gr-fcd/include/fcd/Makefile.am create mode 100644 gr-fcd/include/fcd/fcd_source_c.h (limited to 'gr-fcd/include/fcd') diff --git a/gr-fcd/include/fcd/Makefile.am b/gr-fcd/include/fcd/Makefile.am new file mode 100644 index 000000000..e66a56113 --- /dev/null +++ b/gr-fcd/include/fcd/Makefile.am @@ -0,0 +1,24 @@ +# +# Copyright 2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +grinclude_HEADERS = fcd_source_c.h diff --git a/gr-fcd/include/fcd/fcd_source_c.h b/gr-fcd/include/fcd/fcd_source_c.h new file mode 100644 index 000000000..9a0c69403 --- /dev/null +++ b/gr-fcd/include/fcd/fcd_source_c.h @@ -0,0 +1,136 @@ +/* -*- c++ -*- */ +/* + * Copyright 2011 Free Software Foundation, Inc. + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_FCD_SOURCE_C_H +#define INCLUDED_FCD_SOURCE_C_H + +#include +#include + +class fcd_source_c; + + +typedef boost::shared_ptr fcd_source_c_sptr; + + +/*! + * \brief Return a shared_ptr to a new instance of fcd_source_c. + * + * This is effectively the public constructor. To avoid accidental use + * of raw pointers, fcd_source_c's constructor is private. + * fcd_make_source_c is the public interface for creating new instances. + */ +fcd_source_c_sptr fcd_make_source_c(const std::string device_name = ""); + +/*! \brief Funcube Dongle source block. + * + * This class provides a Funcube Dongle soure block by wrapping the + * USB audio interface and the USB HID control interface of the Funcube + * Dongle into one convenient source block. + * + * The Funcube Dongle needs to have firmware 18f or later for the control + * interface to work properly. As of early 2011, FCDs still come with firmware + * 18b. You can use qthid 2.2 (not 3) to upgrade the firmware: http://qthid.sf.net + */ +class fcd_source_c : public gr_hier_block2 +{ + +public: + fcd_source_c(const std::string device_name = ""); // FIXME: should be private + ~fcd_source_c(); + + /*! \brief Set frequency with Hz resolution. + * \param freq The frequency in Hz + * + * Set the frequency of the Funcube Dongle with 1 Hz resolution applying + * the frequency correction set by set_freq_corr(). + * + * \see set_freq_khz() + */ + void set_freq(int freq); + + /*! \brief Set frequency with Hz resolution. + * \param freq The frequency in Hz + * + * This is a convenience function that uses float parameter in order to allow + * using engineering notation in GRC. + * + * \see set_freq_khz() + */ + void set_freq(float freq); + + /*! \brief Set frequency with kHz resolution. + * \param freq The frequency in kHz + * + * Sets the frequency of the Funcube Dongle with 1 kHz resolution + * applying the frequency correction set by set_freq_corr(). + * + * \see set_freq() + */ + void set_freq_khz(int freq); + + /*! \brief Set LNA gain. + * \param gain The new gain in dB. + * + * Set the LNA gain in the FCD. Valid range is -5 to 30. Although + * the LNA gain in the FCD takes enumerated values corresponding to + * 2.5 dB steps, you can can call this method with any float value + * and it will be rounded to the nearest valid value. + * + * By default the FCD is set to 20 dB and this is a good value for most + * cases. In noisy areas you may try to reduce the gain. + */ + void set_lna_gain(float gain); + + /*! \brief Set new frequency correction. + * \param ppm The new frequency correction in parts per million + * + * Version 1.1 FCDs (S/N 810 or later) need a correction of -12 ppm. + * Earlier FCDs need roughly -120 ppm (default for gr-fcd). + * + * Ref: http://www.funcubedongle.com/?p=617 + */ + void set_freq_corr(int ppm); + + /*! \brief Set DC offset correction. + * \param _dci DC correction for I component (-1.0 to 1.0) + * \param _dcq DC correction for Q component (-1.0 to 1.0) + * + * Set DC offset correction in the device. Default is 0.0. + */ + void set_dc_corr(double _dci, double _dcq); + + /*! \brief Set IQ phase and gain balance. + * \param _gain The gain correction (-1.0 to 1.0) + * \param _phase The phase correction (-1.0 to 1.0) + * + * Set IQ phase and gain balance in the device. The default values + * are 0.0 for phase and 1.0 for gain. + */ + void set_iq_corr(double _gain, double _phase); + +private: + + audio_source::sptr fcd; /*!< The audio input source */ + int d_freq_corr; /*!< The frequency correction in ppm */ + int d_freq_req; /*!< The latest requested frequency in Hz */ +}; + +#endif /* INCLUDED_FCD_SOURCE_C_H */ -- cgit From 72576bd2d87b83ccc1661b695278e0dee8fe21a4 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 11 Mar 2012 15:18:15 -0700 Subject: fcd: cmake build work in progress --- gr-fcd/include/fcd/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 gr-fcd/include/fcd/CMakeLists.txt (limited to 'gr-fcd/include/fcd') diff --git a/gr-fcd/include/fcd/CMakeLists.txt b/gr-fcd/include/fcd/CMakeLists.txt new file mode 100644 index 000000000..bd3a73511 --- /dev/null +++ b/gr-fcd/include/fcd/CMakeLists.txt @@ -0,0 +1,27 @@ +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +# Install header files +######################################################################## +install(FILES + fcd_source_c.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio + COMPONENT "fcd_devel" +) -- cgit From 9ef789c8cca6b3439ecce5fc7aa71d3b073acfd7 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 12 Mar 2012 09:26:38 -0700 Subject: fcd: added FCD_API to code --- gr-fcd/include/fcd/CMakeLists.txt | 1 + gr-fcd/include/fcd/fcd_api.h | 33 +++++++++++++++++++++++++++++++++ gr-fcd/include/fcd/fcd_source_c.h | 9 ++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 gr-fcd/include/fcd/fcd_api.h (limited to 'gr-fcd/include/fcd') diff --git a/gr-fcd/include/fcd/CMakeLists.txt b/gr-fcd/include/fcd/CMakeLists.txt index bd3a73511..3ca70c2a1 100644 --- a/gr-fcd/include/fcd/CMakeLists.txt +++ b/gr-fcd/include/fcd/CMakeLists.txt @@ -21,6 +21,7 @@ # Install header files ######################################################################## install(FILES + fcd_api.h fcd_source_c.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "fcd_devel" diff --git a/gr-fcd/include/fcd/fcd_api.h b/gr-fcd/include/fcd/fcd_api.h new file mode 100644 index 000000000..d6d1bd31f --- /dev/null +++ b/gr-fcd/include/fcd/fcd_api.h @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_FCD_API_H +#define INCLUDED_FCD_API_H + +#include + +#ifdef gnuradio_pager_EXPORTS +# define FCD_API __GR_ATTR_EXPORT +#else +# define FCD_API __GR_ATTR_IMPORT +#endif + +#endif /* INCLUDED_FCD_API_H */ diff --git a/gr-fcd/include/fcd/fcd_source_c.h b/gr-fcd/include/fcd/fcd_source_c.h index 9a0c69403..1649d0862 100644 --- a/gr-fcd/include/fcd/fcd_source_c.h +++ b/gr-fcd/include/fcd/fcd_source_c.h @@ -21,6 +21,7 @@ #ifndef INCLUDED_FCD_SOURCE_C_H #define INCLUDED_FCD_SOURCE_C_H +#include #include #include @@ -37,7 +38,7 @@ typedef boost::shared_ptr fcd_source_c_sptr; * of raw pointers, fcd_source_c's constructor is private. * fcd_make_source_c is the public interface for creating new instances. */ -fcd_source_c_sptr fcd_make_source_c(const std::string device_name = ""); +FCD_API fcd_source_c_sptr fcd_make_source_c(const std::string device_name = ""); /*! \brief Funcube Dongle source block. * @@ -49,11 +50,10 @@ fcd_source_c_sptr fcd_make_source_c(const std::string device_name = ""); * interface to work properly. As of early 2011, FCDs still come with firmware * 18b. You can use qthid 2.2 (not 3) to upgrade the firmware: http://qthid.sf.net */ -class fcd_source_c : public gr_hier_block2 +class FCD_API fcd_source_c : public gr_hier_block2 { public: - fcd_source_c(const std::string device_name = ""); // FIXME: should be private ~fcd_source_c(); /*! \brief Set frequency with Hz resolution. @@ -127,6 +127,9 @@ public: void set_iq_corr(double _gain, double _phase); private: + fcd_source_c(const std::string device_name = ""); + friend FCD_API fcd_source_c_sptr + fcd_make_source_c(const std::string device_name); audio_source::sptr fcd; /*!< The audio input source */ int d_freq_corr; /*!< The frequency correction in ppm */ -- cgit From e383cfe2674fa6682a1392af8d9b9f090af1aec5 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 13 Mar 2012 17:05:13 -0700 Subject: fcd: fixes for distcheck --- gr-fcd/include/fcd/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gr-fcd/include/fcd') diff --git a/gr-fcd/include/fcd/Makefile.am b/gr-fcd/include/fcd/Makefile.am index e66a56113..282fd93f7 100644 --- a/gr-fcd/include/fcd/Makefile.am +++ b/gr-fcd/include/fcd/Makefile.am @@ -21,4 +21,6 @@ include $(top_srcdir)/Makefile.common -grinclude_HEADERS = fcd_source_c.h +grinclude_HEADERS = \ + fcd_api.h \ + fcd_source_c.h -- cgit From 81fba6490c6471e1db3bcc85d16ff2242f68fb43 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 22 Mar 2012 13:35:20 -0700 Subject: Implement conditionalized build for WIN32 --- gr-fcd/include/fcd/fcd_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-fcd/include/fcd') diff --git a/gr-fcd/include/fcd/fcd_api.h b/gr-fcd/include/fcd/fcd_api.h index d6d1bd31f..e1452b8af 100644 --- a/gr-fcd/include/fcd/fcd_api.h +++ b/gr-fcd/include/fcd/fcd_api.h @@ -24,7 +24,7 @@ #include -#ifdef gnuradio_pager_EXPORTS +#ifdef gnuradio_fcd_EXPORTS # define FCD_API __GR_ATTR_EXPORT #else # define FCD_API __GR_ATTR_IMPORT -- cgit