diff options
-rw-r--r-- | config/grc_gr_uhd.m4 | 2 | ||||
-rw-r--r-- | gr-uhd/apps/Makefile.am | 2 | ||||
-rw-r--r-- | gr-uhd/apps/hf_explorer/Makefile.am | 2 | ||||
-rw-r--r-- | gr-uhd/apps/hf_radio/input.py | 20 | ||||
-rw-r--r-- | gr-uhd/apps/hf_radio/output.py | 21 | ||||
-rwxr-xr-x | gr-uhd/apps/hf_radio/radio.py | 22 | ||||
-rw-r--r-- | gr-uhd/apps/hf_radio/ssbagc.py | 22 | ||||
-rw-r--r-- | gr-uhd/apps/hf_radio/ssbdemod.py | 22 | ||||
-rwxr-xr-x | gr-uhd/apps/hf_radio/ui.py | 21 |
9 files changed, 127 insertions, 7 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 111b0ae432..fbaf088ebf 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -49,6 +49,8 @@ AC_DEFUN([GRC_GR_UHD],[ gr-uhd/swig/run_tests \ gr-uhd/swig/run_guile_tests \ gr-uhd/apps/Makefile \ + gr-uhd/apps/hf_explorer/Makefile \ + gr-uhd/apps/hf_radio/Makefile \ ]) GRC_BUILD_CONDITIONAL(gr-uhd,[ diff --git a/gr-uhd/apps/Makefile.am b/gr-uhd/apps/Makefile.am index 9bb9b6cdd3..a9e28b9cd2 100644 --- a/gr-uhd/apps/Makefile.am +++ b/gr-uhd/apps/Makefile.am @@ -24,6 +24,8 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST += \ $(bin_SCRIPTS) +SUBDIRS = hf_explorer hf_radio + ourpythondir = $(grpythondir) bin_SCRIPTS = \ diff --git a/gr-uhd/apps/hf_explorer/Makefile.am b/gr-uhd/apps/hf_explorer/Makefile.am index 88ad52128e..c8e7ecb257 100644 --- a/gr-uhd/apps/hf_explorer/Makefile.am +++ b/gr-uhd/apps/hf_explorer/Makefile.am @@ -28,4 +28,4 @@ dist_ourdata_DATA = \ hfx_help dist_ourdata_SCRIPTS = \ - hfx2.py + hfx.py diff --git a/gr-uhd/apps/hf_radio/input.py b/gr-uhd/apps/hf_radio/input.py index 7a802f5bf6..2626ddfb52 100644 --- a/gr-uhd/apps/hf_radio/input.py +++ b/gr-uhd/apps/hf_radio/input.py @@ -1,3 +1,23 @@ +# 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. +# + # Basic USRP setup and control. # It's only ever been tried with a basic rx daughter card. # diff --git a/gr-uhd/apps/hf_radio/output.py b/gr-uhd/apps/hf_radio/output.py index 251d863bcb..8ee7dc54cd 100644 --- a/gr-uhd/apps/hf_radio/output.py +++ b/gr-uhd/apps/hf_radio/output.py @@ -1,3 +1,24 @@ +# 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. +# + + # Audio output with a volume control. # # M. Revnell 2005-Dec diff --git a/gr-uhd/apps/hf_radio/radio.py b/gr-uhd/apps/hf_radio/radio.py index 2b6f6ee138..32e26c7eb9 100755 --- a/gr-uhd/apps/hf_radio/radio.py +++ b/gr-uhd/apps/hf_radio/radio.py @@ -1,11 +1,29 @@ #!/usr/bin/env python +# +# 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. +# # GUI interactions and high level connections handled here. # # Interacts with classes defined by wxGlade in ui.py. # -# The usual gnuradio copyright boilerplate incorperated here by reference. -# # M. Revnell 2006-Jan from threading import * diff --git a/gr-uhd/apps/hf_radio/ssbagc.py b/gr-uhd/apps/hf_radio/ssbagc.py index 51e5f0248c..4947128637 100644 --- a/gr-uhd/apps/hf_radio/ssbagc.py +++ b/gr-uhd/apps/hf_radio/ssbagc.py @@ -1,7 +1,25 @@ +# 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. + + # post detection agc processing # -# Imagine that the usual gnuradio copyright stuff is right here. -# # This agc strategy is copied more or less verbatim from # weaver_isb_am1_usrp3.py by cswiger. # diff --git a/gr-uhd/apps/hf_radio/ssbdemod.py b/gr-uhd/apps/hf_radio/ssbdemod.py index 9c43a2c828..072d317a27 100644 --- a/gr-uhd/apps/hf_radio/ssbdemod.py +++ b/gr-uhd/apps/hf_radio/ssbdemod.py @@ -1,8 +1,26 @@ +# 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. +# + # This tries to push the hilbert transform for ssb demod back into the # freq. xlating filter. # -# The usual gnuradio copyright notice is hereby included by reference. -# # The starting point for this was weaver_isb_am1_usrp3.py. # # The tap coefficients for freq_xlating_fir_filter_ccf were generated diff --git a/gr-uhd/apps/hf_radio/ui.py b/gr-uhd/apps/hf_radio/ui.py index 71b73c128e..551a304152 100755 --- a/gr-uhd/apps/hf_radio/ui.py +++ b/gr-uhd/apps/hf_radio/ui.py @@ -1,4 +1,25 @@ #!/usr/bin/env python +# +# 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. +# + # -*- coding: UTF-8 -*- # generated by wxGlade 0.4 on Mon Jan 2 19:02:03 2006 |