Fixed timing_recovery_cc docs and tedvar graph generator

This commit is contained in:
ha7ilm 2017-05-15 23:07:26 +02:00
parent 50528abd71
commit c6d5287d82
2 changed files with 4 additions and 4 deletions

6
csdr.c
View file

@ -127,7 +127,7 @@ char usage[]=
" rtty_baudot2ascii_u8_u8\n" " rtty_baudot2ascii_u8_u8\n"
" serial_line_decoder_f_u8 <samples_per_bits> [databits [stopbits]]\n" " serial_line_decoder_f_u8 <samples_per_bits> [databits [stopbits]]\n"
" octave_complex_c <samples_to_plot> <out_of_n_samples>\n" " octave_complex_c <samples_to_plot> <out_of_n_samples>\n"
" timing_recovery_cc <algorithm> <decimation> [mu [--add_q [--output_error | --output_indexes | --octave <show_every_nth> | --octave_save <show_every_nth> <directory> ]]] \n" " timing_recovery_cc <algorithm> <decimation> [mu [max_error [--add_q [--output_error | --output_indexes | --octave <show_every_nth> | --octave_save <show_every_nth> <directory> ]]]] \n"
" psk31_varicode_encoder_u8_u8\n" " psk31_varicode_encoder_u8_u8\n"
" psk31_varicode_decoder_u8_u8\n" " psk31_varicode_decoder_u8_u8\n"
" differential_encoder_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(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; float* timing_error = NULL;
if(output_error) timing_error = (float*)malloc(sizeof(float)*the_bufsize); 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; unsigned* sampled_indexes = NULL;
if(output_indexes) sampled_indexes = (unsigned*)malloc(sizeof(float)*the_bufsize); if(output_indexes) sampled_indexes = (unsigned*)malloc(sizeof(float)*the_bufsize);

View file

@ -49,7 +49,7 @@ end
function variance=run_var(snr, which_ted) function variance=run_var(snr, which_ted)
disp('ran a command') 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:'); disp('run_var output:');
out_vect' out_vect'
variance=out_vect(1); variance=out_vect(1);