Changeset 9674

Show
Ignore:
Timestamp:
09/28/08 22:39:20
Author:
jcorgan
Message:

wip, adds gr.dsss.code_gen_1b() base class, swig seems to do the right thing with namespaces. This base class will become the virtual base class for all unpacked binary chipping sequence code generators.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/dsss/Makefile.am

    r9667 r9674  
    2424 
    2525ourinclude_HEADERS = \ 
    26     test.h 
     26    code_gen_1b.h 

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/Makefile.am

    r9667 r9674  
    2121include $(top_srcdir)/Makefile.common 
    2222 
    23 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) 
     23AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \ 
     24    -I$(top_srcdir)/gr-dsss/include 
    2425 
    2526# list of programs run by "make check" and "make distcheck" 
    …… 
    3536#                      The main library 
    3637# ---------------------------------------------------------------- 
    37 libgr_dsss_la_SOURCES = 
     38libgr_dsss_la_SOURCES = \ 
     39        code_gen_1b.cc 
    3840 
    3941libgr_dsss_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 
    …… 
    4547# ---------------------------------------------------------------- 
    4648libgr_dsss_qa_la_SOURCES = \ 
    47         qa_dsss.cc 
     49        qa_dsss.cc \ 
     50        qa_code_gen_1b.cc 
    4851 
    49 libgr_dsss_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 
     52libgr_dsss_qa_la_LDFLAGS = $(NO_UNDEFINED) 
    5053 
    5154libgr_dsss_qa_la_LIBADD = \ 
    …… 
    5760# ---------------------------------------------------------------- 
    5861noinst_HEADERS = \ 
    59         qa_dsss.h 
     62        qa_dsss.h \ 
     63        qa_code_gen_1b.h 
    6064 
    6165# ---------------------------------------------------------------- 

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/qa_dsss.cc

    r9667 r9674  
    2727 
    2828#include <qa_dsss.h> 
    29 // #include <qa_....h> 
     29#include <qa_code_gen_1b.h> 
    3030 
    3131CppUnit::TestSuite * 
    …… 
    3434  CppUnit::TestSuite    *s = new CppUnit::TestSuite("dsss"); 
    3535 
    36   // s->addTest(...); 
     36  s->addTest(qa_code_gen_1b::suite()); 
    3737   
    3838  return s; 

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/Makefile.am

    r9667 r9674  
    2525ourswigincludedir = $(grincludedir)/dsss/swig 
    2626 
    27 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) 
     27AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ 
     28    -I$(top_srcdir)/gr-dsss/include 
     29     
    2830SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(STD_DEFINES_AND_INCLUDES) \ 
    2931        $(WITH_INCLUDES) $(WITH_SWIG_INCLUDES) 

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/dsss.i

    r9667 r9674  
    2222%feature("autodoc", "1");               // generate python docstrings 
    2323 
    24 %include "exception.i" 
    25 %import "gnuradio.i"                  // the common stuff 
     24%include <exception.i> 
     25%import <gnuradio.i>                  // the common stuff 
    2626 
    2727%{ 
    …… 
    3030%} 
    3131 
    32 // ---------------------------------------------------------------- 
    33  
    34 /* 
    35  * Gather all .i files in this directory together. 
    36  */ 
    37  
    38 %{ 
    39  
    40 // The .h files 
    41 // #include <dsss/...h> 
    42  
    43 %} 
    44  
    45 // The .i files 
    46 // %include <dsss_....i> 
    47  
     32%include "code_gen_1b.i" 

  • gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/qa_dsss.py

    r9667 r9674  
    2222 
    2323from gnuradio import gr, gr_unittest 
    24 import dsss_swig 
     24import dsss_swig as dsss 
    2525 
    2626class qa_dsss(gr_unittest.TestCase): 
    …… 
    3333 
    3434    def test_001_nop(self): 
    35         pass 
     35        g = dsss.code_gen_1b() 
     36        self.assertTrue(g.next() == 0) 
    3637                 
    3738if __name__ == '__main__':