diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-27 19:37:32 +0200 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-27 19:37:32 +0200 |
commit | e76faaef5a070327cf15aa65b745632ea0542566 (patch) | |
tree | 35d9249db5b36c180805ca10f942d83783a04159 | |
parent | 54533dc4c67fdf5bdec2e32dc740dd2cf8b116fb (diff) |
New upstream version 0.2
39 files changed, 39 insertions, 38 deletions
@@ -1,5 +1,6 @@ Andreas Mueller <andrmuel@ee.ethz.ch> Moritz Luca Schmid <luca.m.schmid@gmail.com> +Ruben Undheim <ruben.undheim@gmail.com> Directory layout and build tools are adapted from gr-howto-write-a-block by Eric Blossom <eb@comsec.com> Part of the code has been adapted from existing GNU Radio code. diff --git a/cmake/Modules/dabConfig.cmake b/cmake/Modules/dabConfig.cmake index 3bcf075..03a50cc 100644 --- a/cmake/Modules/dabConfig.cmake +++ b/cmake/Modules/dabConfig.cmake @@ -3,7 +3,7 @@ PKG_CHECK_MODULES(PC_DAB dab) FIND_PATH( DAB_INCLUDE_DIRS - NAMES dab/api.h + NAMES grdab/api.h HINTS $ENV{DAB_DIR}/include ${PC_DAB_INCLUDEDIR} PATHS ${CMAKE_INSTALL_PREFIX}/include diff --git a/include/grdab/complex_to_interleaved_float_vcf.h b/include/grdab/complex_to_interleaved_float_vcf.h index b8bfc78..fbfffcd 100644 --- a/include/grdab/complex_to_interleaved_float_vcf.h +++ b/include/grdab/complex_to_interleaved_float_vcf.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_COMPLEX_TO_INTERLEAVED_FLOAT_VCF_H #define INCLUDED_DAB_COMPLEX_TO_INTERLEAVED_FLOAT_VCF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/control_stream_to_tag_cc.h b/include/grdab/control_stream_to_tag_cc.h index 0198a64..4a05797 100644 --- a/include/grdab/control_stream_to_tag_cc.h +++ b/include/grdab/control_stream_to_tag_cc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_CONTROL_STREAM_TO_TAG_CC_H #define INCLUDED_DAB_CONTROL_STREAM_TO_TAG_CC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/crc16_bb.h b/include/grdab/crc16_bb.h index c7e2160..13169ce 100644 --- a/include/grdab/crc16_bb.h +++ b/include/grdab/crc16_bb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_CRC16_BB_H #define INCLUDED_DAB_CRC16_BB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/diff_phasor_vcc.h b/include/grdab/diff_phasor_vcc.h index 611877a..a7fb32c 100644 --- a/include/grdab/diff_phasor_vcc.h +++ b/include/grdab/diff_phasor_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_DIFF_PHASOR_VCC_H #define INCLUDED_DAB_DIFF_PHASOR_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/estimate_sample_rate_bf.h b/include/grdab/estimate_sample_rate_bf.h index e4179f0..c25f8cf 100644 --- a/include/grdab/estimate_sample_rate_bf.h +++ b/include/grdab/estimate_sample_rate_bf.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_ESTIMATE_SAMPLE_RATE_BF_H #define INCLUDED_DAB_ESTIMATE_SAMPLE_RATE_BF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/fib_sink_vb.h b/include/grdab/fib_sink_vb.h index 4f35307..da1c1d4 100644 --- a/include/grdab/fib_sink_vb.h +++ b/include/grdab/fib_sink_vb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_FIB_SINK_VB_H #define INCLUDED_DAB_FIB_SINK_VB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/firecode_check_bb.h b/include/grdab/firecode_check_bb.h index e810a9a..327de5c 100644 --- a/include/grdab/firecode_check_bb.h +++ b/include/grdab/firecode_check_bb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_FIRECODE_CHECK_BB_H #define INCLUDED_DAB_FIRECODE_CHECK_BB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/fractional_interpolator_triggered_update_cc.h b/include/grdab/fractional_interpolator_triggered_update_cc.h index 8c3671e..f660d4b 100644 --- a/include/grdab/fractional_interpolator_triggered_update_cc.h +++ b/include/grdab/fractional_interpolator_triggered_update_cc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_FRACTIONAL_INTERPOLATOR_TRIGGERED_UPDATE_CC_H #define INCLUDED_DAB_FRACTIONAL_INTERPOLATOR_TRIGGERED_UPDATE_CC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/frequency_interleaver_vcc.h b/include/grdab/frequency_interleaver_vcc.h index 5a5b3fd..41519e9 100644 --- a/include/grdab/frequency_interleaver_vcc.h +++ b/include/grdab/frequency_interleaver_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_FREQUENCY_INTERLEAVER_VCC_H #define INCLUDED_DAB_FREQUENCY_INTERLEAVER_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/insert_null_symbol.h b/include/grdab/insert_null_symbol.h index acee5cc..b15da16 100644 --- a/include/grdab/insert_null_symbol.h +++ b/include/grdab/insert_null_symbol.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_INSERT_NULL_SYMBOL_H #define INCLUDED_DAB_INSERT_NULL_SYMBOL_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/magnitude_equalizer_vcc.h b/include/grdab/magnitude_equalizer_vcc.h index 83df1e6..9792835 100644 --- a/include/grdab/magnitude_equalizer_vcc.h +++ b/include/grdab/magnitude_equalizer_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MAGNITUDE_EQUALIZER_VCC_H #define INCLUDED_DAB_MAGNITUDE_EQUALIZER_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/measure_processing_rate.h b/include/grdab/measure_processing_rate.h index 4003df9..c84e790 100644 --- a/include/grdab/measure_processing_rate.h +++ b/include/grdab/measure_processing_rate.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MEASURE_PROCESSING_RATE_H #define INCLUDED_DAB_MEASURE_PROCESSING_RATE_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/modulo_ff.h b/include/grdab/modulo_ff.h index 2669502..eb25a0c 100644 --- a/include/grdab/modulo_ff.h +++ b/include/grdab/modulo_ff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MODULO_FF_H #define INCLUDED_DAB_MODULO_FF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/moving_sum_ff.h b/include/grdab/moving_sum_ff.h index b3338a3..bae8a59 100644 --- a/include/grdab/moving_sum_ff.h +++ b/include/grdab/moving_sum_ff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MOVING_SUM_FF_H #define INCLUDED_DAB_MOVING_SUM_FF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/mp2_decode_bs.h b/include/grdab/mp2_decode_bs.h index fcc26c8..b5e7db6 100644 --- a/include/grdab/mp2_decode_bs.h +++ b/include/grdab/mp2_decode_bs.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MP2_DECODE_BS_H #define INCLUDED_DAB_MP2_DECODE_BS_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/mp4_decode_bs.h b/include/grdab/mp4_decode_bs.h index 59d218f..bcb1c41 100644 --- a/include/grdab/mp4_decode_bs.h +++ b/include/grdab/mp4_decode_bs.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_MP4_DECODE_BS_H #define INCLUDED_DAB_MP4_DECODE_BS_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> #include "neaacdec.h" diff --git a/include/grdab/ofdm_coarse_frequency_correct.h b/include/grdab/ofdm_coarse_frequency_correct.h index 0c90bc2..adc2627 100644 --- a/include/grdab/ofdm_coarse_frequency_correct.h +++ b/include/grdab/ofdm_coarse_frequency_correct.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_COARSE_FREQUENCY_CORRECT_H #define INCLUDED_DAB_OFDM_COARSE_FREQUENCY_CORRECT_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/ofdm_ffe_all_in_one.h b/include/grdab/ofdm_ffe_all_in_one.h index a124ac7..61e62cb 100644 --- a/include/grdab/ofdm_ffe_all_in_one.h +++ b/include/grdab/ofdm_ffe_all_in_one.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_FFE_ALL_IN_ONE_H #define INCLUDED_DAB_OFDM_FFE_ALL_IN_ONE_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/ofdm_insert_pilot_vcc.h b/include/grdab/ofdm_insert_pilot_vcc.h index fe2b1a9..cf8563a 100644 --- a/include/grdab/ofdm_insert_pilot_vcc.h +++ b/include/grdab/ofdm_insert_pilot_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_INSERT_PILOT_VCC_H #define INCLUDED_DAB_OFDM_INSERT_PILOT_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/ofdm_move_and_insert_zero.h b/include/grdab/ofdm_move_and_insert_zero.h index e7f9dc0..6b12644 100644 --- a/include/grdab/ofdm_move_and_insert_zero.h +++ b/include/grdab/ofdm_move_and_insert_zero.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_MOVE_AND_INSERT_ZERO_H #define INCLUDED_DAB_OFDM_MOVE_AND_INSERT_ZERO_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/ofdm_remove_first_symbol_vcc.h b/include/grdab/ofdm_remove_first_symbol_vcc.h index 50be141..5a62265 100644 --- a/include/grdab/ofdm_remove_first_symbol_vcc.h +++ b/include/grdab/ofdm_remove_first_symbol_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_REMOVE_FIRST_SYMBOL_VCC_H #define INCLUDED_DAB_OFDM_REMOVE_FIRST_SYMBOL_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/ofdm_sampler.h b/include/grdab/ofdm_sampler.h index 5219734..2e802c3 100644 --- a/include/grdab/ofdm_sampler.h +++ b/include/grdab/ofdm_sampler.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_OFDM_SAMPLER_H #define INCLUDED_DAB_OFDM_SAMPLER_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/peak_detector_fb.h b/include/grdab/peak_detector_fb.h index 8d9e76b..c32d646 100644 --- a/include/grdab/peak_detector_fb.h +++ b/include/grdab/peak_detector_fb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_PEAK_DETECTOR_FB_H #define INCLUDED_DAB_PEAK_DETECTOR_FB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/prune.h b/include/grdab/prune.h index 0303546..80048d4 100644 --- a/include/grdab/prune.h +++ b/include/grdab/prune.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_PRUNE_H #define INCLUDED_DAB_PRUNE_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/prune_vectors.h b/include/grdab/prune_vectors.h index a43c63b..b8a52bf 100644 --- a/include/grdab/prune_vectors.h +++ b/include/grdab/prune_vectors.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_PRUNE_VECTORS_H #define INCLUDED_DAB_PRUNE_VECTORS_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/puncture_bb.h b/include/grdab/puncture_bb.h index 64caacb..3745e3f 100644 --- a/include/grdab/puncture_bb.h +++ b/include/grdab/puncture_bb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_PUNCTURE_BB_H #define INCLUDED_DAB_PUNCTURE_BB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/qpsk_demapper_vcb.h b/include/grdab/qpsk_demapper_vcb.h index 371112f..73c52a7 100644 --- a/include/grdab/qpsk_demapper_vcb.h +++ b/include/grdab/qpsk_demapper_vcb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_QPSK_DEMAPPER_VCB_H #define INCLUDED_DAB_QPSK_DEMAPPER_VCB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/qpsk_mapper_vbc.h b/include/grdab/qpsk_mapper_vbc.h index 7ef0acc..40dc61a 100644 --- a/include/grdab/qpsk_mapper_vbc.h +++ b/include/grdab/qpsk_mapper_vbc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_QPSK_MAPPER_VBC_H #define INCLUDED_DAB_QPSK_MAPPER_VBC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/reed_solomon_decode_bb.h b/include/grdab/reed_solomon_decode_bb.h index 609ab79..fc4e067 100644 --- a/include/grdab/reed_solomon_decode_bb.h +++ b/include/grdab/reed_solomon_decode_bb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_REED_SOLOMON_DECODE_BB_H #define INCLUDED_DAB_REED_SOLOMON_DECODE_BB_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/repartition_vectors.h b/include/grdab/repartition_vectors.h index d691b74..aafb03a 100644 --- a/include/grdab/repartition_vectors.h +++ b/include/grdab/repartition_vectors.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_REPARTITION_VECTORS_H #define INCLUDED_DAB_REPARTITION_VECTORS_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/select_subch_vfvf.h b/include/grdab/select_subch_vfvf.h index 949b533..fe24f33 100644 --- a/include/grdab/select_subch_vfvf.h +++ b/include/grdab/select_subch_vfvf.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_SELECT_SUBCH_VFVF_H #define INCLUDED_DAB_SELECT_SUBCH_VFVF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/select_vectors.h b/include/grdab/select_vectors.h index bf91e90..931fa29 100644 --- a/include/grdab/select_vectors.h +++ b/include/grdab/select_vectors.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_SELECT_VECTORS_H #define INCLUDED_DAB_SELECT_VECTORS_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/sum_phasor_trig_vcc.h b/include/grdab/sum_phasor_trig_vcc.h index f7c85e9..1cdb18c 100644 --- a/include/grdab/sum_phasor_trig_vcc.h +++ b/include/grdab/sum_phasor_trig_vcc.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_SUM_PHASOR_TRIG_VCC_H #define INCLUDED_DAB_SUM_PHASOR_TRIG_VCC_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/time_deinterleave_ff.h b/include/grdab/time_deinterleave_ff.h index 91f8eb2..eb0df94 100644 --- a/include/grdab/time_deinterleave_ff.h +++ b/include/grdab/time_deinterleave_ff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_TIME_DEINTERLEAVE_FF_H #define INCLUDED_DAB_TIME_DEINTERLEAVE_FF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/unpuncture_ff.h b/include/grdab/unpuncture_ff.h index ca30357..7f669f8 100644 --- a/include/grdab/unpuncture_ff.h +++ b/include/grdab/unpuncture_ff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_UNPUNCTURE_FF_H #define INCLUDED_DAB_UNPUNCTURE_FF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/include/grdab/unpuncture_vff.h b/include/grdab/unpuncture_vff.h index 03fcc1a..83a4bd5 100644 --- a/include/grdab/unpuncture_vff.h +++ b/include/grdab/unpuncture_vff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_UNPUNCTURE_VFF_H #define INCLUDED_DAB_UNPUNCTURE_VFF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/include/grdab/valve_ff.h b/include/grdab/valve_ff.h index debb71b..1bbbbeb 100644 --- a/include/grdab/valve_ff.h +++ b/include/grdab/valve_ff.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DAB_VALVE_FF_H #define INCLUDED_DAB_VALVE_FF_H -#include <dab/api.h> +#include <grdab/api.h> #include <gnuradio/block.h> namespace gr { |