diff options
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-trellis/docs/CMakeLists.txt (renamed from gr-trellis/doc/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/gr-trellis.xml (renamed from gr-trellis/doc/gr-trellis.xml) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/make_numbered_listing.py (renamed from gr-trellis/doc/make_numbered_listing.py) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/test_tcm.py (renamed from gr-trellis/doc/test_tcm.py) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/test_tcm.py.xml (renamed from gr-trellis/doc/test_tcm.py.xml) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/test_viterbi_equalization1.py (renamed from gr-trellis/doc/test_viterbi_equalization1.py) | 0 | ||||
| -rw-r--r-- | gr-trellis/docs/test_viterbi_equalization1.py.xml (renamed from gr-trellis/doc/test_viterbi_equalization1.py.xml) | 0 | ||||
| -rw-r--r-- | gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm | 2 | ||||
| -rw-r--r-- | gr-trellis/include/gnuradio/trellis/fsm.h | 2 | ||||
| -rw-r--r-- | gr-trellis/lib/permutation_impl.cc | 2 | ||||
| -rw-r--r-- | gr-trellis/python/trellis/qa_trellis.py | 2 |
12 files changed, 5 insertions, 5 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index 20c1c6b54d..2de5c04a0a 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -55,7 +55,7 @@ if(ENABLE_GR_TRELLIS) ######################################################################## add_subdirectory(include/gnuradio/trellis) add_subdirectory(lib) -add_subdirectory(doc) +add_subdirectory(docs) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python/trellis) diff --git a/gr-trellis/doc/CMakeLists.txt b/gr-trellis/docs/CMakeLists.txt index 06813258f3..06813258f3 100644 --- a/gr-trellis/doc/CMakeLists.txt +++ b/gr-trellis/docs/CMakeLists.txt diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/docs/gr-trellis.xml index aabf9ad535..aabf9ad535 100644 --- a/gr-trellis/doc/gr-trellis.xml +++ b/gr-trellis/docs/gr-trellis.xml diff --git a/gr-trellis/doc/make_numbered_listing.py b/gr-trellis/docs/make_numbered_listing.py index 09a82cfaa4..09a82cfaa4 100644 --- a/gr-trellis/doc/make_numbered_listing.py +++ b/gr-trellis/docs/make_numbered_listing.py diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/docs/test_tcm.py index e9a0ba59eb..e9a0ba59eb 100644 --- a/gr-trellis/doc/test_tcm.py +++ b/gr-trellis/docs/test_tcm.py diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/docs/test_tcm.py.xml index 77009b5859..77009b5859 100644 --- a/gr-trellis/doc/test_tcm.py.xml +++ b/gr-trellis/docs/test_tcm.py.xml diff --git a/gr-trellis/doc/test_viterbi_equalization1.py b/gr-trellis/docs/test_viterbi_equalization1.py index 95cb119edf..95cb119edf 100644 --- a/gr-trellis/doc/test_viterbi_equalization1.py +++ b/gr-trellis/docs/test_viterbi_equalization1.py diff --git a/gr-trellis/doc/test_viterbi_equalization1.py.xml b/gr-trellis/docs/test_viterbi_equalization1.py.xml index 9179f4f156..9179f4f156 100644 --- a/gr-trellis/doc/test_viterbi_equalization1.py.xml +++ b/gr-trellis/docs/test_viterbi_equalization1.py.xml diff --git a/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm b/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm index 3ac57be18d..86a110a829 100644 --- a/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm +++ b/gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm @@ -10,6 +10,6 @@ 5 2 1 6 6 1 2 5 -I don't remeber how I generated this one... +I don't remember how I generated this one... it is a bit better than awgn2o3_4_msb and worse than awgn2o3_4_msbG. diff --git a/gr-trellis/include/gnuradio/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h index 5ba4483b97..672a33403a 100644 --- a/gr-trellis/include/gnuradio/trellis/fsm.h +++ b/gr-trellis/include/gnuradio/trellis/fsm.h @@ -165,7 +165,7 @@ namespace gr { fsm(const fsm &FSMo, const fsm &FSMi, bool serial); /*! - * \brief Creates an FSMS representing n stages through the originial FSM (AKA radix-n FSM). + * \brief Creates an FSMS representing n stages through the original FSM (AKA radix-n FSM). * * \param FSM Original FSMs * \param n Number of stages. diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc index 2fe0ea8cb8..5a212a01a7 100644 --- a/gr-trellis/lib/permutation_impl.cc +++ b/gr-trellis/lib/permutation_impl.cc @@ -92,7 +92,7 @@ namespace gr { // per stream processing for(int i = 0; i < noutput_items/d_SYMS_PER_BLOCK; i++) { // Index i refers to blocks. - // Begining of packet (in blocks) + // Beginning of packet (in blocks) int i0 = d_K*(i/d_K); // position of block within packet (in blocks) int j0 = i%d_K; diff --git a/gr-trellis/python/trellis/qa_trellis.py b/gr-trellis/python/trellis/qa_trellis.py index f248832204..6d14fefe85 100644 --- a/gr-trellis/python/trellis/qa_trellis.py +++ b/gr-trellis/python/trellis/qa_trellis.py @@ -79,7 +79,7 @@ class test_trellis (gr_unittest.TestCase): noise = 0.1 tb = trellis_tb(constellation, fsms, noise) tb.run() - # Make sure all packets succesfully transmitted. + # Make sure all packets successfully transmitted. self.assertEqual(tb.dst.ntotal(), tb.dst.nright()) |