From b47b9ca40ecf49afa44c993b8da9af4ff876c9ba Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 22:25:16 -0600 Subject: regenerated from template --- gr-usrp2/src/Makefile.swig.gen | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 24d9f17c0..e7518d255 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += usrp2.py usrp2.cc +swig_built_sources += usrp2.py usrp2-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -86,7 +86,7 @@ usrp2_pylib_LTLIBRARIES = \ _usrp2.la _usrp2_la_SOURCES = \ - usrp2.cc \ + usrp2-python.cc \ $(usrp2_la_swig_sources) _usrp2_la_LIBADD = \ @@ -107,7 +107,7 @@ usrp2_python_PYTHON = \ ## Entry rule for running SWIG -usrp2.h usrp2.py usrp2.cc: usrp2.i +usrp2.h usrp2.py usrp2-python.cc: usrp2.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -159,11 +159,12 @@ usrp2.h usrp2.py usrp2.cc: usrp2.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/usrp2-generate-stamp; \ + rm -f $(DEPDIR)/usrp2-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \ ## ## Now that the .cc, .h, and .py files have been (re)created from the ## .i file, future checking of this rule during the same MAKE @@ -187,11 +188,27 @@ usrp2.h usrp2.py usrp2.cc: usrp2.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/usrp2-generate-stamp; \ + test -f $(DEPDIR)/usrp2-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/usrp2-generate-stamp: +$(DEPDIR)/usrp2-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ + -MD -MF $(DEPDIR)/usrp2.Std \ + -module usrp2 -o usrp2-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp2.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ + > $(DEPDIR)/usrp2.Sd; \ + $(RM) $(DEPDIR)/usrp2.Std; \ + $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp2-generate-guile-stamp + +$(DEPDIR)/usrp2-generate-python-stamp: ## This rule will be called only by the first process issuing the ## above rule to succeed in creating the lock directory, after ## removing the actual stamp file in order to guarantee that MAKE will @@ -202,7 +219,7 @@ $(DEPDIR)/usrp2-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2.cc $(WHAT); then \ + -module usrp2 -o usrp2-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp2.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ @@ -249,7 +266,7 @@ $(DEPDIR)/usrp2-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/usrp2-generate-stamp + touch $(DEPDIR)/usrp2-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, -- cgit From ed4094208c501e91838ccc333059e4731e8ae908 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 14 Oct 2010 12:34:08 -0600 Subject: regenerated after changes to the template --- gr-usrp2/src/Makefile.swig.gen | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index e7518d255..2498b334e 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += usrp2.py usrp2-python.cc +swig_built_sources += usrp2.py usrp2_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -83,21 +83,21 @@ usrp2_swiginclude_HEADERS = \ $(usrp2_swiginclude_headers) usrp2_pylib_LTLIBRARIES = \ - _usrp2.la + _usrp2_python.la -_usrp2_la_SOURCES = \ - usrp2-python.cc \ +_usrp2_python_la_SOURCES = \ + usrp2_python.cc \ $(usrp2_la_swig_sources) -_usrp2_la_LIBADD = \ +_usrp2_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) -_usrp2_la_LDFLAGS = \ +_usrp2_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp2_la_swig_ldflags) -_usrp2_la_CXXFLAGS = \ +_usrp2_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(usrp2_la_swig_cxxflags) @@ -105,9 +105,23 @@ usrp2_python_PYTHON = \ usrp2.py \ $(usrp2_python) +if GUILE +usrp2_pylib_LTLIBRARIES += _usrp2_guile.la + +_usrp2_guile_la_SOURCES = \ + usrp2_guile.cc \ + $(usrp2_la_swig_sources) + +# Guile can use the same flags as python does +_usrp2_guile_la_LIBADD = $(_usrp2_python_la_LIBADD) +_usrp2_guile_la_LDFLAGS = $(_usrp2_python_la_LDFLAGS) +_usrp2_guile_la_CXXFLAGS = $(_usrp2_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -usrp2.h usrp2.py usrp2-python.cc: usrp2.i +usrp2.h usrp2.py usrp2_python.cc: usrp2.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ usrp2.h usrp2.py usrp2-python.cc: usrp2.i fi; $(DEPDIR)/usrp2-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2-guile.cc $(WHAT); then \ + -module usrp2 -o usrp2_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp2.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/usrp2-generate-guile-stamp: $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ fi; touch $(DEPDIR)/usrp2-generate-guile-stamp +endif $(DEPDIR)/usrp2-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2-python.cc $(WHAT); then \ + -module usrp2 -o usrp2_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp2.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ -- cgit From b866f36454af0defea79d84647a8a1652fb2fbdb Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 16 Oct 2010 09:46:48 -0600 Subject: regenerated after changes to .i files --- gr-usrp2/src/Makefile.swig.gen | 53 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 2498b334e..a52a3cbe2 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -usrp2.h usrp2.py usrp2_python.cc: usrp2.i +usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -209,19 +209,28 @@ usrp2.h usrp2.py usrp2_python.cc: usrp2.i $(DEPDIR)/usrp2-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ + -MD -MF $(DEPDIR)/usrp2_guile.Std \ -module usrp2 -o usrp2_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ + $(RM) $(DEPDIR)/usrp2_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_guile.Std \ + > $(DEPDIR)/usrp2_guile.Sd; \ + $(RM) $(DEPDIR)/usrp2_guile.Std; \ + $(MV) $(DEPDIR)/usrp2_guile.Sd $(DEPDIR)/usrp2_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp2_guile.S*; exit 1; \ fi; touch $(DEPDIR)/usrp2-generate-guile-stamp + $(RM) $(DEPDIR)/usrp2_guile.d + cp $(DEPDIR)/usrp2_guile.Std $(DEPDIR)/usrp2_guile.d + echo "" >> $(DEPDIR)/usrp2_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d + $(RM) $(DEPDIR)/usrp2_guile.Std + touch $(DEPDIR)/usrp2-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ endif $(DEPDIR)/usrp2-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ + -MD -MF $(DEPDIR)/usrp2_python.Std \ -module usrp2 -o usrp2_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ + $(RM) $(DEPDIR)/usrp2_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_python.Std \ + > $(DEPDIR)/usrp2_python.Sd; \ + $(RM) $(DEPDIR)/usrp2_python.Std; \ + $(MV) $(DEPDIR)/usrp2_python.Sd $(DEPDIR)/usrp2_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp2_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/usrp2.d + $(RM) $(DEPDIR)/usrp2_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/usrp2.Std $(DEPDIR)/usrp2.d + cp $(DEPDIR)/usrp2_python.Std $(DEPDIR)/usrp2_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/usrp2.d + echo "" >> $(DEPDIR)/usrp2_python.d ## ## (4) from the SWIG file, remove the first line (the target); remove ## trailing " \" and " " from each line. Append ":" to each line, ## followed by 2 carriage returns, then append this to the end of ## the dependency file. ## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/usrp2.Std + $(RM) $(DEPDIR)/usrp2_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -288,5 +297,5 @@ $(DEPDIR)/usrp2-generate-python-stamp: # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/usrp2.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ -- cgit From 5ea1059c943a8a6dcb67c2a151f27b84b653f549 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:15:58 -0600 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index a52a3cbe2..8d140095c 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -206,33 +206,6 @@ usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i exit $$?; \ fi; -$(DEPDIR)/usrp2-generate-guile-stamp: -if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2_guile.Std \ - -module usrp2 -o usrp2_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_guile.Std \ - > $(DEPDIR)/usrp2_guile.Sd; \ - $(RM) $(DEPDIR)/usrp2_guile.Std; \ - $(MV) $(DEPDIR)/usrp2_guile.Sd $(DEPDIR)/usrp2_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp2_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/usrp2-generate-guile-stamp - $(RM) $(DEPDIR)/usrp2_guile.d - cp $(DEPDIR)/usrp2_guile.Std $(DEPDIR)/usrp2_guile.d - echo "" >> $(DEPDIR)/usrp2_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d - $(RM) $(DEPDIR)/usrp2_guile.Std - touch $(DEPDIR)/usrp2-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ -endif - $(DEPDIR)/usrp2-generate-python-stamp: ## This rule will be called only by the first process issuing the ## above rule to succeed in creating the lock directory, after @@ -299,3 +272,30 @@ $(DEPDIR)/usrp2-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ +$(DEPDIR)/usrp2-generate-guile-stamp: +if GUILE + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ + -MD -MF $(DEPDIR)/usrp2_guile.Std \ + -module usrp2 -o usrp2_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp2_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_guile.Std \ + > $(DEPDIR)/usrp2_guile.Sd; \ + $(RM) $(DEPDIR)/usrp2_guile.Std; \ + $(MV) $(DEPDIR)/usrp2_guile.Sd $(DEPDIR)/usrp2_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp2_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp2-generate-guile-stamp + $(RM) $(DEPDIR)/usrp2_guile.d + cp $(DEPDIR)/usrp2_guile.Std $(DEPDIR)/usrp2_guile.d + echo "" >> $(DEPDIR)/usrp2_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d + $(RM) $(DEPDIR)/usrp2_guile.Std + touch $(DEPDIR)/usrp2-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ +endif + -- cgit From 25bf9bbd0c5b702acf26e05d5a9966fd323f6614 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 21:45:11 -0600 Subject: don't ifdef the target away. regenerate .gen files. --- gr-usrp2/src/Makefile.swig.gen | 51 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 8d140095c..fb925d80e 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -38,6 +38,16 @@ usrp2_pylibdir_category ?= $(usrp2_pythondir_category) usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category) usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) +# The .so libraries for the guile modules get installed whereever guile +# is installed, usually /usr/lib/guile/gnuradio/ +# FIXME: determince whether these should be installed with gnuradio. +usrp2_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/usrp2 +# FIXME: determince whether these should be installed with gnuradio. +usrp2_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. usrp2_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += usrp2.py usrp2_python.cc +if GUILE +swig_built_sources += usrp2.scm usrp2_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -106,11 +119,11 @@ usrp2_python_PYTHON = \ $(usrp2_python) if GUILE -usrp2_pylib_LTLIBRARIES += _usrp2_guile.la - +usrp2_scmlib_LTLIBRARIES = _usrp2_guile.la _usrp2_guile_la_SOURCES = \ - usrp2_guile.cc \ + usrp2_guile.cc \ $(usrp2_la_swig_sources) +usrp2_scm_DATA = usrp2.scm # Guile can use the same flags as python does _usrp2_guile_la_LIBADD = $(_usrp2_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i +# $(python_deps) $(guile_deps): usrp2.i +usrp2_python.h usrp2.py usrp2_python.cc: usrp2.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -178,7 +192,6 @@ usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \ ## ## Now that the .cc, .h, and .py files have been (re)created from the ## .i file, future checking of this rule during the same MAKE @@ -206,6 +219,24 @@ usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i exit $$?; \ fi; +# the comments for the target above apply to this target as well, but it seemed +# silly to include them twice. The only main change is for guile. +usrp2_guile.h usrp2.scm usrp2_guile.cc: usrp2.i +if GUILE + trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/usrp2-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/usrp2-generate-lock; \ + else \ + while test -d $(DEPDIR)/usrp2-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/usrp2-generate-guile-stamp; \ + exit $$?; \ + fi; +endif # end of GUILE + $(DEPDIR)/usrp2-generate-python-stamp: ## This rule will be called only by the first process issuing the ## above rule to succeed in creating the lock directory, after @@ -272,8 +303,10 @@ $(DEPDIR)/usrp2-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ -$(DEPDIR)/usrp2-generate-guile-stamp: if GUILE +$(DEPDIR)/usrp2-generate-guile-stamp: +# the comments for the target above apply to this target as well, but it seemed +# silly to include them twice. The only main change is for guile. if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2_guile.Std \ -module usrp2 -o usrp2_guile.cc $(WHAT); then \ @@ -295,7 +328,11 @@ if GUILE awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d $(RM) $(DEPDIR)/usrp2_guile.Std touch $(DEPDIR)/usrp2-generate-guile-stamp +else + touch $(DEPDIR)/usrp2-generate-guile-stamp +endif @am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ -endif + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i -- cgit From d169bfeee38f883cbf6b7ddf41ce8645a8370549 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 18 Oct 2010 20:57:33 -0700 Subject: gitignore swig generated files --- gr-usrp2/src/.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index 6f241fe83..321a8ae84 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -4,6 +4,7 @@ /.deps /usrp2.py /usrp2.cc +/usrp2_python.cc /run_tests /test_gr_usrp2 /*.pyc -- cgit From 42753aad1c8170bf1a4d4003d636ac5a81cbbda3 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 22:07:32 -0600 Subject: regeneratd --- gr-usrp2/src/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index fb925d80e..22a6998ab 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -303,8 +303,8 @@ $(DEPDIR)/usrp2-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ -if GUILE $(DEPDIR)/usrp2-generate-guile-stamp: +if GUILE # the comments for the target above apply to this target as well, but it seemed # silly to include them twice. The only main change is for guile. if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ -- cgit From 5aaeb46517ebc32f95b7e46847d0d345593d00fd Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 22:36:24 -0600 Subject: don't build the python specific code for guile --- gr-usrp2/src/usrp2.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index 2a79fad44..d3aa77634 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -228,6 +228,7 @@ uint16_t *make_uint16_ptr(); int deref_uint16_ptr(uint16_t *l); void free_uint16_ptr(uint16_t *l); +#ifdef SWIGPYTHON // create a more pythonic interface %pythoncode %{ @@ -347,3 +348,5 @@ usrp2_sink_32fc_sptr.read_gpio = __read_gpio usrp2_sink_16sc_sptr.read_gpio = __read_gpio %} +#warning "usrp2.i needs to be implemented fr guile!" +#endif -- cgit From aa162012cc25cf080ee744a2cb795a6154fcca86 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 13:16:05 -0600 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 241 +++++------------------------------------ 1 file changed, 25 insertions(+), 216 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 22a6998ab..a5d151f11 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -82,9 +82,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += usrp2.py usrp2_python.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += usrp2.py if GUILE -swig_built_sources += usrp2.scm usrp2_guile.cc +swig_built_sources += usrp2.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -96,243 +98,50 @@ usrp2_swiginclude_HEADERS = \ $(usrp2_swiginclude_headers) usrp2_pylib_LTLIBRARIES = \ - _usrp2_python.la + _usrp2.la -_usrp2_python_la_SOURCES = \ - usrp2_python.cc \ +_usrp2_la_SOURCES = \ + python/usrp2.cc \ $(usrp2_la_swig_sources) -_usrp2_python_la_LIBADD = \ +_usrp2_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) -_usrp2_python_la_LDFLAGS = \ +# _usrp2_la_DEPENDENCIES = python/usrp2.lo + +_usrp2_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp2_la_swig_ldflags) -_usrp2_python_la_CXXFLAGS = \ +_usrp2_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(usrp2_la_swig_cxxflags) usrp2_python_PYTHON = \ usrp2.py \ - $(usrp2_python) + $(usrp2) if GUILE -usrp2_scmlib_LTLIBRARIES = _usrp2_guile.la -_usrp2_guile_la_SOURCES = \ - usrp2_guile.cc \ +usrp2_scmlib_LTLIBRARIES = usrp2_guile.la +usrp2_guile_la_SOURCES = \ + guile/usrp2.cc \ $(usrp2_la_swig_sources) usrp2_scm_DATA = usrp2.scm # Guile can use the same flags as python does -_usrp2_guile_la_LIBADD = $(_usrp2_python_la_LIBADD) -_usrp2_guile_la_LDFLAGS = $(_usrp2_python_la_LDFLAGS) -_usrp2_guile_la_CXXFLAGS = $(_usrp2_python_la_CXXFLAGS) - -endif # end of GUILE +usrp2_guile_la_LIBADD = $(_usrp2_la_LIBADD) +usrp2_guile_la_LDFLAGS = $(_usrp2_la_LDFLAGS) +usrp2_guile_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) -## Entry rule for running SWIG - -# $(python_deps) $(guile_deps): usrp2.i -usrp2_python.h usrp2.py usrp2_python.cc: usrp2.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/usrp2-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/usrp2-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-python-stamp WHAT=$<; \ -## -## Now that the .cc, .h, and .py files have been (re)created from the -## .i file, future checking of this rule during the same MAKE -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/usrp2-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/usrp2-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/usrp2-generate-python-stamp; \ - exit $$?; \ - fi; +guile/usrp2.lo: usrp2.lo +usrp2.scm: usrp2.i -# the comments for the target above apply to this target as well, but it seemed -# silly to include them twice. The only main change is for guile. -usrp2_guile.h usrp2.scm usrp2_guile.cc: usrp2.i -if GUILE - trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/usrp2-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/usrp2-generate-lock; \ - else \ - while test -d $(DEPDIR)/usrp2-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/usrp2-generate-guile-stamp; \ - exit $$?; \ - fi; endif # end of GUILE -$(DEPDIR)/usrp2-generate-python-stamp: -## This rule will be called only by the first process issuing the -## above rule to succeed in creating the lock directory, after -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2_python.Std \ - -module usrp2 -o usrp2_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_python.Std \ - > $(DEPDIR)/usrp2_python.Sd; \ - $(RM) $(DEPDIR)/usrp2_python.Std; \ - $(MV) $(DEPDIR)/usrp2_python.Sd $(DEPDIR)/usrp2_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp2_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/usrp2_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/usrp2_python.Std $(DEPDIR)/usrp2_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/usrp2_python.d -## -## (4) from the SWIG file, remove the first line (the target); remove -## trailing " \" and " " from each line. Append ":" to each line, -## followed by 2 carriage returns, then append this to the end of -## the dependency file. -## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/usrp2_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/usrp2-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# not guaranteed to be portable, but will probably work. If it works, -# we have accurate dependencies for our swig stuff, which is good. - -@am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ - -$(DEPDIR)/usrp2-generate-guile-stamp: -if GUILE -# the comments for the target above apply to this target as well, but it seemed -# silly to include them twice. The only main change is for guile. - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2_guile.Std \ - -module usrp2 -o usrp2_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_guile.Std \ - > $(DEPDIR)/usrp2_guile.Sd; \ - $(RM) $(DEPDIR)/usrp2_guile.Std; \ - $(MV) $(DEPDIR)/usrp2_guile.Sd $(DEPDIR)/usrp2_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp2_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/usrp2-generate-guile-stamp - $(RM) $(DEPDIR)/usrp2_guile.d - cp $(DEPDIR)/usrp2_guile.Std $(DEPDIR)/usrp2_guile.d - echo "" >> $(DEPDIR)/usrp2_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d - $(RM) $(DEPDIR)/usrp2_guile.Std - touch $(DEPDIR)/usrp2-generate-guile-stamp -else - touch $(DEPDIR)/usrp2-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ +python/usrp2.lo: +usrp2.lo: usrp2.py usrp2.scm +usrp2.py: usrp2.i -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i -- cgit From 1e34972f4433cbfef3500fc73a285c7c436cfd6b Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 22:00:09 -0700 Subject: Rengenerate Makefile.swig.gen's --- gr-usrp2/src/Makefile.swig.gen | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index a5d151f11..753a7b254 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -41,12 +41,12 @@ usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +usrp2_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp2 # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmdir = @GUILE_PKDATADIR@/gnuradio +usrp2_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -144,4 +144,5 @@ python/usrp2.lo: usrp2.lo: usrp2.py usrp2.scm usrp2.py: usrp2.i +-include python/usrp2.d -- cgit From 6421d47062f4bf5abbdf26142616a5965f1edfa0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 23:28:06 -0700 Subject: regenerate --- gr-usrp2/src/Makefile.swig.gen | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 753a7b254..932ed53b0 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -41,7 +41,7 @@ usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmlibdir = $(libdir)/guile/gnuradio +usrp2_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp2 @@ -124,16 +124,16 @@ usrp2_python_PYTHON = \ $(usrp2) if GUILE -usrp2_scmlib_LTLIBRARIES = usrp2_guile.la -usrp2_guile_la_SOURCES = \ +usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la +libguile_usrp2_la_SOURCES = \ guile/usrp2.cc \ $(usrp2_la_swig_sources) usrp2_scm_DATA = usrp2.scm # Guile can use the same flags as python does -usrp2_guile_la_LIBADD = $(_usrp2_la_LIBADD) -usrp2_guile_la_LDFLAGS = $(_usrp2_la_LDFLAGS) -usrp2_guile_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) +libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD) +libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS) +libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) guile/usrp2.lo: usrp2.lo usrp2.scm: usrp2.i -- cgit From 40fac3c4a2f5f1f6dde79e96be8f40535e11343b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Oct 2010 12:14:16 -0600 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 932ed53b0..4b748939f 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -46,7 +46,7 @@ usrp2_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/usrp2 # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmdir = $(guiledir)/gnuradio +usrp2_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -128,7 +128,7 @@ usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la libguile_usrp2_la_SOURCES = \ guile/usrp2.cc \ $(usrp2_la_swig_sources) -usrp2_scm_DATA = usrp2.scm +nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm # Guile can use the same flags as python does libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD) @@ -137,6 +137,9 @@ libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) guile/usrp2.lo: usrp2.lo usrp2.scm: usrp2.i +gnuradio/usrp2-primitive.scm: usrp2.scm + +-include guile/usrp2.d endif # end of GUILE -- cgit From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Oct 2010 12:14:41 -0600 Subject: add load-extension support --- gr-usrp2/src/usrp2.i | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index d3aa77634..0555f086c 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -350,3 +350,13 @@ usrp2_sink_16sc_sptr.read_gpio = __read_gpio %} #warning "usrp2.i needs to be implemented fr guile!" #endif + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-usrp2" "scm_init_gnuradio_usrp2_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif -- cgit From 2b11c904da6799b6a7240d64d2ba37ddcaf1e479 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 1 Nov 2010 16:06:37 -0600 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 4b748939f..72abdef92 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += usrp2.py -if GUILE -swig_built_sources += usrp2.scm -endif +# swig_built_sources += usrp2.py +# if GUILE +# swig_built_sources += gnuradio/usrp2.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -135,15 +135,14 @@ libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD) libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS) libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) -guile/usrp2.lo: usrp2.lo -usrp2.scm: usrp2.i -gnuradio/usrp2-primitive.scm: usrp2.scm +guile/usrp2.cc: gnuradio/usrp2.scm +gnuradio/usrp2.scm: usrp2.i +gnuradio/usrp2-primitive.scm: gnuradio/usrp2.scm -include guile/usrp2.d endif # end of GUILE -python/usrp2.lo: usrp2.lo: usrp2.py usrp2.scm usrp2.py: usrp2.i -- cgit From 0939607d0b4a3ae047ceff60fab300000c7d2069 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 1 Nov 2010 19:02:55 -0600 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 72abdef92..a39ae12c8 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -67,28 +67,10 @@ usrp2_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/usrp2-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += usrp2.py -# if GUILE -# swig_built_sources += gnuradio/usrp2.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _usrp2_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) -# _usrp2_la_DEPENDENCIES = python/usrp2.lo - _usrp2_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp2_la_swig_ldflags) @@ -123,14 +103,20 @@ usrp2_python_PYTHON = \ usrp2.py \ $(usrp2) +python/usrp2.cc: usrp2.py +usrp2.py: usrp2.i + +# Include the python dependencies for this file +-include python/usrp2.d +# end of PYTHON + if GUILE usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la -libguile_usrp2_la_SOURCES = \ - guile/usrp2.cc \ +libguile_usrp2_la_SOURCES = \ + guile/usrp2.cc \ $(usrp2_la_swig_sources) nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm -# Guile can use the same flags as python does libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD) libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS) libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/usrp2.cc: gnuradio/usrp2.scm gnuradio/usrp2.scm: usrp2.i gnuradio/usrp2-primitive.scm: gnuradio/usrp2.scm +# Include the guile dependencies for this file -include guile/usrp2.d endif # end of GUILE -usrp2.lo: usrp2.py usrp2.scm -usrp2.py: usrp2.i - --include python/usrp2.d -- cgit From df92b7c6315c567e58e0d9c293d7c9c2699023d3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 10 Nov 2010 13:01:38 -0800 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index a39ae12c8..3e79e2533 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -112,8 +112,8 @@ usrp2.py: usrp2.i if GUILE usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la -libguile_usrp2_la_SOURCES = \ - guile/usrp2.cc \ +libguile_usrp2_la_SOURCES = \ + guile/usrp2.cc \ $(usrp2_la_swig_sources) nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm -- cgit From 8180bb1d7020e07c9b0a217820c68d07f0d98a74 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 16 Nov 2010 21:33:50 -0800 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 3e79e2533..469d43c04 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -101,7 +101,7 @@ _usrp2_la_CXXFLAGS = \ usrp2_python_PYTHON = \ usrp2.py \ - $(usrp2) + $(usrp2_python) python/usrp2.cc: usrp2.py usrp2.py: usrp2.i -- cgit From ff877cabe2384dc2155ef5af92ee8b959fd29806 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 19 Nov 2010 08:07:52 -0700 Subject: regenerated --- gr-usrp2/src/Makefile.swig.gen | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 469d43c04..aad223071 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -79,6 +79,7 @@ usrp2_swiginclude_HEADERS = \ usrp2.i \ $(usrp2_swiginclude_headers) +if PYTHON usrp2_pylib_LTLIBRARIES = \ _usrp2.la @@ -86,6 +87,10 @@ _usrp2_la_SOURCES = \ python/usrp2.cc \ $(usrp2_la_swig_sources) +usrp2_python_PYTHON = \ + usrp2.py \ + $(usrp2_python) + _usrp2_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) @@ -99,27 +104,34 @@ _usrp2_la_CXXFLAGS = \ -I$(top_builddir) \ $(usrp2_la_swig_cxxflags) -usrp2_python_PYTHON = \ - usrp2.py \ - $(usrp2_python) - python/usrp2.cc: usrp2.py usrp2.py: usrp2.i # Include the python dependencies for this file -include python/usrp2.d -# end of PYTHON + +endif # end of if python if GUILE -usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la + +usrp2_scmlib_LTLIBRARIES = \ + libguile-usrp2.la libguile_usrp2_la_SOURCES = \ guile/usrp2.cc \ $(usrp2_la_swig_sources) -nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm - -libguile_usrp2_la_LIBADD = $(_usrp2_la_LIBADD) -libguile_usrp2_la_LDFLAGS = $(_usrp2_la_LDFLAGS) -libguile_usrp2_la_CXXFLAGS = $(_usrp2_la_CXXFLAGS) +nobase_usrp2_scm_DATA = \ + gnuradio/usrp2.scm \ + gnuradio/usrp2-primitive.scm +libguile_usrp2_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(usrp2_la_swig_libadd) +libguile_usrp2_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(usrp2_la_swig_ldflags) +libguile_usrp2_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(usrp2_la_swig_cxxflags) guile/usrp2.cc: gnuradio/usrp2.scm gnuradio/usrp2.scm: usrp2.i -- cgit From 99dc38c8f81fe388b13bf46e3f53cc272765249e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 13:49:59 -0800 Subject: Consistently use TESTS += in conditionals --- gr-usrp2/src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 0d55d73ba..8b94ae54f 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -21,6 +21,8 @@ include $(top_srcdir)/Makefile.common +TESTS = + # ---------------------------------------------------------------------- # Local Python files, not installed # @@ -87,7 +89,7 @@ if PYTHON # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TESTS = run_tests +TESTS += run_tests TOP_SWIG_IFILES = \ usrp2.i -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- gr-usrp2/src/Makefile.am | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 8b94ae54f..8e1d0c20c 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -20,8 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests + # ---------------------------------------------------------------------- # Local Python files, not installed @@ -35,9 +39,6 @@ noinst_PYTHON = qa_usrp2.py # Miscellaneous build operations # ---------------------------------------------------------------------- -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests - # ---------------------------------------------------------------------- # C++ block API interface librar(ies) # @@ -82,14 +83,12 @@ noinst_HEADERS = \ rx_16sc_handler.h \ rx_32fc_handler.h -if PYTHON # ---------------------------------------------------------------------- -# Python SWIG wrapper around C++ library +# SWIG wrappers around C++ library # # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TESTS += run_tests TOP_SWIG_IFILES = \ usrp2.i @@ -109,11 +108,6 @@ usrp2_swig_args = \ usrp2_la_swig_libadd = \ libgnuradio-usrp2.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif +if PYTHON +TESTS += run_tests +endif \ No newline at end of file -- cgit From b005e7d9f481ed39591d97ef697621368e6505c0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 19:08:21 -0800 Subject: Update .gitignore's --- gr-usrp2/src/.gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index 321a8ae84..77ff1d528 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -8,3 +8,6 @@ /run_tests /test_gr_usrp2 /*.pyc +/gnuradio +/guile +/python -- cgit From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 23:30:54 -0800 Subject: Rename libguile- to libguile-gnuradio- to match guile library naming convention. The stuff in gnuradio-core ends up with funky names, but that could be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc. --- gr-usrp2/src/usrp2.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index 0555f086c..c30fb7216 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -353,7 +353,7 @@ usrp2_sink_16sc_sptr.read_gpio = __read_gpio #if SWIGGUILE %scheme %{ -(load-extension "libguile-usrp2" "scm_init_gnuradio_usrp2_module") +(load-extension "libguile-gnuradio-usrp2" "scm_init_gnuradio_usrp2_module") %} %goops %{ -- cgit From 6df0423fe1880f5c33daa333604552ea68ac9593 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 23:34:24 -0800 Subject: Regenerated Makefile.swig.gen's --- gr-usrp2/src/Makefile.swig.gen | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index aad223071..73d5b15a8 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -115,20 +115,20 @@ endif # end of if python if GUILE usrp2_scmlib_LTLIBRARIES = \ - libguile-usrp2.la -libguile_usrp2_la_SOURCES = \ + libguile-gnuradio-usrp2.la +libguile_gnuradio_usrp2_la_SOURCES = \ guile/usrp2.cc \ $(usrp2_la_swig_sources) nobase_usrp2_scm_DATA = \ gnuradio/usrp2.scm \ gnuradio/usrp2-primitive.scm -libguile_usrp2_la_LIBADD = \ +libguile_gnuradio_usrp2_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) -libguile_usrp2_la_LDFLAGS = \ +libguile_gnuradio_usrp2_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp2_la_swig_ldflags) -libguile_usrp2_la_CXXFLAGS = \ +libguile_gnuradio_usrp2_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(usrp2_la_swig_cxxflags) -- cgit From 0e4b0a6dec5d6051f16d5380067348586008202c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 10 Dec 2010 17:07:17 -0800 Subject: missed one --- gr-usrp2/src/usrp2.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i index c30fb7216..f99eed402 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2.i @@ -353,7 +353,7 @@ usrp2_sink_16sc_sptr.read_gpio = __read_gpio #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-usrp2" "scm_init_gnuradio_usrp2_module") +(load-extension-global "libguile-gnuradio-usrp2" "scm_init_gnuradio_usrp2_module") %} %goops %{ -- cgit From 46c2368192a57fd0bfe9f50f753759736c4b4668 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 18:32:24 -0800 Subject: Rename usrp2.i to usrp2_swig.i to allow insertion of guile convenience functions. --- gr-usrp2/src/.gitignore | 1 + gr-usrp2/src/Makefile.am | 29 ++-- gr-usrp2/src/Makefile.swig.gen | 98 +++++------ gr-usrp2/src/__init__.py | 28 ++++ gr-usrp2/src/qa_usrp2.py | 2 +- gr-usrp2/src/usrp2.i | 362 ----------------------------------------- gr-usrp2/src/usrp2_swig.i | 362 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 457 insertions(+), 425 deletions(-) create mode 100644 gr-usrp2/src/__init__.py delete mode 100644 gr-usrp2/src/usrp2.i create mode 100644 gr-usrp2/src/usrp2_swig.i (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index 77ff1d528..e167cdecc 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -11,3 +11,4 @@ /gnuradio /guile /python +/usrp2_swig.py diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 8e1d0c20c..e2cca8b3c 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -27,14 +27,13 @@ EXTRA_DIST += run_tests.in DISTCLEANFILES += run_tests -# ---------------------------------------------------------------------- -# Local Python files, not installed -# -# qa_usrp2.py -# ---------------------------------------------------------------------- - noinst_PYTHON = qa_usrp2.py +if GUILE +nobase_guile_DATA = gnuradio/usrp2.scm +endif + + # ---------------------------------------------------------------------- # Miscellaneous build operations # ---------------------------------------------------------------------- @@ -91,23 +90,27 @@ noinst_HEADERS = \ # ---------------------------------------------------------------------- TOP_SWIG_IFILES = \ - usrp2.i + usrp2_swig.i # Install so that they end up available as: # import gnuradio.usrp2 # This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -usrp2_pythondir_category = \ - gnuradio +# ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp2 +usrp2_swig_pythondir_category = \ + gnuradio/usrp2 # additional arguments to the SWIG command -usrp2_swig_args = \ +usrp2_swig_swig_args = \ $(USRP2_INCLUDES) # additional libraries for linking with the SWIG-generated library -usrp2_la_swig_libadd = \ +usrp2_swig_la_swig_libadd = \ libgnuradio-usrp2.la +# additional Python files to be installed along with the SWIG-generated one +usrp2_swig_python = \ + __init__.py + if PYTHON TESTS += run_tests -endif \ No newline at end of file +endif diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 73d5b15a8..d791ae2fa 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -20,37 +20,37 @@ # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for usrp2.i +# Makefile.swig.gen for usrp2_swig.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/usrp2 +## ${prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp2 +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -usrp2_pythondir_category ?= gnuradio/usrp2 -usrp2_pylibdir_category ?= $(usrp2_pythondir_category) -usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category) -usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) +usrp2_swig_pythondir_category ?= gnuradio/usrp2_swig +usrp2_swig_pylibdir_category ?= $(usrp2_swig_pythondir_category) +usrp2_swig_pythondir = $(pythondir)/$(usrp2_swig_pythondir_category) +usrp2_swig_pylibdir = $(pyexecdir)/$(usrp2_swig_pylibdir_category) # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmlibdir = $(libdir) +usrp2_swig_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/usrp2 +# is installed, usually /usr/share/guile/site/usrp2_swig # FIXME: determince whether these should be installed with gnuradio. -usrp2_scmdir = $(guiledir) +usrp2_swig_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. -usrp2_swigincludedir = $(swigincludedir) +usrp2_swig_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -75,70 +75,70 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -usrp2_swiginclude_HEADERS = \ - usrp2.i \ - $(usrp2_swiginclude_headers) +usrp2_swig_swiginclude_HEADERS = \ + usrp2_swig.i \ + $(usrp2_swig_swiginclude_headers) if PYTHON -usrp2_pylib_LTLIBRARIES = \ - _usrp2.la +usrp2_swig_pylib_LTLIBRARIES = \ + _usrp2_swig.la -_usrp2_la_SOURCES = \ - python/usrp2.cc \ - $(usrp2_la_swig_sources) +_usrp2_swig_la_SOURCES = \ + python/usrp2_swig.cc \ + $(usrp2_swig_la_swig_sources) -usrp2_python_PYTHON = \ - usrp2.py \ - $(usrp2_python) +usrp2_swig_python_PYTHON = \ + usrp2_swig.py \ + $(usrp2_swig_python) -_usrp2_la_LIBADD = \ +_usrp2_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(usrp2_la_swig_libadd) + $(usrp2_swig_la_swig_libadd) -_usrp2_la_LDFLAGS = \ +_usrp2_swig_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(usrp2_la_swig_ldflags) + $(usrp2_swig_la_swig_ldflags) -_usrp2_la_CXXFLAGS = \ +_usrp2_swig_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(usrp2_la_swig_cxxflags) + $(usrp2_swig_la_swig_cxxflags) -python/usrp2.cc: usrp2.py -usrp2.py: usrp2.i +python/usrp2_swig.cc: usrp2_swig.py +usrp2_swig.py: usrp2_swig.i # Include the python dependencies for this file --include python/usrp2.d +-include python/usrp2_swig.d endif # end of if python if GUILE -usrp2_scmlib_LTLIBRARIES = \ - libguile-gnuradio-usrp2.la -libguile_gnuradio_usrp2_la_SOURCES = \ - guile/usrp2.cc \ - $(usrp2_la_swig_sources) -nobase_usrp2_scm_DATA = \ - gnuradio/usrp2.scm \ - gnuradio/usrp2-primitive.scm -libguile_gnuradio_usrp2_la_LIBADD = \ +usrp2_swig_scmlib_LTLIBRARIES = \ + libguile-gnuradio-usrp2_swig.la +libguile_gnuradio_usrp2_swig_la_SOURCES = \ + guile/usrp2_swig.cc \ + $(usrp2_swig_la_swig_sources) +nobase_usrp2_swig_scm_DATA = \ + gnuradio/usrp2_swig.scm \ + gnuradio/usrp2_swig-primitive.scm +libguile_gnuradio_usrp2_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(usrp2_la_swig_libadd) -libguile_gnuradio_usrp2_la_LDFLAGS = \ + $(usrp2_swig_la_swig_libadd) +libguile_gnuradio_usrp2_swig_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(usrp2_la_swig_ldflags) -libguile_gnuradio_usrp2_la_CXXFLAGS = \ + $(usrp2_swig_la_swig_ldflags) +libguile_gnuradio_usrp2_swig_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(usrp2_la_swig_cxxflags) + $(usrp2_swig_la_swig_cxxflags) -guile/usrp2.cc: gnuradio/usrp2.scm -gnuradio/usrp2.scm: usrp2.i -gnuradio/usrp2-primitive.scm: gnuradio/usrp2.scm +guile/usrp2_swig.cc: gnuradio/usrp2_swig.scm +gnuradio/usrp2_swig.scm: usrp2_swig.i +gnuradio/usrp2_swig-primitive.scm: gnuradio/usrp2_swig.scm # Include the guile dependencies for this file --include guile/usrp2.d +-include guile/usrp2_swig.d endif # end of GUILE diff --git a/gr-usrp2/src/__init__.py b/gr-usrp2/src/__init__.py new file mode 100644 index 000000000..fd4289af5 --- /dev/null +++ b/gr-usrp2/src/__init__.py @@ -0,0 +1,28 @@ +# +# Copyright 2008,2010 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. +# + +# The presence of this file turns this directory into a Python package + +# Add SWIG generated code to this namespace +from usrp2_swig import * + +# Add other content from pure-Python modules here + diff --git a/gr-usrp2/src/qa_usrp2.py b/gr-usrp2/src/qa_usrp2.py index cc994b1e9..33e44aeed 100755 --- a/gr-usrp2/src/qa_usrp2.py +++ b/gr-usrp2/src/qa_usrp2.py @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -import usrp2 +import usrp2_swig class test_usrp2(gr_unittest.TestCase): diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i deleted file mode 100644 index f99eed402..000000000 --- a/gr-usrp2/src/usrp2.i +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2008,2009 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 "gnuradio.i" // the common stuff -%import - -%{ -#include "usrp2_source_16sc.h" -#include "usrp2_source_32fc.h" -#include "usrp2_sink_16sc.h" -#include "usrp2_sink_32fc.h" -%} - -%include -%include -%include - -%template(uint32_t_vector) std::vector; - -// ---------------------------------------------------------------- - -class usrp2_base : public gr_sync_block -{ -protected: - usrp2_base() throw (std::runtime_error); - -public: - ~usrp2_base(); - - std::string mac_addr() const; - std::string interface_name() const; - %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq; - bool fpga_master_clock_freq(long *freq); - bool config_mimo(int flags); - bool sync_to_pps(); - bool sync_every_pps(bool enable); - std::vector peek32(uint32_t addr, uint32_t words); - bool poke32(uint32_t addr, const std::vector &data); -}; - -// ---------------------------------------------------------------- - -class usrp2_source_base : public usrp2_base -{ -protected: - usrp2_source_base() throw (std::runtime_error); - -public: - ~usrp2_source_base(); - - bool set_antenna(int ant); - bool set_gain(double gain); - %rename(_real_set_center_freq) set_center_freq; - bool set_lo_offset(double frequency); - bool set_center_freq(double frequency, usrp2::tune_result *r); - bool set_decim(int decimation_factor); - bool set_scale_iq(int scale_i, int scale_q); - int decim(); - %rename(_real_adc_rate) adc_rate; - bool adc_rate(long *rate); - double gain_min(); - double gain_max(); - double gain_db_per_step(); - double freq_min(); - double freq_max(); - %rename(_real_daughterboard_id) daughterboard_id; - bool daughterboard_id(int *dbid); - unsigned int overruns(); - unsigned int missing(); - bool set_gpio_ddr(uint16_t value, uint16_t mask); - bool set_gpio_sels(std::string sels); - bool write_gpio(uint16_t value, uint16_t mask); - %rename(_real_read_gpio) read_gpio; - bool read_gpio(uint16_t *value); - bool enable_gpio_streaming(int enable); -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(usrp2,source_32fc) - -usrp2_source_32fc_sptr -usrp2_make_source_32fc(const std::string ifc="eth0", - const std::string mac="") - throw (std::runtime_error); - -class usrp2_source_32fc : public usrp2_source_base -{ -protected: - usrp2_source_32fc(const std::string &ifc, const std::string &mac); - -public: - ~usrp2_source_32fc(); -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(usrp2,source_16sc) - -usrp2_source_16sc_sptr -usrp2_make_source_16sc(const std::string ifc="eth0", - const std::string mac="") - throw (std::runtime_error); - -class usrp2_source_16sc : public usrp2_source_base -{ -protected: - usrp2_source_16sc(const std::string &ifc, const std::string &mac); - -public: - ~usrp2_source_16sc(); -}; - -// ---------------------------------------------------------------- - -class usrp2_sink_base : public usrp2_base -{ -protected: - usrp2_sink_base() throw (std::runtime_error); - -public: - ~usrp2_sink_base(); - - bool set_antenna(int ant); - bool set_gain(double gain); - %rename(_real_set_center_freq) set_center_freq; - bool set_lo_offset(double frequency); - bool set_center_freq(double frequency, usrp2::tune_result *r); - bool set_interp(int interp_factor); - bool set_scale_iq(int scale_i, int scale_q); - int interp(); - %rename(_real_default_tx_scale_iq) default_scale_iq; - void default_scale_iq(int interp, int *scale_i, int *scale_q); - %rename(_real_dac_rate) dac_rate; - bool dac_rate(long *rate); - double gain_min(); - double gain_max(); - double gain_db_per_step(); - double freq_min(); - double freq_max(); - %rename(_real_daughterboard_id) daughterboard_id; - bool daughterboard_id(int *dbid); - bool set_gpio_ddr(uint16_t value, uint16_t mask); - bool set_gpio_sels(std::string sels); - bool write_gpio(uint16_t value, uint16_t mask); - %rename(_real_read_gpio) read_gpio; - bool read_gpio(uint16_t *value); - bool start_streaming_at(usrp2::fpga_timestamp time); -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(usrp2,sink_32fc) - -usrp2_sink_32fc_sptr -usrp2_make_sink_32fc(const std::string ifc="eth0", - const std::string mac="") - throw (std::runtime_error); - -class usrp2_sink_32fc : public usrp2_sink_base -{ -protected: - usrp2_sink_32fc(const std::string &ifc, const std::string &mac); - -public: - ~usrp2_sink_32fc(); -}; - -// ---------------------------------------------------------------- - -GR_SWIG_BLOCK_MAGIC(usrp2,sink_16sc) - -usrp2_sink_16sc_sptr -usrp2_make_sink_16sc(const std::string ifc="eth0", - const std::string mac="") - throw (std::runtime_error); - -class usrp2_sink_16sc : public usrp2_sink_base -{ -protected: - usrp2_sink_16sc(const std::string &ifc, const std::string &mac); - -public: - ~usrp2_sink_16sc(); -}; - -// ---------------------------------------------------------------- - -// some utility functions to allow Python to deal with pointers -%{ - long *make_long_ptr() { return new long; } - long deref_long_ptr(long *l) { return *l; } - void free_long_ptr(long *l) { delete l; } - int *make_int_ptr() { return new int; } - int deref_int_ptr(int *l) { return *l; } - void free_int_ptr(int *l) { delete l; } - uint16_t *make_uint16_ptr() { return new uint16_t; } - int deref_uint16_ptr(uint16_t *l) { return *l; } - void free_uint16_ptr(uint16_t *l) { delete l; } -%} - -long *make_long_ptr(); -long deref_long_ptr(long *l); -void free_long_ptr(long *l); -int *make_int_ptr(); -int deref_int_ptr(int *l); -void free_int_ptr(int *l); -uint16_t *make_uint16_ptr(); -int deref_uint16_ptr(uint16_t *l); -void free_uint16_ptr(uint16_t *l); - -#ifdef SWIGPYTHON -// create a more pythonic interface -%pythoncode %{ - -def __set_center_freq(self, freq): - tr = tune_result() - r = self._real_set_center_freq(freq, tr) - if r: - return tr - else: - return None - -def __fpga_master_clock_freq(self): - f = make_long_ptr(); - r = self._real_fpga_master_clock_freq(f) - if r: - result = deref_long_ptr(f) - else: - result = None - free_long_ptr(f) - return result - -def __adc_rate(self): - rate = make_long_ptr(); - r = self._real_adc_rate(rate) - if r: - result = deref_long_ptr(rate) - else: - result = None - free_long_ptr(rate) - return result - -def __dac_rate(self): - rate = make_long_ptr(); - r = self._real_dac_rate(rate) - if r: - result = deref_long_ptr(rate) - else: - result = None - free_long_ptr(rate) - return result - -def __gain_range(self): - return [self.gain_min(), - self.gain_max(), - self.gain_db_per_step()] - -# NOTE: USRP1 uses a length three tuple here (3rd value is 'freq step'), -# but it's not really useful. We let an index error happen here -# to identify code using it. -def __freq_range(self): - return [self.freq_min(), - self.freq_max()] - -def __daughterboard_id(self): - dbid = make_int_ptr() - r = self._real_daughterboard_id(dbid) - if r: - result = deref_int_ptr(dbid) - else: - result = None - free_int_ptr(dbid) - return result - -def __default_tx_scale_iq(self, interp): - scale_i = make_int_ptr() - scale_q = make_int_ptr() - self._real_default_tx_scale_iq(interp, scale_i, scale_q) - return (deref_int_ptr(scale_i), deref_int_ptr(scale_q)) - -def __read_gpio(self): - value = make_uint16_ptr() - r = self._real_read_gpio(value) - if r: - result = deref_uint16_ptr(value) - else: - result = None - free_uint16_ptr(value) - return result - - -usrp2_source_32fc_sptr.set_center_freq = __set_center_freq -usrp2_source_16sc_sptr.set_center_freq = __set_center_freq -usrp2_sink_32fc_sptr.set_center_freq = __set_center_freq -usrp2_sink_16sc_sptr.set_center_freq = __set_center_freq - -usrp2_source_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq -usrp2_source_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq -usrp2_sink_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq -usrp2_sink_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq - -usrp2_source_32fc_sptr.adc_rate = __adc_rate -usrp2_source_16sc_sptr.adc_rate = __adc_rate -usrp2_sink_32fc_sptr.dac_rate = __dac_rate -usrp2_sink_16sc_sptr.dac_rate = __dac_rate - -usrp2_source_32fc_sptr.gain_range = __gain_range -usrp2_source_16sc_sptr.gain_range = __gain_range -usrp2_sink_32fc_sptr.gain_range = __gain_range -usrp2_sink_16sc_sptr.gain_range = __gain_range - -usrp2_source_32fc_sptr.freq_range = __freq_range -usrp2_source_16sc_sptr.freq_range = __freq_range -usrp2_sink_32fc_sptr.freq_range = __freq_range -usrp2_sink_16sc_sptr.freq_range = __freq_range - -usrp2_source_32fc_sptr.daughterboard_id = __daughterboard_id -usrp2_source_16sc_sptr.daughterboard_id = __daughterboard_id -usrp2_sink_32fc_sptr.daughterboard_id = __daughterboard_id -usrp2_sink_16sc_sptr.daughterboard_id = __daughterboard_id - -usrp2_sink_32fc_sptr.default_scale_iq = __default_tx_scale_iq -usrp2_sink_16sc_sptr.default_scale_iq = __default_tx_scale_iq - -usrp2_source_32fc_sptr.read_gpio = __read_gpio -usrp2_source_16sc_sptr.read_gpio = __read_gpio -usrp2_sink_32fc_sptr.read_gpio = __read_gpio -usrp2_sink_16sc_sptr.read_gpio = __read_gpio - -%} -#warning "usrp2.i needs to be implemented fr guile!" -#endif - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-usrp2" "scm_init_gnuradio_usrp2_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif diff --git a/gr-usrp2/src/usrp2_swig.i b/gr-usrp2/src/usrp2_swig.i new file mode 100644 index 000000000..ef598d7d9 --- /dev/null +++ b/gr-usrp2/src/usrp2_swig.i @@ -0,0 +1,362 @@ +/* -*- c++ -*- */ +/* + * Copyright 2008,2009 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 "gnuradio.i" // the common stuff +%import + +%{ +#include "usrp2_source_16sc.h" +#include "usrp2_source_32fc.h" +#include "usrp2_sink_16sc.h" +#include "usrp2_sink_32fc.h" +%} + +%include +%include +%include + +%template(uint32_t_vector) std::vector; + +// ---------------------------------------------------------------- + +class usrp2_base : public gr_sync_block +{ +protected: + usrp2_base() throw (std::runtime_error); + +public: + ~usrp2_base(); + + std::string mac_addr() const; + std::string interface_name() const; + %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq; + bool fpga_master_clock_freq(long *freq); + bool config_mimo(int flags); + bool sync_to_pps(); + bool sync_every_pps(bool enable); + std::vector peek32(uint32_t addr, uint32_t words); + bool poke32(uint32_t addr, const std::vector &data); +}; + +// ---------------------------------------------------------------- + +class usrp2_source_base : public usrp2_base +{ +protected: + usrp2_source_base() throw (std::runtime_error); + +public: + ~usrp2_source_base(); + + bool set_antenna(int ant); + bool set_gain(double gain); + %rename(_real_set_center_freq) set_center_freq; + bool set_lo_offset(double frequency); + bool set_center_freq(double frequency, usrp2::tune_result *r); + bool set_decim(int decimation_factor); + bool set_scale_iq(int scale_i, int scale_q); + int decim(); + %rename(_real_adc_rate) adc_rate; + bool adc_rate(long *rate); + double gain_min(); + double gain_max(); + double gain_db_per_step(); + double freq_min(); + double freq_max(); + %rename(_real_daughterboard_id) daughterboard_id; + bool daughterboard_id(int *dbid); + unsigned int overruns(); + unsigned int missing(); + bool set_gpio_ddr(uint16_t value, uint16_t mask); + bool set_gpio_sels(std::string sels); + bool write_gpio(uint16_t value, uint16_t mask); + %rename(_real_read_gpio) read_gpio; + bool read_gpio(uint16_t *value); + bool enable_gpio_streaming(int enable); +}; + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(usrp2,source_32fc) + +usrp2_source_32fc_sptr +usrp2_make_source_32fc(const std::string ifc="eth0", + const std::string mac="") + throw (std::runtime_error); + +class usrp2_source_32fc : public usrp2_source_base +{ +protected: + usrp2_source_32fc(const std::string &ifc, const std::string &mac); + +public: + ~usrp2_source_32fc(); +}; + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(usrp2,source_16sc) + +usrp2_source_16sc_sptr +usrp2_make_source_16sc(const std::string ifc="eth0", + const std::string mac="") + throw (std::runtime_error); + +class usrp2_source_16sc : public usrp2_source_base +{ +protected: + usrp2_source_16sc(const std::string &ifc, const std::string &mac); + +public: + ~usrp2_source_16sc(); +}; + +// ---------------------------------------------------------------- + +class usrp2_sink_base : public usrp2_base +{ +protected: + usrp2_sink_base() throw (std::runtime_error); + +public: + ~usrp2_sink_base(); + + bool set_antenna(int ant); + bool set_gain(double gain); + %rename(_real_set_center_freq) set_center_freq; + bool set_lo_offset(double frequency); + bool set_center_freq(double frequency, usrp2::tune_result *r); + bool set_interp(int interp_factor); + bool set_scale_iq(int scale_i, int scale_q); + int interp(); + %rename(_real_default_tx_scale_iq) default_scale_iq; + void default_scale_iq(int interp, int *scale_i, int *scale_q); + %rename(_real_dac_rate) dac_rate; + bool dac_rate(long *rate); + double gain_min(); + double gain_max(); + double gain_db_per_step(); + double freq_min(); + double freq_max(); + %rename(_real_daughterboard_id) daughterboard_id; + bool daughterboard_id(int *dbid); + bool set_gpio_ddr(uint16_t value, uint16_t mask); + bool set_gpio_sels(std::string sels); + bool write_gpio(uint16_t value, uint16_t mask); + %rename(_real_read_gpio) read_gpio; + bool read_gpio(uint16_t *value); + bool start_streaming_at(usrp2::fpga_timestamp time); +}; + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(usrp2,sink_32fc) + +usrp2_sink_32fc_sptr +usrp2_make_sink_32fc(const std::string ifc="eth0", + const std::string mac="") + throw (std::runtime_error); + +class usrp2_sink_32fc : public usrp2_sink_base +{ +protected: + usrp2_sink_32fc(const std::string &ifc, const std::string &mac); + +public: + ~usrp2_sink_32fc(); +}; + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(usrp2,sink_16sc) + +usrp2_sink_16sc_sptr +usrp2_make_sink_16sc(const std::string ifc="eth0", + const std::string mac="") + throw (std::runtime_error); + +class usrp2_sink_16sc : public usrp2_sink_base +{ +protected: + usrp2_sink_16sc(const std::string &ifc, const std::string &mac); + +public: + ~usrp2_sink_16sc(); +}; + +// ---------------------------------------------------------------- + +// some utility functions to allow Python to deal with pointers +%{ + long *make_long_ptr() { return new long; } + long deref_long_ptr(long *l) { return *l; } + void free_long_ptr(long *l) { delete l; } + int *make_int_ptr() { return new int; } + int deref_int_ptr(int *l) { return *l; } + void free_int_ptr(int *l) { delete l; } + uint16_t *make_uint16_ptr() { return new uint16_t; } + int deref_uint16_ptr(uint16_t *l) { return *l; } + void free_uint16_ptr(uint16_t *l) { delete l; } +%} + +long *make_long_ptr(); +long deref_long_ptr(long *l); +void free_long_ptr(long *l); +int *make_int_ptr(); +int deref_int_ptr(int *l); +void free_int_ptr(int *l); +uint16_t *make_uint16_ptr(); +int deref_uint16_ptr(uint16_t *l); +void free_uint16_ptr(uint16_t *l); + +#ifdef SWIGPYTHON +// create a more pythonic interface +%pythoncode %{ + +def __set_center_freq(self, freq): + tr = tune_result() + r = self._real_set_center_freq(freq, tr) + if r: + return tr + else: + return None + +def __fpga_master_clock_freq(self): + f = make_long_ptr(); + r = self._real_fpga_master_clock_freq(f) + if r: + result = deref_long_ptr(f) + else: + result = None + free_long_ptr(f) + return result + +def __adc_rate(self): + rate = make_long_ptr(); + r = self._real_adc_rate(rate) + if r: + result = deref_long_ptr(rate) + else: + result = None + free_long_ptr(rate) + return result + +def __dac_rate(self): + rate = make_long_ptr(); + r = self._real_dac_rate(rate) + if r: + result = deref_long_ptr(rate) + else: + result = None + free_long_ptr(rate) + return result + +def __gain_range(self): + return [self.gain_min(), + self.gain_max(), + self.gain_db_per_step()] + +# NOTE: USRP1 uses a length three tuple here (3rd value is 'freq step'), +# but it's not really useful. We let an index error happen here +# to identify code using it. +def __freq_range(self): + return [self.freq_min(), + self.freq_max()] + +def __daughterboard_id(self): + dbid = make_int_ptr() + r = self._real_daughterboard_id(dbid) + if r: + result = deref_int_ptr(dbid) + else: + result = None + free_int_ptr(dbid) + return result + +def __default_tx_scale_iq(self, interp): + scale_i = make_int_ptr() + scale_q = make_int_ptr() + self._real_default_tx_scale_iq(interp, scale_i, scale_q) + return (deref_int_ptr(scale_i), deref_int_ptr(scale_q)) + +def __read_gpio(self): + value = make_uint16_ptr() + r = self._real_read_gpio(value) + if r: + result = deref_uint16_ptr(value) + else: + result = None + free_uint16_ptr(value) + return result + + +usrp2_source_32fc_sptr.set_center_freq = __set_center_freq +usrp2_source_16sc_sptr.set_center_freq = __set_center_freq +usrp2_sink_32fc_sptr.set_center_freq = __set_center_freq +usrp2_sink_16sc_sptr.set_center_freq = __set_center_freq + +usrp2_source_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq +usrp2_source_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq +usrp2_sink_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq +usrp2_sink_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq + +usrp2_source_32fc_sptr.adc_rate = __adc_rate +usrp2_source_16sc_sptr.adc_rate = __adc_rate +usrp2_sink_32fc_sptr.dac_rate = __dac_rate +usrp2_sink_16sc_sptr.dac_rate = __dac_rate + +usrp2_source_32fc_sptr.gain_range = __gain_range +usrp2_source_16sc_sptr.gain_range = __gain_range +usrp2_sink_32fc_sptr.gain_range = __gain_range +usrp2_sink_16sc_sptr.gain_range = __gain_range + +usrp2_source_32fc_sptr.freq_range = __freq_range +usrp2_source_16sc_sptr.freq_range = __freq_range +usrp2_sink_32fc_sptr.freq_range = __freq_range +usrp2_sink_16sc_sptr.freq_range = __freq_range + +usrp2_source_32fc_sptr.daughterboard_id = __daughterboard_id +usrp2_source_16sc_sptr.daughterboard_id = __daughterboard_id +usrp2_sink_32fc_sptr.daughterboard_id = __daughterboard_id +usrp2_sink_16sc_sptr.daughterboard_id = __daughterboard_id + +usrp2_sink_32fc_sptr.default_scale_iq = __default_tx_scale_iq +usrp2_sink_16sc_sptr.default_scale_iq = __default_tx_scale_iq + +usrp2_source_32fc_sptr.read_gpio = __read_gpio +usrp2_source_16sc_sptr.read_gpio = __read_gpio +usrp2_sink_32fc_sptr.read_gpio = __read_gpio +usrp2_sink_16sc_sptr.read_gpio = __read_gpio + +%} +#warning "usrp2.i needs to be implemented fr guile!" +#endif + +#if SWIGGUILE +%scheme %{ +(load-extension-global "libguile-gnuradio-usrp2_swig" "scm_init_gnuradio_usrp2_swig_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif -- cgit From f290f9e4f1a9b9ca09ef95269d563cd785b08a61 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 18:46:54 -0800 Subject: Add minimal guile test code gr-usrp2. --- gr-usrp2/src/.gitignore | 1 + gr-usrp2/src/Makefile.am | 14 ++++++-------- gr-usrp2/src/run_guile_tests.in | 14 ++++++++++++++ gr-usrp2/src/usrp2.test | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 gr-usrp2/src/run_guile_tests.in create mode 100644 gr-usrp2/src/usrp2.test (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index e167cdecc..dd3d18d43 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -12,3 +12,4 @@ /guile /python /usrp2_swig.py +/run_guile_tests diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index e2cca8b3c..08c41f772 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -23,9 +23,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST += run_tests.in -DISTCLEANFILES += run_tests - +EXTRA_DIST += run_tests.in run_guile_tests.in +DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp2.py @@ -33,11 +32,6 @@ if GUILE nobase_guile_DATA = gnuradio/usrp2.scm endif - -# ---------------------------------------------------------------------- -# Miscellaneous build operations -# ---------------------------------------------------------------------- - # ---------------------------------------------------------------------- # C++ block API interface librar(ies) # @@ -114,3 +108,7 @@ usrp2_swig_python = \ if PYTHON TESTS += run_tests endif + +if GUILE +TESTS += run_guile_tests +endif diff --git a/gr-usrp2/src/run_guile_tests.in b/gr-usrp2/src/run_guile_tests.in new file mode 100644 index 000000000..5d08b0dd5 --- /dev/null +++ b/gr-usrp2/src/run_guile_tests.in @@ -0,0 +1,14 @@ +#!/bin/sh + +. @top_builddir@/setup_guile_test_env + +# 1st argument is absolute path to hand coded guile source directory +# 2nd argument is absolute path to component C++ shared library build directory +# 3nd argument is absolute path to component SWIG build directory + +add_local_paths \ + @srcdir@ \ + @abs_builddir@ \ + @abs_builddir@ + +@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@ diff --git a/gr-usrp2/src/usrp2.test b/gr-usrp2/src/usrp2.test new file mode 100644 index 000000000..69544c5e6 --- /dev/null +++ b/gr-usrp2/src/usrp2.test @@ -0,0 +1,37 @@ +;;; -*- Scheme -*- +;;; +;;; Copyright 2010 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 this program. If not, see . +;;; + +;;; If you're using Emacs's Scheme mode: +;;; (put 'with-test-prefix 'scheme-indent-function 1) + +;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests. +;;; See also the very end of the file, where the test-equal, test-eqv +;;; and test-eq macros are defined. + +(define-module (test-module) + #:use-module (oop goops) + #:use-module (gnuradio core) + #:use-module (gnuradio test-suite lib) + #:duplicates (merge-generics replace check)) + +;;; Just see if we can import the module... +;;; They may not have a USRP2 attached, powered up etc. + +(use-modules (gnuradio usrp2)) -- cgit From 63fce8a97ed3f6bd1e739615246bf8149207d79c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 20:07:16 -0800 Subject: Add scheme-ish convenience functions to usrp2.scm. --- gr-usrp2/src/.gitignore | 1 - gr-usrp2/src/gnuradio/.gitignore | 2 + gr-usrp2/src/gnuradio/usrp2.scm | 79 ++++++++++++++++++++++++++++++++++++++++ gr-usrp2/src/usrp2_swig.i | 1 - 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 gr-usrp2/src/gnuradio/.gitignore create mode 100644 gr-usrp2/src/gnuradio/usrp2.scm (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index dd3d18d43..71f825820 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -8,7 +8,6 @@ /run_tests /test_gr_usrp2 /*.pyc -/gnuradio /guile /python /usrp2_swig.py diff --git a/gr-usrp2/src/gnuradio/.gitignore b/gr-usrp2/src/gnuradio/.gitignore new file mode 100644 index 000000000..3c1ff87f5 --- /dev/null +++ b/gr-usrp2/src/gnuradio/.gitignore @@ -0,0 +1,2 @@ +usrp2_swig.scm +usrp2_swig-primitive.scm diff --git a/gr-usrp2/src/gnuradio/usrp2.scm b/gr-usrp2/src/gnuradio/usrp2.scm new file mode 100644 index 000000000..7ead5015d --- /dev/null +++ b/gr-usrp2/src/gnuradio/usrp2.scm @@ -0,0 +1,79 @@ +;;; +;;; Copyright 2010 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 this program. If not, see . +;;; + +;;; Module that re-exports the usrp2_swig module and adds convenience functions + +(define-module (gnuradio usrp2) + #:use-module (oop goops) + #:use-module (gnuradio export-safely) + #:use-module (gnuradio usrp2_swig) + #:duplicates (merge-generics replace check)) + +(re-export-all '(gnuradio usrp2_swig)) + +;; Utilities (guaranteed not to leak the allocated object) +(define (call-with-long-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-long-ptr))) + (lambda () (and (fn ptr) (gr:deref-long-ptr ptr))) + (lambda () (gr:free-long-ptr ptr))))) + +(define (call-with-int-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-int-ptr))) + (lambda () (and (fn ptr) (gr:deref-int-ptr ptr))) + (lambda () (gr:free-int-ptr ptr))))) + +(define (call-with-uint16-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-uint16-ptr))) + (lambda () (and (fn ptr) (gr:deref-uint16-ptr ptr))) + (lambda () (gr:free-uint16-ptr ptr))))) + + +;;; scheme-ish convenience functions + +(define-method (gr:set-center-freq self freq) + (let ((tr (make ))) + (if (gr:-real-set-center-freq self freq tr) + tr + #f))) + +(define-method (gr:fpga-master-clock-freq self) + (call-with-long-ptr (lambda (ptr) (gr:-real-fpga-master-clock-freq self ptr)))) + +(define-method (gr:adc-rate self) + (call-with-long-ptr (lambda (ptr) (gr:-real-adc-rate self ptr)))) + +(define-method (gr:dac-rate self) + (call-with-long-ptr (lambda (ptr) (gr:-real-dac-rate self ptr)))) + +(define-method (gr:daughterboard-id self) + (call-with-int-ptr (lambda (ptr) (gr:-real-daugherboard-id self ptr)))) + +;; (define-method (gr:default-tx-scale-iq self) ...) FIXME + +(define-method (gr:read-gpio self) + (call-with-uint16-ptr (lambda (ptr) (gr:-real-read-gpio self ptr)))) + +;; Export them +(export-safely gr:set-center-freq gr:fpga-master-clock-freq gr:adc-rate gr:dac-rate gr:daughterboard-id gr:read-gpio) diff --git a/gr-usrp2/src/usrp2_swig.i b/gr-usrp2/src/usrp2_swig.i index ef598d7d9..6e8fa1960 100644 --- a/gr-usrp2/src/usrp2_swig.i +++ b/gr-usrp2/src/usrp2_swig.i @@ -348,7 +348,6 @@ usrp2_sink_32fc_sptr.read_gpio = __read_gpio usrp2_sink_16sc_sptr.read_gpio = __read_gpio %} -#warning "usrp2.i needs to be implemented fr guile!" #endif #if SWIGGUILE -- cgit From 3153f8f24b933043d937de32d65fe5d96652ec56 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 20:34:30 -0800 Subject: distcheck fix --- gr-usrp2/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 08c41f772..d9599bb78 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig TESTS = -EXTRA_DIST += run_tests.in run_guile_tests.in +EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp2.py -- cgit From fd8f86713d8f9de79850b9e7aabde7c453b7e890 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 22:56:47 -0800 Subject: Add missing .test files to tarball. --- gr-usrp2/src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-usrp2') diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index d9599bb78..a84637f73 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp2.py +noinst_GUILE = usrp2.test if GUILE nobase_guile_DATA = gnuradio/usrp2.scm -- cgit From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 13 Mar 2011 17:33:33 -0700 Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons. --- gr-usrp2/Makefile.am | 6 +- gr-usrp2/grc/.gitignore | 2 + gr-usrp2/grc/Makefile.am | 33 ++++++ gr-usrp2/grc/gnuradio-usrp2_probe.desktop | 7 ++ gr-usrp2/grc/usrp2_probe | 163 ++++++++++++++++++++++++++++++ gr-usrp2/grc/usrp2_probe.xml | 33 ++++++ gr-usrp2/grc/usrp2_sink_xxxx.xml | 121 ++++++++++++++++++++++ gr-usrp2/grc/usrp2_source_xxxx.xml | 119 ++++++++++++++++++++++ 8 files changed, 483 insertions(+), 1 deletion(-) create mode 100644 gr-usrp2/grc/.gitignore create mode 100644 gr-usrp2/grc/Makefile.am create mode 100644 gr-usrp2/grc/gnuradio-usrp2_probe.desktop create mode 100755 gr-usrp2/grc/usrp2_probe create mode 100644 gr-usrp2/grc/usrp2_probe.xml create mode 100644 gr-usrp2/grc/usrp2_sink_xxxx.xml create mode 100644 gr-usrp2/grc/usrp2_source_xxxx.xml (limited to 'gr-usrp2') diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am index 2a0fbe203..f6120884a 100644 --- a/gr-usrp2/Makefile.am +++ b/gr-usrp2/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2001,2006,2008,2009,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,5 +23,9 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +if PYTHON +SUBDIRS += grc +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnuradio-usrp2.pc diff --git a/gr-usrp2/grc/.gitignore b/gr-usrp2/grc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-usrp2/grc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-usrp2/grc/Makefile.am b/gr-usrp2/grc/Makefile.am new file mode 100644 index 000000000..2502bf363 --- /dev/null +++ b/gr-usrp2/grc/Makefile.am @@ -0,0 +1,33 @@ +# +# 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. +# + +include $(top_srcdir)/Makefile.common + +dist_bin_SCRIPTS = usrp2_probe + +grcblocksdir = $(grc_blocksdir) +dist_grcblocks_DATA = \ + usrp2_probe.xml \ + usrp2_source_xxxx.xml \ + usrp2_sink_xxxx.xml + +ourdatadir = $(pkgdatadir)/grc/freedesktop +dist_ourdata_DATA = gnuradio-usrp2_probe.desktop diff --git a/gr-usrp2/grc/gnuradio-usrp2_probe.desktop b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop new file mode 100644 index 000000000..c71a092b1 --- /dev/null +++ b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP2 Probe +Exec=usrp2_probe +Categories=Development; +Icon=gnuradio-grc diff --git a/gr-usrp2/grc/usrp2_probe b/gr-usrp2/grc/usrp2_probe new file mode 100755 index 000000000..38c8f655c --- /dev/null +++ b/gr-usrp2/grc/usrp2_probe @@ -0,0 +1,163 @@ +#!/usr/bin/env python +""" +Copyright 2009 Free Software Foundation, Inc. +This file is part of GNU Radio + +GNU Radio Companion 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 2 +of the License, or (at your option) any later version. + +GNU Radio Companion 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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +""" + +from gnuradio import usrp2 +import subprocess +import os + +import pygtk +pygtk.require('2.0') +import gtk +import gobject + +from gnuradio.grc.gui.Dialogs import TextDisplay + +from gnuradio.grc.python.Platform import Platform +platform = Platform() + +flow_graph = platform.get_new_flow_graph() +block = flow_graph.get_new_block('usrp2_probe') + +##all params +usrp_interface_param = block.get_param('interface') +usrp_type_param = block.get_param('type') + +def get_input(param): + param.validate() + input = param.get_input() + return input + +class USRP2ProbeWindow(gtk.Window): + """ + The main window for USRP Dignostics. + """ + + def delete_event(self, widget, event, data=None): return False + + def destroy(self, widget, data=None): gtk.main_quit() + + def __init__(self): + """ + USRP2ProbeWindow contructor. + Create a new gtk Dialog with a close button, USRP2 input paramaters, and output labels. + """ + self.usrp2_macs = list() + gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) + #quit signals + self.connect("delete_event", self.delete_event) + self.connect("destroy", self.destroy) + #set the title + self.set_title('USRP2 Probe') + #create decorative frame + frame = gtk.Frame() + self.add(frame) + #create vbox for storage + vbox = gtk.VBox() + frame.add(vbox) + vbox.pack_start(get_input(usrp_interface_param), False) + vbox.pack_start(get_input(usrp_type_param), False) + #make the tree model for holding mac addrs + self.treestore = gtk.TreeStore(gobject.TYPE_STRING) + self.treeview = gtk.TreeView(self.treestore) + self.treeview.set_enable_search(False) #disable pop up search box + self.treeview.add_events(gtk.gdk.BUTTON_PRESS_MASK) + self.treeview.connect('button_press_event', self._handle_selection) + selection = self.treeview.get_selection() + selection.set_mode('single') + selection.connect('changed', self._handle_selection) + renderer = gtk.CellRendererText() + column = gtk.TreeViewColumn('Select a USRP2 MAC Address', renderer, text=0) + self.treeview.append_column(column) + vbox.pack_start(self.treeview, False) + #create probe button + self.probe_button = gtk.Button('Probe') + self.probe_button.connect('clicked', self._probe_usrp2) + vbox.pack_start(self.probe_button, False) + #Create a text box for USRP queries + self.query_buffer = TextDisplay() + self.query_buffer.set_text(block.get_doc()) + vbox.pack_start(self.query_buffer) + self.show_all() + self.treeview.hide() + + def _probe_usrp2(self, widget=None): + """Probe the USRP2 device and copy the results into the query text box.""" + #call find usrps + args = ['find_usrps'] + interface = usrp_interface_param.evaluate() + if interface: args.extend(['-e', interface]) + p = subprocess.Popen(args=args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, universal_newlines=True) + msg = p.stdout.read() + #extract mac addrs + self.usrp2_macs = sorted(map(lambda l: l.split()[0], filter(lambda l: l.count(':') >= 5, msg.strip().splitlines()))) + #set the tree store with the mac addrs + self.treestore.clear() + for usrp2_mac in self.usrp2_macs: self.treestore.append(None, (usrp2_mac,)) + #set the text with the error message for 0 found, hide the list + #when only 1 usrp2, auto handle selection, hide the list + #for multiple usrp2, show the list + if not self.usrp2_macs: + self.treeview.hide() + self.query_buffer.set_text(msg) + elif len(self.usrp2_macs) == 1: + self.treeview.hide() + self.query_buffer.set_text('') + self._handle_selection() + else: + self.treeview.show() + self.query_buffer.set_text('') + + def _handle_selection(self, *args, **kwargs): + """A selection change or click occured.""" + #get the mac addr + selection = self.treeview.get_selection() + treestore, iter = selection.get_selected() + mac_addr = iter and treestore.get_value(iter, 0) or '' + if not mac_addr and len(self.usrp2_macs) > 1: + return #no empty mac addrs for when multiple found + #make the usrp2 object + make, rate_attr = { + 'rx': (usrp2.source_32fc, 'adc_rate'), + 'tx': (usrp2.sink_32fc, 'dac_rate'), + }[usrp_type_param.evaluate()] + interface = usrp_interface_param.evaluate() + try: + if not interface and not mac_addr: u = make() + elif not mac_addr: u = make(interface) + else: u = make(interface, mac_addr) + msg = ">>> USRP2 Probe\n" + msg = "%s\nMAC Addr:\n\t%s\n"%(msg, u.mac_addr()) + msg = "%s\nName (ID):\n\t%s\n"%(msg, u.daughterboard_id()) + msg = "%s\nConverter Rate:\n\t%s Hz\n"%(msg, getattr(u, rate_attr)()) + gain_min, gain_max, gain_step = u.gain_range() + msg = "%s\nGain Range (min, max, step size):\n\t%s\n\t%s\n\t%s\n"%(msg, gain_min, gain_max, gain_step) + freq_min, freq_max = u.freq_range() + msg = "%s\nFreq Range (min, max):\n\t%s Hz\n\t%s Hz\n"%(msg, freq_min, freq_max) + self.query_buffer.set_text(msg) + except Exception, e: #display the error message + self.query_buffer.set_text('>>> Error\n%s'%str(e)) + +if __name__ == '__main__': + #setup icon using icon theme + try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0)) + except: pass + #enter the mainloop + USRP2ProbeWindow() + gtk.main() diff --git a/gr-usrp2/grc/usrp2_probe.xml b/gr-usrp2/grc/usrp2_probe.xml new file mode 100644 index 000000000..cc3f9c2fd --- /dev/null +++ b/gr-usrp2/grc/usrp2_probe.xml @@ -0,0 +1,33 @@ + + + + USRP2 Probe + usrp2_probe + + + Interface + interface + + string + + + Type + type + rx + enum + + + + Press "Probe" to retrieve USRP2 information... + diff --git a/gr-usrp2/grc/usrp2_sink_xxxx.xml b/gr-usrp2/grc/usrp2_sink_xxxx.xml new file mode 100644 index 000000000..74995da99 --- /dev/null +++ b/gr-usrp2/grc/usrp2_sink_xxxx.xml @@ -0,0 +1,121 @@ + + + + USRP2 Sink + usrp2_sink_xxxx + USRP + from gnuradio import usrp2 + #if not $interface() and not $mac_addr() +usrp2.sink_$(type.fcn)() +#elif not $mac_addr() +usrp2.sink_$(type.fcn)($interface) +#else +usrp2.sink_$(type.fcn)($interface, $mac_addr) +#end if +self.$(id).set_interp($interpolation) +#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src) + set_interp($interpolation) + #if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) + set_gain($gain) + + Output Type + type + enum + + + + + Interface + interface + + string + + + MAC Addr + mac_addr + + string + + + Interpolation + interpolation + int + + + Frequency (Hz) + frequency + real + + + LO Offset (Hz) + lo_offset + float('inf') + real + #if $lo_offset() == float('inf') then 'part' else 'none'# + + + + Gain (dB) + gain + 0 + real + + + Clock Source + usrp2_clock_src + usrp2.MC_WE_DONT_LOCK + enum + + + + + + in + $type + $type.vlen + + +The USRP2 sink inputs 100 Megasamples per second / interpolation. + +Input amplitude should be between 0.0 and 1.0. + +To use the default ethernet device, leave interface blank. \ +For systems with only 1 USRP2, you may leave the mac address blank. \ +For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx. + + diff --git a/gr-usrp2/grc/usrp2_source_xxxx.xml b/gr-usrp2/grc/usrp2_source_xxxx.xml new file mode 100644 index 000000000..a23c5bc5c --- /dev/null +++ b/gr-usrp2/grc/usrp2_source_xxxx.xml @@ -0,0 +1,119 @@ + + + + USRP2 Source + usrp2_source_xxxx + USRP + from gnuradio import usrp2 + #if not $interface() and not $mac_addr() +usrp2.source_$(type.fcn)() +#elif not $mac_addr() +usrp2.source_$(type.fcn)($interface) +#else +usrp2.source_$(type.fcn)($interface, $mac_addr) +#end if +self.$(id).set_decim($decimation) +#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src) + set_decim($decimation) + #if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) + set_gain($gain) + + Output Type + type + enum + + + + + Interface + interface + + string + + + MAC Addr + mac_addr + + string + + + Decimation + decimation + int + + + Frequency (Hz) + frequency + real + + + LO Offset (Hz) + lo_offset + float('inf') + real + #if $lo_offset() == float('inf') then 'part' else 'none'# + + + + Gain (dB) + gain + 0 + real + + + Clock Source + usrp2_clock_src + usrp2.MC_WE_DONT_LOCK + enum + + + + + + out + $type + $type.vlen + + +The USRP2 source outputs 100 Megasamples per second / decimation. + +To use the default ethernet device, leave interface blank. \ +For systems with only 1 USRP2, you may leave the mac address blank. \ +For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx. + + -- cgit