[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3899 - in gnuradio/branches/developers/jcorgan/hier:
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3899 - in gnuradio/branches/developers/jcorgan/hier: . config gnuradio-examples gnuradio-examples/c++/dialtone gnuradio-examples/c++/usrp_wfm_rcv gr-audio-alsa/src gr-usrp/src |
|
Date: |
Mon, 30 Oct 2006 13:22:44 -0700 (MST) |
Author: jcorgan
Date: 2006-10-30 13:22:43 -0700 (Mon, 30 Oct 2006)
New Revision: 3899
Added:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/
Modified:
gnuradio/branches/developers/jcorgan/hier/config/grc_gnuradio_examples.m4
gnuradio/branches/developers/jcorgan/hier/configure.ac
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/Makefile.am
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
gnuradio/branches/developers/jcorgan/hier/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
Log:
Work in progress. Salvage C++ examples from discontinued 'cppwrap'
developer branch. Examples are not working yet but show the usage
model for the new hierarchical blocks from C++.
Modified:
gnuradio/branches/developers/jcorgan/hier/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/config/grc_gnuradio_examples.m4
2006-10-30 19:46:03 UTC (rev 3898)
+++ gnuradio/branches/developers/jcorgan/hier/config/grc_gnuradio_examples.m4
2006-10-30 20:22:43 UTC (rev 3899)
@@ -22,6 +22,9 @@
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
+ gnuradio-examples/c++/Makefile \
+ gnuradio-examples/c++/dialtone/Makefile \
+ gnuradio-examples/c++/usrp_wfm_rcv/Makefile \
gnuradio-examples/python/Makefile \
gnuradio-examples/python/apps/hf_explorer/Makefile \
gnuradio-examples/python/apps/hf_radio/Makefile \
Modified: gnuradio/branches/developers/jcorgan/hier/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/configure.ac 2006-10-30
19:46:03 UTC (rev 3898)
+++ gnuradio/branches/developers/jcorgan/hier/configure.ac 2006-10-30
20:22:43 UTC (rev 3899)
@@ -160,7 +160,6 @@
build_dirs="config"
GRC_GNURADIO_CORE
-GRC_GNURADIO_EXAMPLES
GRC_USRP
GRC_GR_USRP dnl this must come after GRC_USRP
GRC_GR_AUDIO_ALSA
@@ -183,6 +182,7 @@
GRC_EZDOP
GRC_GR_EZDOP dnl this must come after GRC_EZDOP
GRC_GR_RDF
+GRC_GNURADIO_EXAMPLES dnl must come last
# Each component is now either to be built, was skipped, or failed dependencies
AC_SUBST([build_dirs], [$build_dirs])
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/Makefile.am
2006-10-30 19:46:03 UTC (rev 3898)
+++ gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/Makefile.am
2006-10-30 20:22:43 UTC (rev 3899)
@@ -21,4 +21,4 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = python
+SUBDIRS = python c++
Copied: gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++ (from
rev 3898, gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++)
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/dialtone.cc
2006-10-30 19:46:03 UTC (rev 3898)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
2006-10-30 20:22:43 UTC (rev 3899)
@@ -21,23 +21,42 @@
#include <gr_sig_source_f.h>
#include <audio_alsa_sink.h>
-#include <gr_flow_graph.h>
+#include <gr_hier_block2.h>
+#include <gr_io_signature.h>
-int main()
+class dial_tone : public gr_hier_block2
{
- gr_sig_source_f_sptr src0, src1;
- audio_alsa_sink_sptr sink;
- gr_flow_graph_sptr fg;
+private:
+ gr_sig_source_f_sptr d_src0;
+ gr_sig_source_f_sptr d_src1;
+ audio_alsa_sink_sptr d_sink;
- src0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.5);
- src1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.5);
- sink = audio_alsa_make_sink(48000);
+public:
+ dial_tone();
+};
+
+dial_tone::dial_tone()
+ : gr_hier_block2("dial_tone",
+ gr_make_io_signature(0,0,0),
+ gr_make_io_signature(0,0,0))
+{
+ d_src0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.5);
+ d_src1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.5);
+ d_sink = audio_alsa_make_sink(48000);
- fg = gr_make_flow_graph();
- fg->connect(src0, 0, sink, 0);
- fg->connect(src1, 0, sink, 1);
+ define_component("source0", d_src0);
+ define_component("source1", d_src1);
+ define_component("sink", d_sink);
- fg->run();
+ connect("source0", 0, "sink", 0);
+ connect("source1", 0, "sink", 1);
+}
+
+int main()
+{
+ dial_tone top_block;
+ // Not implemented yet
+ // top_block.run();
return 0;
}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
2006-10-30 19:46:03 UTC (rev 3898)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
2006-10-30 20:22:43 UTC (rev 3899)
@@ -23,7 +23,8 @@
#include <gr_quadrature_demod_cf.h>
#include <gr_null_sink.h>
#include <audio_alsa_sink.h>
-#include <gr_flow_graph.h>
+#include <gr_hier_block2.h>
+#include <gr_io_signature.h>
#define RX_BOARD 0
#define USRP_DECIM 200
@@ -32,36 +33,56 @@
#define USRP_FPGA_FILENAME "std_2rxhb_2tx.rbf"
#define USRP_FIRMWARE_FILENAME "std.ihx"
-int main()
+// *** THIS IS NOT SUPPOSED TO WORK YET, INTENTIONALLY BROKEN ***
+
+class usrp_wfm_rcv : public gr_hier_block2
{
- usrp1_source_c_sptr src;
- gr_quadrature_demod_cf_sptr quad;
- gr_block_sptr null;
- audio_alsa_sink_sptr sink;
- gr_flow_graph_sptr fg;
-
- src = usrp1_make_source_c(RX_BOARD,
- USRP_DECIM,
- USRP_NCHAN,
- USRP_MUX,
- 0, // mode
- 0, // fusb_block_size
- 0, // fusb_nblocks
- USRP_FPGA_FILENAME,
- USRP_FIRMWARE_FILENAME);
+private:
+ usrp1_source_c_sptr d_src;
+ gr_quadrature_demod_cf_sptr d_quad;
+ gr_block_sptr d_null;
+ audio_alsa_sink_sptr d_sink;
+
+public:
+ usrp_wfm_rcv();
+};
+
+usrp_wfm_rcv::usrp_wfm_rcv()
+ : gr_hier_block2("usrp_wfm_rcv",
+ gr_make_io_signature(0,0,0),
+ gr_make_io_signature(0,0,0))
+{
+ d_src = usrp1_make_source_c(RX_BOARD,
+ USRP_DECIM,
+ USRP_NCHAN,
+ USRP_MUX,
+ 0, // mode
+ 0, // fusb_block_size
+ 0, // fusb_nblocks
+ USRP_FPGA_FILENAME,
+ USRP_FIRMWARE_FILENAME);
const float max_dev = 75000.0;
const float demod_gain = 2*M_PI*max_dev;
- quad = gr_make_quadrature_demod_cf(demod_gain);
+ d_quad = gr_make_quadrature_demod_cf(demod_gain);
- null = gr_make_null_sink(sizeof(gr_complex));
- sink = audio_alsa_make_sink(48000);
+ d_null = gr_make_null_sink(sizeof(gr_complex));
+ d_sink = audio_alsa_make_sink(48000);
+
+ define_component("src", d_src);
+ define_component("quad", d_quad);
+ define_component("null", d_null);
+ define_component("sink", d_sink);
- fg = gr_make_flow_graph();
+ connect("src", 0, "quad", 0);
+ connect("quad", 0, "sink", 0);
+}
- fg->connect(src, 0, quad, 0);
- fg->connect(quad, 0, sink, 0);
- fg->run();
+int main()
+{
+ usrp_wfm_rcv top_block;
+ // NOT YET IMPLEMENTED
+ // top_block.run();
return 0;
}
Modified:
gnuradio/branches/developers/jcorgan/hier/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/gr-audio-alsa/src/Makefile.am
2006-10-30 19:46:03 UTC (rev 3898)
+++ gnuradio/branches/developers/jcorgan/hier/gr-audio-alsa/src/Makefile.am
2006-10-30 20:22:43 UTC (rev 3899)
@@ -55,8 +55,12 @@
ourlib_LTLIBRARIES = _audio_alsa.la
+lib_LTLIBRARIES = libgr_audio_alsa.la
+
_audio_alsa_la_SOURCES = \
- audio_alsa.cc \
+ audio_alsa.cc
+
+libgr_audio_alsa_la_SOURCES = \
audio_alsa_sink.cc \
audio_alsa_source.cc \
gri_alsa.cc
@@ -76,10 +80,16 @@
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LIBS) \
$(ALSA_LIBS) \
+ libgr_audio_alsa.la \
-lstdc++
+libgr_audio_alsa_la_LIBADD = \
+ $(ALSA_LIBS)
+
_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+
audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
$(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc
$(LOCAL_IFILES)
Modified: gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
2006-10-30 19:46:03 UTC (rev 3898)
+++ gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
2006-10-30 20:22:43 UTC (rev 3899)
@@ -81,9 +81,12 @@
ourlib_LTLIBRARIES = _usrp1.la
+lib_LTLIBRARIES = libgr_usrp.la
_usrp1_la_SOURCES = \
- usrp1.cc \
+ usrp1.cc
+
+libgr_usrp_la_SOURCES = \
usrp1_sink_base.cc \
usrp1_sink_c.cc \
usrp1_sink_s.cc \
@@ -91,28 +94,28 @@
usrp1_source_c.cc \
usrp1_source_s.cc
-
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
- $(USRP_LIBS) \
+ libgr_usrp.la \
-lstdc++
+libgr_usrp_la_LIBADD = \
+ $(GNURADIO_CORE_LIBS) \
+ $(USRP_LIBS)
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+libgr_usrp_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
$(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
-
noinst_PYTHON = \
qa_usrp.py
MOSTLYCLEANFILES = \
$(BUILT_SOURCES) *~ *.pyc
-
# Don't distribute output of swig
dist-hook:
@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3899 - in gnuradio/branches/developers/jcorgan/hier: . config gnuradio-examples gnuradio-examples/c++/dialtone gnuradio-examples/c++/usrp_wfm_rcv gr-audio-alsa/src gr-usrp/src,
jcorgan <=