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

timing_recovery_cc: a better graph

Browse source
This commit is contained in:
ha7ilm 2017-03-04 19:50:11 +01:00
parent e1d4a4ff3b
commit 2a03208e43
3 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
csdr.c
View file

@ -2376,6 +2376,7 @@ int main(int argc, char *argv[])
timing_recovery_state_t state = timing_recovery_init(algorithm, decimation, add_q); timing_recovery_state_t state = timing_recovery_init(algorithm, decimation, add_q);
int debug_i=0; int debug_i=0;
state.debug_force = !!debug_n; //should remove that later
FREAD_C; FREAD_C;
for(;;) for(;;)
{ {

45
libcsdr.c
View file

@ -1644,24 +1644,40 @@ void pll_cc(pll_t* p, complexf* input, float* output_dphase, complexf* output_nc
} }
} }
void octave_plot_point_on_cplxsig(complexf* signal, int signal_size, int points_size, ...) void octave_plot_point_on_cplxsig(complexf* signal, int signal_size, float error, int points_size, ...)
{ {
fprintf(stderr, "N = %d;\nisig = [", signal_size); int* points_z = (int*)malloc(sizeof(int)*points_size);
for(int i=0;i<signal_size;i++) fprintf(stderr, "%f ", iof(signal,i)); int* points_color = (int*)malloc(sizeof(int)*points_size);
fprintf(stderr, "];\nqsig = [");
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-\",");
int point_z;
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); points_z[i] = va_arg(vl, int);
point_color = va_arg(vl, int); points_color[i] = va_arg(vl, int);
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)?',':' ');
} }
fprintf(stderr, "N = %d;\nisig = [", signal_size);
for(int i=0;i<signal_size;i++) fprintf(stderr, "%f ", iof(signal,i));
fprintf(stderr, "];\nqsig = [");
for(int i=0;i<signal_size;i++) fprintf(stderr, "%f ", qof(signal,i));
fprintf(stderr, "];\nzsig = [0:N-1];\nsubplot(2,2,[2 4]);\nplot3(isig,zsig,qsig,\"b-\",");
for(int i=0;i<points_size;i++)
fprintf(stderr, "[%f],[%d],[%f],\"%c.\"%c",
iof(signal, points_z[i]), points_z[i], qof(signal, points_z[i]),
(char)points_color[i]&0xff, (i<points_size-1)?',':' '
);
va_end(vl); va_end(vl);
fprintf(stderr, ");\ntitle(\"error = %f\");\nsubplot(2,2,1);\nplot(zsig, isig,\"b-\",", error);
for(int i=0;i<points_size;i++)
fprintf(stderr, "[%d],[%f],\"%c.\"%c",
points_z[i], iof(signal, points_z[i]),
(char)points_color[i]&0xff, (i<points_size-1)?',':' '
);
fprintf(stderr, ");\nsubplot(2,2,3);\nplot(zsig, qsig,\"b-\",");
for(int i=0;i<points_size;i++)
fprintf(stderr, "[%d],[%f],\"%c.\"%c",
points_z[i], qof(signal, points_z[i]),
(char)points_color[i]&0xff, (i<points_size-1)?',':' '
);
fprintf(stderr, ");\n"); fprintf(stderr, ");\n");
fflush(stderr); fflush(stderr);
@ -1675,6 +1691,7 @@ timing_recovery_state_t timing_recovery_init(timing_recovery_algorithm_t algorit
to_return.use_q = use_q; to_return.use_q = use_q;
to_return.debug_phase = -1; to_return.debug_phase = -1;
to_return.debug_count = 3; to_return.debug_count = 3;
to_return.debug_force = 0;
return to_return; return to_return;
} }
@ -1713,11 +1730,11 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_size, timin
) * qof(input, current_bitstart_index + num_samples_halfbit * 2); ) * qof(input, current_bitstart_index + num_samples_halfbit * 2);
error /= 2; error /= 2;
} }
if(state->debug_phase >= si && debug_i) if( state->debug_force || (state->debug_phase >= si && debug_i) )
{ {
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, error,
3, 3,
num_samples_halfbit * 1, 'r', num_samples_halfbit * 1, 'r',
num_samples_halfbit * 2, 'r', num_samples_halfbit * 2, 'r',
@ -1753,7 +1770,7 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_size, timin
if(state->debug_phase == si) if(state->debug_phase == si)
{ {
state->debug_phase = -1; 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, error,
num_samples_quarterbit * 1, 'r', num_samples_quarterbit * 1, 'r',
num_samples_quarterbit * 2, 'r', num_samples_quarterbit * 2, 'r',
num_samples_quarterbit * 3, 'r', num_samples_quarterbit * 3, 'r',

3
libcsdr.h
View file

@ -305,6 +305,7 @@ typedef struct timing_recovery_state_s
int use_q; //use both I and Q for calculating the error int use_q; //use both I and Q for calculating the error
int debug_phase; int debug_phase;
int debug_count; int debug_count;
int debug_force;
} timing_recovery_state_t; } timing_recovery_state_t;
timing_recovery_state_t timing_recovery_init(timing_recovery_algorithm_t algorithm, int decimation_rate, int use_q); timing_recovery_state_t timing_recovery_init(timing_recovery_algorithm_t algorithm, int decimation_rate, int use_q);
@ -312,4 +313,4 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_length, tim
timing_recovery_algorithm_t timing_recovery_get_algorithm_from_string(char* input); timing_recovery_algorithm_t timing_recovery_get_algorithm_from_string(char* input);
char* timing_recovery_get_string_from_algorithm(timing_recovery_algorithm_t algorithm); char* timing_recovery_get_string_from_algorithm(timing_recovery_algorithm_t algorithm);
void timing_recovery_trigger_debug(timing_recovery_state_t* state, int debug_phase); void timing_recovery_trigger_debug(timing_recovery_state_t* state, int debug_phase);
void octave_plot_point_on_cplxsig(complexf* signal, int signal_size, int points_size, ...); void octave_plot_point_on_cplxsig(complexf* signal, int signal_size, float error, int points_size, ...);