rpitx/csdr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

timing_recovery_cc --octave now works

Browse source
This commit is contained in:
ha7ilm 2017-03-03 18:45:03 +01:00
parent 969992f734
commit 818b6b1157
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libcsdr.c
View file

@ -1652,17 +1652,18 @@ void octave_plot_point_on_cplxsig(complexf* signal, int signal_size, int points_
for(int i=0;i<signal_size;i++) fprintf(stderr, "%f ", qof(signal,i)); for(int i=0;i<signal_size;i++) fprintf(stderr, "%f ", qof(signal,i));
fprintf(stderr, "]\nzsig = [0:N-1]\nplot3(isig,zsig,qsig,\"b-\","); fprintf(stderr, "]\nzsig = [0:N-1]\nplot3(isig,zsig,qsig,\"b-\",");
int point_z; int point_z;
char point_color; int point_color;
va_list vl; va_list vl;
va_start(vl,points_size); va_start(vl,points_size);
for(int i=0;i<points_size;i++) for(int i=0;i<points_size;i++)
{ {
point_z = va_arg(vl, int); point_z = va_arg(vl, int);
point_color = va_arg(vl, int); point_color = va_arg(vl, int);
fprintf(stderr, "[%f],[%d],[%f],\"%c.\"%c", iof(signal, point_z), point_z, qof(signal, point_z), point_color, (i<points_size-1)?',':' '); fprintf(stderr, "[%f],[%d],[%f],\"%c.\"%c", iof(signal, point_z), point_z, qof(signal, point_z), (char)point_color&0xff, (i<points_size-1)?',':' ');
} }
va_end(vl); va_end(vl);
fprintf(stderr, ")"); fprintf(stderr, ")\n");
fflush(stderr);
} }
@ -1682,7 +1683,7 @@ void timing_recovery_trigger_debug(timing_recovery_state_t* state, int debug_pha
state->debug_phase=debug_phase; state->debug_phase=debug_phase;
} }
#define MTIMINGR_HDEBUG 1 #define MTIMINGR_HDEBUG 0
void timing_recovery_cc(complexf* input, complexf* output, int input_size, timing_recovery_state_t* state) void timing_recovery_cc(complexf* input, complexf* output, int input_size, timing_recovery_state_t* state)
{ {
@ -1717,6 +1718,7 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_size, timin
debug_i--; debug_i--;
if(!debug_i) state->debug_phase = -1; if(!debug_i) state->debug_phase = -1;
octave_plot_point_on_cplxsig(input+current_bitstart_index, state->decimation_rate*2, octave_plot_point_on_cplxsig(input+current_bitstart_index, state->decimation_rate*2,
3,
num_samples_halfbit * 1, 'r', num_samples_halfbit * 1, 'r',
num_samples_halfbit * 2, 'r', num_samples_halfbit * 2, 'r',
num_samples_halfbit * 3, 'r', num_samples_halfbit * 3, 'r',