Changeset 8699

Show
Ignore:
Timestamp:
06/25/08 13:27:43
Author:
jcorgan
Message:

Applied changesets r8206, r8207, r8318, and r8324 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/config/grc_gnuradio_core.m4

    r7945 r8699  
    4747-I\${abs_top_builddir}/gnuradio-core/src/lib/filter \ 
    4848-I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \ 
     49-I\${abs_top_srcdir}/gnuradio-core/src/lib/viterbi \ 
    4950-I\${abs_top_srcdir}/gnuradio-core/src/lib/io \ 
    5051-I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ 
    …… 
    9192        gnuradio-core/src/lib/missing/Makefile \ 
    9293        gnuradio-core/src/lib/reed-solomon/Makefile \ 
     94        gnuradio-core/src/lib/viterbi/Makefile \ 
    9395        gnuradio-core/src/lib/runtime/Makefile \ 
    9496        gnuradio-core/src/lib/swig/Makefile \ 

  • gnuradio/branches/releases/3.1/configure.ac

    r8104 r8699  
    151151AC_CHECK_LIB(m, trunc, [AC_DEFINE([HAVE_TRUNC],[1],[Define to 1 if your system has `trunc'.])]) 
    152152AC_CHECK_LIB(m, exp10, [AC_DEFINE([HAVE_EXP10],[1],[Define to 1 if your system has 'exp10'.])]) 
     153AC_CHECK_LIB(m, log2, [AC_DEFINE([HAVE_LOG2],[1],[Define to 1 if your system has 'log2'.])]) 
    153154#AC_FUNC_MKTIME 
    154155 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/Makefile.am

    r6044 r8699  
    2525 
    2626# We've got to build . before swig 
    27 SUBDIRS = missing runtime filter general gengen g72x reed-solomon io . swig 
     27SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io . swig 
    2828 
    2929# generate libgnuradio-core.la from the convenience libraries in subdirs 
    …… 
    4040        filter/libfilter.la             \ 
    4141        g72x/libccitt.la                \ 
     42        viterbi/libviterbi.la           \ 
    4243        general/libgeneral.la           \ 
    4344        gengen/libgengen.la             \ 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am

    r8329 r8699  
    6060        gr_ctcss_squelch_ff.cc          \ 
    6161        gr_dd_mpsk_sync_cc.cc           \ 
     62        gr_decode_ccsds_27_fb.cc        \ 
    6263        gr_deinterleave.cc              \ 
    6364        gr_delay.cc                     \ 
    …… 
    6667        gr_diff_phasor_cc.cc            \ 
    6768        gr_dpll_bb.cc                   \ 
     69        gr_encode_ccsds_27_bb.cc        \ 
    6870        gr_fake_channel_coder_pp.cc     \ 
    6971        gr_fast_atan2f.cc               \ 
    …… 
    164166        qa_gr_fxpt_vco.cc                
    165167 
    166  
    167  
    168168grinclude_HEADERS =                     \ 
    169169        gr_agc_cc.h                     \ 
    …… 
    189189        gr_count_bits.h                 \ 
    190190        gr_cpfsk_bc.h                   \ 
    191       gr_crc32.h                      \ 
     191      gr_crc32.h                      \ 
    192192        gr_ctcss_squelch_ff.h           \ 
    193193        gr_dd_mpsk_sync_cc.h            \ 
     194        gr_decode_ccsds_27_fb.h         \ 
    194195        gr_diff_decoder_bb.h            \ 
    195196        gr_diff_encoder_bb.h            \ 
    …… 
    198199        gr_diff_phasor_cc.h             \ 
    199200        gr_dpll_bb.h                    \ 
     201        gr_encode_ccsds_27_bb.h         \ 
    200202        gr_expj.h                       \ 
    201203        gr_fake_channel_coder_pp.h      \ 
    …… 
    337339        gr_ctcss_squelch_ff.i           \ 
    338340        gr_dd_mpsk_sync_cc.i            \ 
     341        gr_decode_ccsds_27_fb.i         \ 
    339342        gr_diff_decoder_bb.i            \ 
    340343        gr_diff_encoder_bb.i            \ 
    …… 
    343346        gr_deinterleave.i               \ 
    344347        gr_delay.i                      \ 
     348        gr_encode_ccsds_27_bb.i         \ 
    345349        gr_fake_channel_coder_pp.i      \ 
    346350        gr_feedforward_agc_cc.i         \ 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i

    r8267 r8699  
    122122#include <gr_repeat.h> 
    123123#include <gr_cpfsk_bc.h> 
     124#include <gr_encode_ccsds_27_bb.h> 
     125#include <gr_decode_ccsds_27_fb.h> 
    124126%} 
    125127 
    …… 
    223225%include "gr_repeat.i" 
    224226%include "gr_cpfsk_bc.i" 
     227%include "gr_encode_ccsds_27_bb.i" 
     228%include "gr_decode_ccsds_27_fb.i" 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/viterbi/metrics.c

    r8206 r8699  
    3131 */ 
    3232 
     33#ifdef HAVE_CONFIG_H 
     34#include <config.h> 
     35#endif 
     36 
    3337/* Symbols are offset-binary, with 128 corresponding to an erased (no 
    3438 * information) symbol 
    …… 
    4246#define normal(x)       (0.5 + 0.5*erf((x)/M_SQRT2)) 
    4347 
    44 /* Logarithm base 2 */ 
    45 #define log2(x) (log(x)*M_LOG2E) 
     48/* Logarithm base 2 */  
     49double log2(double);            /* declaration seems to be missing from some math.h's */ 
     50#if !defined(HAVE_LOG2) 
     51#define log2(x) (log(x)*M_LOG2E) 
     52#endif 
    4653 
    4754/* Generate log-likelihood metrics for 8-bit soft quantized channel 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am

    r8329 r8699  
    6161        qa_diff_encoder.py              \ 
    6262        qa_diff_phasor_cc.py            \ 
     63        qa_ecc_ccsds_27.py              \ 
    6364        qa_feval.py                     \ 
    6465        qa_fft.py                       \ 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_ecc_ccsds_27.py

    r8206 r8699  
    3131        self.tb = None 
    3232 
    33     def test_ccsds_27 (self): 
     33    def xtest_ccsds_27 (self): 
    3434        src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10) 
    3535        expected = (0, 0, 0, 0, 1, 2, 3, 4, 5, 6)