diff options
| author | max <max@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-07-18 14:46:35 +0000 |
|---|---|---|
| committer | max <max@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-07-18 14:46:35 +0000 |
| commit | fe9b8a5bf14005cd1b050578649e811a256bf925 (patch) | |
| tree | 2c02f24e62484065dbc3ddbd6424536460a86bb8 | |
| parent | 7d86e01d42ed652b4d1fd315cb5bfc6d6e6b7e8e (diff) | |
correct copyright, other fixes
git-svn-id: http://op25.osmocom.org/svn/trunk@292 65a5c917-d112-43f1-993d-58c26a4786be
| -rw-r--r-- | repeater/src/lib/repeater_p25_frame_assembler.cc | 2 | ||||
| -rw-r--r-- | repeater/src/lib/repeater_s2v.cc | 3 | ||||
| -rwxr-xr-x | repeater/src/python/scope.py | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/repeater/src/lib/repeater_p25_frame_assembler.cc b/repeater/src/lib/repeater_p25_frame_assembler.cc index 6f11326..0e16478 100644 --- a/repeater/src/lib/repeater_p25_frame_assembler.cc +++ b/repeater/src/lib/repeater_p25_frame_assembler.cc @@ -115,7 +115,7 @@ repeater_p25_frame_assembler::general_work (int noutput_items, for (int i = 0; i < noutput_items; i++){ if(framer->rx_sym(in[i])) { // complete frame was detected if (d_debug >= 10) { - fprintf (stderr, "NAC 0x%X DUID 0x%X len %ld errs %d ", framer->nac, framer->duid, framer->frame_size >> 1, framer->bch_errors); + fprintf (stderr, "NAC 0x%X DUID 0x%X len %d errs %d ", framer->nac, framer->duid, framer->frame_size >> 1, framer->bch_errors); } if (d_debug >= 10 && framer->duid == 0x00) { ProcHDU(framer->frame_body); diff --git a/repeater/src/lib/repeater_s2v.cc b/repeater/src/lib/repeater_s2v.cc index 8593116..d186f68 100644 --- a/repeater/src/lib/repeater_s2v.cc +++ b/repeater/src/lib/repeater_s2v.cc @@ -34,6 +34,7 @@ #include <repeater_s2v.h> #include <gr_io_signature.h> #include <stdio.h> +#include <string.h> /* * Create a new instance of repeater_s2v and return @@ -94,8 +95,6 @@ repeater_s2v::general_work (int noutput_items, consume_each(amt_move); - // fprintf(stderr, "d_acct %ld rc %ld amt_left %ld amt_move %ld d_buf_len %ld\n", d_acct, rc, amt_left, amt_move, d_buf_len); - // Tell runtime system how many output items we produced. return rc; } diff --git a/repeater/src/python/scope.py b/repeater/src/python/scope.py index 841d9b3..5638236 100755 --- a/repeater/src/python/scope.py +++ b/repeater/src/python/scope.py @@ -195,8 +195,6 @@ class p25_rx_block (stdgui2.std_top_block): self.baseband_amp = gr.multiply_const_ff(gain) self.real_amp = gr.multiply_const_ff(0.2) - self.sinkf = gr.file_sink(gr.sizeof_float, "sinkf.dat") - # self.connect_data_scope(True) self.fft_state = False @@ -230,7 +228,6 @@ class p25_rx_block (stdgui2.std_top_block): self.lo_freq = self.options.calibration self.lo = gr.sig_source_c (channel_rate, gr.GR_SIN_WAVE, self.lo_freq, 1.0, 0) self.mixer = gr.multiply_cc() - self.decim_sink = gr.file_sink(gr.sizeof_gr_complex, "32k-complex.dat") lpf_coeffs = gr.firdes.low_pass(1.0, self.channel_rate, 12000, 1200, gr.firdes.WIN_HANN) self.lpf = gr.fir_filter_ccf(1, lpf_coeffs) @@ -2080,7 +2077,7 @@ class correlation_plot_graph_window (plot.PlotCanvas): # following code copied from radiorausch file facsink.py # source: http://sites.google.com/site/radiorausch/ # -# modified Jul. 2011 to current GR KA1RBI (to fix error messages) +# KA1RBI modified Jul. 2011 to current GR (to fix error messages) # # Copyright 2003,2004,2005,2006 Free Software Foundation, Inc. # |