From e821790d16c21259681895a236d37693ff3a7c84 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Tue, 13 Mar 2012 09:49:20 -0700
Subject: fcd: update text files and copyright
---
gr-fcd/AUTHORS | 8 +-
gr-fcd/INSTALL | 365 -----------------------------------------------
gr-fcd/NEWS | 32 -----
gr-fcd/README | 38 -----
gr-fcd/README.hacking | 74 ----------
gr-fcd/lib/fcd/COPYRIGHT | 23 +++
gr-fcd/lib/hid/COPYRIGHT | 25 ++++
7 files changed, 53 insertions(+), 512 deletions(-)
delete mode 100644 gr-fcd/INSTALL
delete mode 100644 gr-fcd/NEWS
delete mode 100644 gr-fcd/README
delete mode 100644 gr-fcd/README.hacking
create mode 100644 gr-fcd/lib/fcd/COPYRIGHT
create mode 100644 gr-fcd/lib/hid/COPYRIGHT
diff --git a/gr-fcd/AUTHORS b/gr-fcd/AUTHORS
index 7eb39f14d..6673ab17d 100644
--- a/gr-fcd/AUTHORS
+++ b/gr-fcd/AUTHORS
@@ -1,7 +1,9 @@
+This component was originally authored by:
+
Alexandryu Csete <oz9aec@gmail.com>
-This package includes the hidapi by signal11:
+For convenience, it also includes the hidapi by signal11:
http://www.signal11.us/oss/hidapi/
-as well as the FCD API code from Qthid by Howard Long, Alexandru Csete
-and Mario Lorenz: http://qthid.sf.net/
+as well as the FCD API code from Qthid by Howard Long,
+Alexandru Csete and Mario Lorenz: http://qthid.sf.net/
diff --git a/gr-fcd/INSTALL b/gr-fcd/INSTALL
deleted file mode 100644
index 7d1c323be..000000000
--- a/gr-fcd/INSTALL
+++ /dev/null
@@ -1,365 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below. The lack of an optional feature in a given package is not
-necessarily a bug. More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
- this time using the binaries in their final installed location.
- This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
- root privileges, verifies that the installation completed
- correctly.
-
- 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 7. Often, you can also type `make uninstall' to remove the installed
- files again. In practice, not all packages have tested that
- uninstallation works correctly, even though it is required by the
- GNU Coding Standards.
-
- 8. Some packages, particularly those that use Automake, provide `make
- distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS
- KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/gr-fcd/NEWS b/gr-fcd/NEWS
deleted file mode 100644
index effde13fc..000000000
--- a/gr-fcd/NEWS
+++ /dev/null
@@ -1,32 +0,0 @@
-Alexandru Csete (22):
- Bump version number.
- Small typo fix.
- Implemented FCD_CMD_APP_SET_FREQ_HZ in FCD API and switched to use that one in gr-fcd API.
- In python ww only need set_freq with float parameter.
- Fix DC and IQ correction methods.
- Add frequency and LNA gain controls to FFT application.
- Remove debug output.
- Correct order of parameters for IQ balance.
- Fix parameter names in doxygen doc.
- No need for iostream.
- NOAA APT receiver example (not tested).
- Include NFM GRC example in distribution.
- Merge branch 'master' of github.com:csete/gr-fcd
- Default value for DC offset is 0.0
- Set RF gain from slider value.
- Fix noinst_HEADERS.
- Merge pull request #1 from jrcutler/master
- Require GNU Radio 3.5
- Merge pull request #3 from jrcutler/master
- Check for GR version 3.5 or later.
- Rename hidwin.cpp to hidwin.c to stay consistent with upstream codebase.
- Update to hidapi 0.7.0
-
-Justin R. Cutler (3):
- Moved initial set_freq() call after initializing settings.
- Adding throttle tag to GRC block to prevent grc warnings.
- Implemented an implicit re-tune upon modification of the frequency correction value (via a shadow variable for last requested frequency). Fixes #2.
-
-Michael Zappe (1):
- Improved build on OSX and Windows.
-
diff --git a/gr-fcd/README b/gr-fcd/README
deleted file mode 100644
index a0ac2c566..000000000
--- a/gr-fcd/README
+++ /dev/null
@@ -1,38 +0,0 @@
-This package (and the resulting tarball) contains a GNU Radio block
-for the Funcube Dongle. The Funcube Dongle is a software defined radio
-receiver in a USB stick covering 64 MHz - 1.7 GHz. More info about the
-Funcube Dongle is avaialble at http://www.funcubedongle.com/
-
-The Funcube Dongle provides I/Q data via USB audio and its control
-interface (frequency, gains, filters) uses the USB HID api. This block
-wraps both the audio input and the control interface into one convenient
-GNU Radio source block with a complex data stream output that can be used
-in GNU Radio application written in C++, Python and the GNU Radio Companion.
-
-This package requires that gnuradio-core and gnuradio-audio 3.5 is already
-installed. It also depends on some GNU Radio prerequisites, such as Boost.
-On Linux you will also need libusb-1.0 for the HID control interface.
-
-To build the gnuradio-fcd library and the included examples use the normal
-recipe:
-
- $ ./configure
- $ make
- $ sudo make install
-
-If you're building from git, you'll need to use this sequence, since
-git doesn't contain configure or the generated Makefiles.
-
- $ ./bootstrap
- $ ./configure
- $ make
- $ sudo make install
-
-The configure script has many options for fine tuning the build and the
-installation. Use the --help option to get a list.
-
-This package includes the hidapi: http://www.signal11.us/oss/hidapi/
-and the FCD API code from Qthid: http://qthid.sf.net/
-
-This package was created by Alexandru Csete OZ9AEC, and it is based on the
-gr-howto-write-a-block example package by Eric Blossom and contributors.
diff --git a/gr-fcd/README.hacking b/gr-fcd/README.hacking
deleted file mode 100644
index 4b1615e74..000000000
--- a/gr-fcd/README.hacking
+++ /dev/null
@@ -1,74 +0,0 @@
-The layout of this tree is as follows. The top-level directory contains
-the autoconf/automake build definition files:
-
-bootstrap
-config.guess
-config.sub
-configure.ac
-Makefile.am
-Makefile.common
-Makefile.swig
-Makefile.swig.gen.t
-version.sh
-
-Of these files, only configure.ac, Makefile.am, and Makefile.common would
-likely need changing in order to customize this into a new out-of-tree
-project.
-
-Subdirectory Layout
--------------------
-
-config - autoconf configuration macros
-lib - GNU Radio blocks C++ API, shared lib and headers and QA code
-swig - Generates Python API from C++ blocks
-python - Pure Python modules (hierarchical blocks, other classes)
-grc - GNU Radio Companion block wrappers
-apps - GRC applications, scripts, or other executables installed to bin
-
-The 'config' directory contains autoconf configuration files which help the
-configuration script discover various things about the software development
-environment during the execution of the 'configure' script. These files
-would likely not need any changing to customize this tree.
-
-The 'lib' directory contains those files needed to generate GNU Radio
-signal processing blocks. These take the form of a shared library that one
-dynamically links against, and header files that one would include in
-their C++ GNU Radio application. This directory also contains the framework
-for adding QA tests that are executed during 'make check' using the cppunit
-unit testing framework. The generated shared library is installed into
-$prefix/lib and the header files are installed into $prefix/include/gnuradio.
-
-Adding new blocks starts here, by adding new .cc and new .h files for each
-new block, and modifying Makefile.am to add them to the build and link. If
-desired, one can add unit tests to the QA framework that get executed during
-'make check'.
-
-The 'swig' directory contains the SWIG machinery to create a Python module
-that exports the C++ API into a Python namespace. Each GNU Radio block gets a
-.i file (using SWIG syntax). The master howto.i file must also have a line
-to include the block header file and a line to import the block .i file. The
-resulting _howto_swig.so and _howto_swig.py files are installed into the
-system Python lib directory under gnuradio/howto and become part of the
-gnuradio.howto Python namespace. The Makefile.am must be customized to
-recognize new files created here.
-
-The 'python' directory contains pure Python modules that get installed into
-the system Python lib directory under gnuradio/howto and the __init__.py
-module needed to turn the directory into the gnuradio.howto namespace.
-This is the appropriate place to put hierarchical blocks and utility classes.
-Be sure to edit the __init__.py to add your module/symbol imports as
-necessary, and to modify the Makefile.am accordingly.
-
-This directory also contains Python-based QA code, which is executed during
-'make check'.
-
-The 'grc' directory contains the XML-based wrappers that describe your blocks
-to the GNU Radio Companion graphical flowgraph editor. These get installed
-into the $prefix/share/gnuradio/grc/blocks directory and require modification
-of the Makefile.am to recognize new files put here. Note: GRC only scans the
-system directory for wrapper files, so you must do a 'make install' before
-GRC will see your new files or modifications to existing ones.
-
-The 'apps' directory contains those Python and C++ programs which are to be
-installed into the system $prefix/bin directory. (FIXME: there is not
-currently an example of building a C++ binary in this directory.)
diff --git a/gr-fcd/lib/fcd/COPYRIGHT b/gr-fcd/lib/fcd/COPYRIGHT
new file mode 100644
index 000000000..f176590e9
--- /dev/null
+++ b/gr-fcd/lib/fcd/COPYRIGHT
@@ -0,0 +1,23 @@
+For convenience, GNU Radio includes the contents of this directory
+in its distribution, but they are not considered part of GNU Radio.
+
+These files are licensed and redistributed using the terms of the
+GPLv3.
+-------------------------------------------------------------------
+Copyright (C) 2010 Howard Long, G6LVB
+CopyRight (C) 2011 Alexandru Csete, OZ9AEC
+ Mario Lorenz, DL5MLO
+
+Qthid 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 of the License, or
+(at your option) any later version.
+
+Qthid 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 Qthid. If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/gr-fcd/lib/hid/COPYRIGHT b/gr-fcd/lib/hid/COPYRIGHT
new file mode 100644
index 000000000..e50305d7c
--- /dev/null
+++ b/gr-fcd/lib/hid/COPYRIGHT
@@ -0,0 +1,25 @@
+For convenience, GNU Radio includes the contents of this directory
+in its distribution, but they are not considered part of GNU Radio.
+
+These files are licensed and redistributed using the terms of the
+GPLv3.
+-------------------------------------------------------------------
+HIDAPI - Multi-Platform library for
+communication with HID devices.
+
+Alan Ott
+Signal 11 Software
+
+8/22/2009
+
+Copyright 2009, All Rights Reserved.
+
+At the discretion of the user of this library,
+this software may be licensed under the terms of the
+GNU Public License v3, a BSD-Style license, or the
+original HIDAPI license as outlined in the LICENSE.txt,
+LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt
+files located at the root of the source distribution.
+These files may also be found in the public source
+code repository located at:
+ http://github.com/signal11/hidapi .
--
cgit