From c6d5287d820535a9165e6726acd582cffe0ab625 Mon Sep 17 00:00:00 2001 From: ha7ilm Date: Mon, 15 May 2017 23:07:26 +0200 Subject: [PATCH] Fixed timing_recovery_cc docs and tedvar graph generator --- csdr.c | 6 +++--- grc_tests/bpsk31_tedvar.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csdr.c b/csdr.c index e04bae0..ad1d30d 100755 --- a/csdr.c +++ b/csdr.c @@ -127,7 +127,7 @@ char usage[]= " rtty_baudot2ascii_u8_u8\n" " serial_line_decoder_f_u8 [databits [stopbits]]\n" " octave_complex_c \n" -" timing_recovery_cc [mu [--add_q [--output_error | --output_indexes | --octave | --octave_save ]]] \n" +" timing_recovery_cc [mu [max_error [--add_q [--output_error | --output_indexes | --octave | --octave_save ]]]] \n" " psk31_varicode_encoder_u8_u8\n" " psk31_varicode_decoder_u8_u8\n" " differential_encoder_u8_u8\n" @@ -2585,11 +2585,11 @@ int main(int argc, char *argv[]) } if(debug_every_nth<0) { errhead(); fprintf(stderr, "--add_q mode on\n"); } - if(argc>=(8+add_q) && !strcmp(argv[7+add_q], "--output_error")) output_error = 1; + if(argc>=(7+add_q) && !strcmp(argv[6+add_q], "--output_error")) output_error = 1; float* timing_error = NULL; if(output_error) timing_error = (float*)malloc(sizeof(float)*the_bufsize); - if(argc>=(8+add_q) && !strcmp(argv[7+add_q], "--output_indexes")) output_indexes = 1; + if(argc>=(7+add_q) && !strcmp(argv[6+add_q], "--output_indexes")) output_indexes = 1; unsigned* sampled_indexes = NULL; if(output_indexes) sampled_indexes = (unsigned*)malloc(sizeof(float)*the_bufsize); diff --git a/grc_tests/bpsk31_tedvar.m b/grc_tests/bpsk31_tedvar.m index af43a8f..5a65e7a 100755 --- a/grc_tests/bpsk31_tedvar.m +++ b/grc_tests/bpsk31_tedvar.m @@ -49,7 +49,7 @@ end function variance=run_var(snr, which_ted) disp('ran a command') - out_vect=shrun(sprintf('cat /tmp/psk31-raw-data | csdr awgn_cc %d --awgnfile /tmp/psk31-gaussian-noise | csdr timing_recovery_cc %s 256 --add_q --output_indexes | CSDR_FIXED_BUFSIZE=1048576 csdr normalized_timing_variance_u32_f 256 85', snr, which_ted), 'float32', 1); + out_vect=shrun(sprintf('cat /tmp/psk31-raw-data | csdr awgn_cc %d --awgnfile /tmp/psk31-gaussian-noise | csdr timing_recovery_cc %s 256 0.5 2 --add_q --output_indexes | CSDR_FIXED_BUFSIZE=1048576 csdr normalized_timing_variance_u32_f 256 85', snr, which_ted), 'float32', 1); disp('run_var output:'); out_vect' variance=out_vect(1);