diff --git a/fm_rx.grc b/fm_rx.grc index cf47cad..c4330c6 100644 --- a/fm_rx.grc +++ b/fm_rx.grc @@ -387,11 +387,11 @@ max - 100e3 + samp_rate/2 min - -100e3 + -samp_rate/2 notebook @@ -399,7 +399,7 @@ num_steps - 200 + samp_rate/5000 style @@ -1001,69 +1001,6 @@ analog.GR_COS_WAVE - - analog_sig_source_x - - amp - 0.5 - - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - freq - f_fine_tx - - - _coordinate - (112, 1012) - - - _rotation - 0 - - - id - analog_sig_source_x_0_1 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - offset - 0 - - - type - complex - - - samp_rate - samp_rate - - - waveform - analog.GR_COS_WAVE - - audio_sink @@ -1740,7 +1677,7 @@ _enabled - 0 + 1 file @@ -1748,7 +1685,7 @@ _coordinate - (136, 324) + (16, 460) _rotation @@ -2598,655 +2535,11 @@ - uhd_usrp_sink + rational_resampler_xxx alias - - ant0 - TX/RX - - - bw0 - 0 - - - center_freq0 - f_tune - - - norm_gain0 - False - - - gain0 - 40 - - - ant10 - - - - bw10 - 0 - - - center_freq10 - 0 - - - norm_gain10 - False - - - gain10 - 0 - - - ant11 - - - - bw11 - 0 - - - center_freq11 - 0 - - - norm_gain11 - False - - - gain11 - 0 - - - ant12 - - - - bw12 - 0 - - - center_freq12 - 0 - - - norm_gain12 - False - - - gain12 - 0 - - - ant13 - - - - bw13 - 0 - - - center_freq13 - 0 - - - norm_gain13 - False - - - gain13 - 0 - - - ant14 - - - - bw14 - 0 - - - center_freq14 - 0 - - - norm_gain14 - False - - - gain14 - 0 - - - ant15 - - - - bw15 - 0 - - - center_freq15 - 0 - - - norm_gain15 - False - - - gain15 - 0 - - - ant16 - - - - bw16 - 0 - - - center_freq16 - 0 - - - norm_gain16 - False - - - gain16 - 0 - - - ant17 - - - - bw17 - 0 - - - center_freq17 - 0 - - - norm_gain17 - False - - - gain17 - 0 - - - ant18 - - - - bw18 - 0 - - - center_freq18 - 0 - - - norm_gain18 - False - - - gain18 - 0 - - - ant19 - - - - bw19 - 0 - - - center_freq19 - 0 - - - norm_gain19 - False - - - gain19 - 0 - - - ant1 - - - - bw1 - 0 - - - center_freq1 - 0 - - - norm_gain1 - False - - - gain1 - 0 - - - ant20 - - - - bw20 - 0 - - - center_freq20 - 0 - - - norm_gain20 - False - - - gain20 - 0 - - - ant21 - - - - bw21 - 0 - - - center_freq21 - 0 - - - norm_gain21 - False - - - gain21 - 0 - - - ant22 - - - - bw22 - 0 - - - center_freq22 - 0 - - - norm_gain22 - False - - - gain22 - 0 - - - ant23 - - - - bw23 - 0 - - - center_freq23 - 0 - - - norm_gain23 - False - - - gain23 - 0 - - - ant24 - - - - bw24 - 0 - - - center_freq24 - 0 - - - norm_gain24 - False - - - gain24 - 0 - - - ant25 - - - - bw25 - 0 - - - center_freq25 - 0 - - - norm_gain25 - False - - - gain25 - 0 - - - ant26 - - - - bw26 - 0 - - - center_freq26 - 0 - - - norm_gain26 - False - - - gain26 - 0 - - - ant27 - - - - bw27 - 0 - - - center_freq27 - 0 - - - norm_gain27 - False - - - gain27 - 0 - - - ant28 - - - - bw28 - 0 - - - center_freq28 - 0 - - - norm_gain28 - False - - - gain28 - 0 - - - ant29 - - - - bw29 - 0 - - - center_freq29 - 0 - - - norm_gain29 - False - - - gain29 - 0 - - - ant2 - - - - bw2 - 0 - - - center_freq2 - 0 - - - norm_gain2 - False - - - gain2 - 0 - - - ant30 - - - - bw30 - 0 - - - center_freq30 - 0 - - - norm_gain30 - False - - - gain30 - 0 - - - ant31 - - - - bw31 - 0 - - - center_freq31 - 0 - - - norm_gain31 - False - - - gain31 - 0 - - - ant3 - - - - bw3 - 0 - - - center_freq3 - 0 - - - norm_gain3 - False - - - gain3 - 0 - - - ant4 - - - - bw4 - 0 - - - center_freq4 - 0 - - - norm_gain4 - False - - - gain4 - 0 - - - ant5 - - - - bw5 - 0 - - - center_freq5 - 0 - - - norm_gain5 - False - - - gain5 - 0 - - - ant6 - - - - bw6 - 0 - - - center_freq6 - 0 - - - norm_gain6 - False - - - gain6 - 0 - - - ant7 - - - - bw7 - 0 - - - center_freq7 - 0 - - - norm_gain7 - False - - - gain7 - 0 - - - ant8 - - - - bw8 - 0 - - - center_freq8 - 0 - - - norm_gain8 - False - - - gain8 - 0 - - - ant9 - - - - bw9 - 0 - - - center_freq9 - 0 - - - norm_gain9 - False - - - gain9 - 0 - - - clock_rate - 0.0 - comment @@ -3256,20 +2549,20 @@ - dev_addr - "" - - - dev_args - "" + decim + 2000000 _enabled True + + fbw + 0 + _coordinate - (336, 996) + (176, 316) _rotation @@ -3277,147 +2570,27 @@ id - uhd_usrp_sink_0 + rational_resampler_xxx_1 - type - fc32 - - - clock_source0 - - - - sd_spec0 - - - - time_source0 - - - - clock_source1 - - - - sd_spec1 - - - - time_source1 - - - - clock_source2 - - - - sd_spec2 - - - - time_source2 - - - - clock_source3 - - - - sd_spec3 - - - - time_source3 - - - - clock_source4 - - - - sd_spec4 - - - - time_source4 - - - - clock_source5 - - - - sd_spec5 - - - - time_source5 - - - - clock_source6 - - - - sd_spec6 - - - - time_source6 - - - - clock_source7 - - - - sd_spec7 - - - - time_source7 - - - - nchan - 1 - - - num_mboards - 1 - - - samp_rate + interp samp_rate - hide_cmd_port - False + maxoutbuf + 0 - hide_lo_controls - True + minoutbuf + 0 - stream_args + taps - stream_chans - [] - - - sync - - - - len_tag_name - - - - otw - + type + ccc @@ -4600,7 +3773,7 @@ _enabled - 1 + 0 _coordinate @@ -5718,12 +4891,6 @@ 0 1 - - analog_sig_source_x_0_1 - uhd_usrp_sink_0 - 0 - 0 - band_pass_filter_0 blocks_add_xx_1 @@ -5816,7 +4983,7 @@ blocks_file_source_0 - blocks_multiply_xx_0 + rational_resampler_xxx_1 0 0 @@ -5928,6 +5095,18 @@ 0 1 + + rational_resampler_xxx_1 + blocks_multiply_xx_0 + 0 + 0 + + + rational_resampler_xxx_1 + wxgui_fftsink2_0 + 0 + 0 + uhd_usrp_source_0 blocks_multiply_xx_0 diff --git a/fsk_rx.grc b/fsk_rx.grc index 9ef913b..a00ec22 100644 --- a/fsk_rx.grc +++ b/fsk_rx.grc @@ -353,7 +353,7 @@ _enabled - 1 + 0 _coordinate @@ -365,7 +365,7 @@ gain - 1 + 0.2 id @@ -400,7 +400,7 @@ _enabled - 1 + 0 freq @@ -490,6 +490,108 @@ audio_rate + + audio_source + + alias + + + + comment + + + + affinity + + + + device_name + + + + _enabled + 1 + + + _coordinate + (688, 524) + + + _rotation + 0 + + + id + audio_source_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_outputs + 1 + + + ok_to_block + True + + + samp_rate + dsp_rate + + + + blocks_and_const_xx + + alias + + + + comment + + + + const + 1 + + + affinity + + + + _enabled + True + + + _coordinate + (1640, 172) + + + _rotation + 0 + + + id + blocks_and_const_xx_0 + + + type + byte + + + maxoutbuf + 0 + + + minoutbuf + 0 + + blocks_file_sink @@ -569,7 +671,7 @@ _coordinate - (1624, 356) + (1712, 332) _rotation @@ -612,7 +714,7 @@ _enabled - 1 + 0 file @@ -706,7 +808,7 @@ _enabled - 1 + 0 _coordinate @@ -741,6 +843,96 @@ 1 + + blocks_not_xx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1504, 176) + + + _rotation + 0 + + + id + blocks_not_xx_0 + + + type + byte + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + + blocks_wavfile_sink + + bits_per_sample + 16 + + + alias + + + + comment + + + + affinity + + + + _enabled + 0 + + + file + pocsag.wav + + + _coordinate + (1032, 508) + + + _rotation + 0 + + + id + blocks_wavfile_sink_1 + + + nchan + 1 + + + samp_rate + dsp_rate + + blocks_wavfile_sink @@ -769,7 +961,7 @@ _coordinate - (1256, 308) + (1264, 332) _rotation @@ -777,7 +969,7 @@ id - blocks_wavfile_sink_1 + blocks_wavfile_sink_1_0 nchan @@ -808,11 +1000,11 @@ file - /home/jens/pocsag_004.wav + /home/jens/pocsag.wav _coordinate - (920, 588) + (608, 604) _rotation @@ -840,7 +1032,7 @@ - jay_garage + jay_bit_slicer alias @@ -855,11 +1047,11 @@ _enabled - 1 + True _coordinate - (1256, 436) + (1264, 452) _rotation @@ -867,7 +1059,7 @@ id - jay_garage_0 + jay_bit_slicer_0 kLoopFilter @@ -891,11 +1083,11 @@ kThreshold - 0.1 + 0.2 - jay_preamble_sync + jay_pocsag_decoder alias @@ -914,7 +1106,7 @@ _coordinate - (1480, 472) + (1504, 480) _rotation @@ -922,7 +1114,7 @@ id - jay_preamble_sync_0 + jay_pocsag_decoder_0 maxoutbuf @@ -961,7 +1153,7 @@ _enabled - 1 + 0 type @@ -1052,7 +1244,7 @@ gain - 1 + 2 id @@ -2648,7 +2840,7 @@ _enabled - 0 + 1 _coordinate @@ -2715,6 +2907,93 @@ Counts + + wxgui_scopesink2 + + ac_couple + False + + + alias + + + + comment + + + + affinity + + + + _enabled + 0 + + + _coordinate + (920, 612) + + + _rotation + 0 + + + grid_pos + + + + id + wxgui_scopesink2_0_0 + + + notebook + + + + num_inputs + 1 + + + samp_rate + dsp_rate + + + t_scale + 0 + + + title + Scope Plot + + + trig_mode + wxgui.TRIG_MODE_AUTO + + + type + float + + + v_offset + 0 + + + v_scale + 0 + + + win_size + + + + xy_mode + False + + + y_axis_label + Counts + + analog_quadrature_demod_cf_0 low_pass_filter_0_0 @@ -2727,6 +3006,30 @@ 0 1 + + audio_source_0 + blocks_wavfile_sink_1 + 0 + 0 + + + audio_source_0 + low_pass_filter_0_0 + 0 + 0 + + + audio_source_0 + wxgui_scopesink2_0_0 + 0 + 0 + + + blocks_and_const_xx_0 + blocks_file_sink_0_0 + 0 + 0 + blocks_file_source_0 blocks_multiply_xx_0 @@ -2735,13 +3038,13 @@ blocks_float_to_uchar_0 - blocks_file_sink_0_0 + blocks_not_xx_0 0 0 blocks_float_to_uchar_0 - jay_preamble_sync_0 + jay_pocsag_decoder_0 0 0 @@ -2758,31 +3061,25 @@ 0 - blocks_wavfile_source_0 - audio_sink_0 + blocks_not_xx_0 + blocks_and_const_xx_0 0 0 blocks_wavfile_source_0 - blocks_wavfile_sink_1 + low_pass_filter_0_0 0 0 - blocks_wavfile_source_0 - jay_garage_0 - 0 - 0 - - - jay_garage_0 + jay_bit_slicer_0 blocks_float_to_uchar_0 0 0 - jay_preamble_sync_0 + jay_pocsag_decoder_0 blocks_file_sink_0 0 0 @@ -2807,13 +3104,13 @@ low_pass_filter_0_0 - blocks_wavfile_sink_1 + blocks_wavfile_sink_1_0 0 0 low_pass_filter_0_0 - jay_garage_0 + jay_bit_slicer_0 0 0 diff --git a/gr-jay/gr-jay/nbproject/configurations.xml b/gr-jay/gr-jay/nbproject/configurations.xml index 4b9d69c..92821c6 100644 --- a/gr-jay/gr-jay/nbproject/configurations.xml +++ b/gr-jay/gr-jay/nbproject/configurations.xml @@ -3,18 +3,20 @@ - - - ../include/jay/CMakeLists.txt - ../include/jay/api.h - ../include/jay/bit_slicer.h - ../include/jay/pocsag_decoder.h - ../include/jay/square2_ff.h - ../include/jay/square_ff.h - + + ../include/jay/CMakeLists.txt + ../include/jay/api.h + ../include/jay/bit_slicer.h + ../include/jay/pocsag_decoder.h + ../include/jay/square2_ff.h + ../include/jay/square_ff.h PocsagDecoder.cpp + bit_slicer_impl.cc pocsag_decoder_impl.cc qa_jay.cc square2_ff_impl.cc @@ -25,7 +27,6 @@ displayName="swig" projectFiles="true" root="../build/swig"> - ../build/swig/_jay_swig_doc_tag.cpp ../build/swig/_jay_swig_swig_tag.cpp ../build/swig/jay_swigPYTHON_wrap.cxx ../build/swig/jay_swig_swig_2d0df.cpp @@ -79,18 +80,6 @@ - - - - ../swig - /usr/include/gnuradio/swig - /usr/include/python2.7 - - - + flavor2="11"> ../build/include @@ -136,26 +125,21 @@ - - - - - - - - - - - - - + gnuradio_jay_EXPORTS - + + + + gnuradio_jay_EXPORTS + + + + gnuradio_jay_EXPORTS diff --git a/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties b/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties index ee78f66..7f5ded8 100644 --- a/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties +++ b/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties @@ -1,2 +1 @@ -# Automatic path mapper. CRC = 266605595 -/usr/include/gnuradio/swig=/usr/include/gnuradio/swig +# Automatic path mapper. CRC = 1 diff --git a/gr-jay/gr-jay/nbproject/private/Default.properties b/gr-jay/gr-jay/nbproject/private/Default.properties index beb0b34..642c944 100644 --- a/gr-jay/gr-jay/nbproject/private/Default.properties +++ b/gr-jay/gr-jay/nbproject/private/Default.properties @@ -1,7 +1 @@ -/home/jens/work/software/projects/GnuRadio/gr-jay/lib/square_ff_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square_ff_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/square_ff_impl.cc -/home/jens/work/software/projects/GnuRadio/gr-jay/lib/PocsagDecoder.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/PocsagDecoder.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/PocsagDecoder.cpp -/home/jens/work/software/projects/GnuRadio/gr-jay/lib/square2_ff_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square2_ff_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/square2_ff_impl.cc -/home/jens/work/software/projects/GnuRadio/gr-jay/lib/garage_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/garage_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/garage_impl.cc -/home/jens/work/software/projects/GnuRadio/gr-jay/lib/pocsag_decoder_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/pocsag_decoder_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/pocsag_decoder_impl.cc -/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/jay_swig_swig_2d0df.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig#-I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig -I/home/jens/work/software/projects/GnuRadio/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/jay_swig_swig_2d0df.dir/jay_swig_swig_2d0df.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/jay_swig_swig_2d0df.cpp -/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/_jay_swig_swig_tag.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig#-I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig -I/home/jens/work/software/projects/GnuRadio/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/_jay_swig_swig_tag.dir/_jay_swig_swig_tag.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/_jay_swig_swig_tag.cpp +/home/jens/work/software/projects/GnuRadio/gr-jay/lib/bit_slicer_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/bit_slicer_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/bit_slicer_impl.cc diff --git a/kfz.grc b/kfz.grc index e0af848..628de1b 100644 --- a/kfz.grc +++ b/kfz.grc @@ -786,7 +786,7 @@ - jay_garage + jay_bit_slicer alias @@ -801,11 +801,11 @@ _enabled - 1 + True _coordinate - (1104, 476) + (1104, 460) _rotation @@ -813,7 +813,7 @@ id - jay_garage_0 + jay_bit_slicer_0 kLoopFilter @@ -2650,93 +2650,6 @@ Counts - - wxgui_scopesink2 - - ac_couple - False - - - alias - - - - comment - - - - affinity - - - - _enabled - 1 - - - _coordinate - (1344, 132) - - - _rotation - 0 - - - grid_pos - - - - id - wxgui_scopesink2_0_0 - - - notebook - - - - num_inputs - 1 - - - samp_rate - baud_rate - - - t_scale - 1e-3 - - - title - Scope Plot - - - trig_mode - wxgui.TRIG_MODE_AUTO - - - type - float - - - v_offset - 0 - - - v_scale - 0.5 - - - win_size - - - - xy_mode - False - - - y_axis_label - Counts - - analog_sig_source_x_0 blocks_multiply_xx_0 @@ -2763,7 +2676,7 @@ blocks_complex_to_mag_0 - jay_garage_0 + jay_bit_slicer_0 0 0 @@ -2816,17 +2729,11 @@ 0 - jay_garage_0 + jay_bit_slicer_0 blocks_float_to_uchar_0 0 0 - - jay_garage_0 - wxgui_scopesink2_0_0 - 0 - 0 - low_pass_filter_0 baz_delay_0 diff --git a/mausi.grc b/mausi.grc index 7e12f1a..ca3af00 100644 --- a/mausi.grc +++ b/mausi.grc @@ -143,6 +143,92 @@ 48000 + + variable + + comment + + + + _enabled + True + + + _coordinate + (24, 100) + + + _rotation + 0 + + + id + f_ctr + + + value + 40686900 + f_fine + + + + variable_slider + + comment + + + + converver + float_converter + + + value + -3400 + + + _enabled + True + + + _coordinate + (368, 108) + + + _rotation + 0 + + + grid_pos + + + + id + f_fine + + + label + + + + max + 5000 + + + min + -5000 + + + notebook + + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + variable @@ -163,11 +249,38 @@ id - offset_Hz + f_offset value - 520.0e3 + 200e3 + + + + variable + + comment + + + + _enabled + True + + + _coordinate + (192, 100) + + + _rotation + 0 + + + id + f_tune + + + value + f_ctr + f_offset @@ -194,7 +307,7 @@ value - 19968000 + 24e6 @@ -221,7 +334,7 @@ freq - offset_Hz + f_offset _coordinate @@ -307,61 +420,6 @@ dsp_rate - - baz_delay - - alias - - - - comment - - - - affinity - - - - delay - 1 - - - _enabled - 0 - - - _coordinate - (664, 588) - - - _rotation - 0 - - - id - baz_delay_0 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - num_ports - 1 - - - type - complex - - - vlen - 1 - - blocks_complex_to_mag @@ -405,88 +463,6 @@ 1 - - blocks_complex_to_mag - - alias - - - - comment - - - - affinity - - - - _enabled - 0 - - - _coordinate - (1040, 640) - - - _rotation - 0 - - - id - blocks_complex_to_mag_1 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - vlen - 1 - - - - blocks_conjugate_cc - - alias - - - - comment - - - - affinity - - - - _enabled - 0 - - - _coordinate - (664, 656) - - - _rotation - 0 - - - id - blocks_conjugate_cc_0 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - blocks_file_sink @@ -511,7 +487,7 @@ file - /home/jens/bits.dat + /home/jens/mausi_bits.dat _coordinate @@ -558,7 +534,7 @@ _enabled - 1 + 0 file @@ -687,57 +663,6 @@ 1 - - blocks_multiply_xx - - alias - - - - comment - - - - affinity - - - - _enabled - 0 - - - _coordinate - (904, 624) - - - _rotation - 0 - - - id - blocks_multiply_xx_0_0 - - - type - complex - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - num_inputs - 2 - - - vlen - 1 - - blocks_wavfile_sink @@ -786,7 +711,7 @@ - jay_garage + jay_bit_slicer alias @@ -801,19 +726,23 @@ _enabled - 1 + True _coordinate - (1104, 476) + (1120, 460) _rotation 0 + + numGapBits + 16 + id - jay_garage_0 + jay_bit_slicer_0 kLoopFilter @@ -827,6 +756,10 @@ minoutbuf 0 + + doPrintPackets + 1 + sampleRate dsp_rate @@ -837,7 +770,7 @@ kThreshold - 0.010 + 0.1 @@ -884,7 +817,7 @@ gain - 400 + 4 id @@ -931,7 +864,7 @@ center_freq0 - 41203300 + f_tune dc_offs_enb0 @@ -2095,7 +2028,7 @@ _enabled - 0 + 1 _coordinate @@ -2460,109 +2393,6 @@ 10 - - wxgui_fftsink2 - - avg_alpha - 0.2 - - - average - True - - - baseband_freq - 0 - - - alias - - - - comment - - - - affinity - - - - _enabled - 0 - - - fft_size - 8192 - - - freqvar - None - - - _coordinate - (1232, 556) - - - _rotation - 0 - - - grid_pos - - - - id - wxgui_fftsink2_0_1 - - - notebook - - - - peak_hold - False - - - ref_level - -10 - - - ref_scale - 2.0 - - - fft_rate - 15 - - - samp_rate - dsp_rate - - - title - Baudrate - - - type - float - - - win_size - - - - win - None - - - y_divs - 10 - - - y_per_div - 10 - - wxgui_scopesink2 @@ -2583,7 +2413,7 @@ _enabled - 0 + 1 _coordinate @@ -2650,105 +2480,12 @@ Counts - - wxgui_scopesink2 - - ac_couple - False - - - alias - - - - comment - - - - affinity - - - - _enabled - 1 - - - _coordinate - (1344, 132) - - - _rotation - 0 - - - grid_pos - - - - id - wxgui_scopesink2_0_0 - - - notebook - - - - num_inputs - 1 - - - samp_rate - baud_rate - - - t_scale - 1e-3 - - - title - Scope Plot - - - trig_mode - wxgui.TRIG_MODE_AUTO - - - type - float - - - v_offset - 0 - - - v_scale - 0.5 - - - win_size - - - - xy_mode - False - - - y_axis_label - Counts - - analog_sig_source_x_0 blocks_multiply_xx_0 0 1 - - baz_delay_0 - blocks_conjugate_cc_0 - 0 - 0 - blocks_complex_to_mag_0 audio_sink_0 @@ -2763,7 +2500,7 @@ blocks_complex_to_mag_0 - jay_garage_0 + jay_bit_slicer_0 0 0 @@ -2773,18 +2510,6 @@ 0 0 - - blocks_complex_to_mag_1 - wxgui_fftsink2_0_1 - 0 - 0 - - - blocks_conjugate_cc_0 - blocks_multiply_xx_0_0 - 0 - 1 - blocks_file_source_0 blocks_multiply_xx_0 @@ -2810,41 +2535,17 @@ 0 - blocks_multiply_xx_0_0 - blocks_complex_to_mag_1 - 0 - 0 - - - jay_garage_0 + jay_bit_slicer_0 blocks_float_to_uchar_0 0 0 - - jay_garage_0 - wxgui_scopesink2_0_0 - 0 - 0 - - - low_pass_filter_0 - baz_delay_0 - 0 - 0 - low_pass_filter_0 blocks_complex_to_mag_0 0 0 - - low_pass_filter_0 - blocks_multiply_xx_0_0 - 0 - 0 - low_pass_filter_0 wxgui_fftsink2_0 diff --git a/pocsag_audio.grc b/pocsag_audio.grc index 033ab8b..436a659 100644 --- a/pocsag_audio.grc +++ b/pocsag_audio.grc @@ -253,7 +253,7 @@ _coordinate - (560, 380) + (552, 364) _rotation @@ -316,7 +316,7 @@ - jay_garage + jay_bit_slicer alias @@ -331,7 +331,7 @@ _enabled - 1 + True _coordinate @@ -343,7 +343,7 @@ id - jay_garage_0 + jay_bit_slicer_0 kLoopFilter @@ -371,7 +371,7 @@ - jay_preamble_sync + jay_pocsag_decoder alias @@ -390,7 +390,7 @@ _coordinate - (552, 272) + (568, 272) _rotation @@ -398,7 +398,7 @@ id - jay_preamble_sync_0 + jay_pocsag_decoder_0 maxoutbuf @@ -585,25 +585,25 @@ blocks_float_to_uchar_0 - jay_preamble_sync_0 + jay_pocsag_decoder_0 0 0 - jay_garage_0 + jay_bit_slicer_0 blocks_float_to_uchar_0 0 0 - jay_preamble_sync_0 + jay_pocsag_decoder_0 blocks_file_sink_0 0 0 low_pass_filter_0_0 - jay_garage_0 + jay_bit_slicer_0 0 0