Added octave_complex_c, finished timing_recovery_cc debug, fixed indent

csdr.c

@@ -122,6 +122,8 @@ char usage[]=
 "    rtty_line_decoder_sy_u8\n"
 "    rtty_baudot2ascii_u8_u8\n"
 "    serial_line_decoder_sy_u8\n"
+"    octave_complex_c <samples_to_plot> <out_of_n_samples>\n"
+"    timing_recovery_cc <algorithm> <decimation> [--add_q]\n"
 "    \n"
 ;
 
@@ -2364,16 +2366,21 @@ int main(int argc, char *argv[])
 
 		int add_q = (argc>=5 && !strcmp(argv[4], "--add_q"));
 
+		int debug_n = 0;
+		if(argc>=7 && !strcmp(argv[5], "--octave")) debug_n = atoi(argv[6]);
+
 		if(!initialize_buffers()) return -2;
 		sendbufsize(the_bufsize/decimation);
 
 		timing_recovery_state_t state =	timing_recovery_init(algorithm, decimation, add_q);
 
+		int debug_i=0;
 		FREAD_C;
 		for(;;)
 		{
 			FEOF_CHECK;
 			timing_recovery_cc((complexf*)input_buffer, (complexf*)output_buffer, the_bufsize, &state);
+			if(++debug_i%debug_n==0) timing_recovery_trigger_debug(&state, 3);
 			//fprintf(stderr, "os %d\n",state.output_size);
 			fwrite(output_buffer, sizeof(complexf), state.output_size, stdout);
 			fflush(stdout);
@@ -2384,10 +2391,52 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if(!strcmp(argv[1],"octave_complex_c"))
+	{
+		if(argc<=2) return badsyntax("need required parameter (samples_to_plot)");
+		int samples_to_plot = 0;
+		sscanf(argv[2], "%d", &samples_to_plot);
+		if(samples_to_plot<=0) badsyntax("Number of samples to plot should be > 0");
+		if(argc<=3) return badsyntax("need required parameter (out_of_n_samples)");
+		int out_of_n_samples = 0;
+		sscanf(argv[3], "%d", &out_of_n_samples);
+		if(out_of_n_samples<samples_to_plot) badsyntax("out_of_n_samples should be < samples_to_plot");
+		complexf* read_buf = (complexf*)malloc(sizeof(complexf)*the_bufsize);
+
+		if(!sendbufsize(initialize_buffers())) return -2;
+		for(;;)
+		{
+			fread(read_buf, sizeof(complexf), samples_to_plot, stdin); 			
+			printf("N = %d;\nisig = [", samples_to_plot);
+			for(int i=0;i<samples_to_plot;i++) printf("%f ", iof(read_buf, i));
+			printf("];\nqsig = [");
+			for(int i=0;i<samples_to_plot;i++) printf("%f ", qof(read_buf, i));
+			printf("];\nzsig = [0:N-1];\nplot3(isig,zsig,qsig);\n");
+			//printf("xlim([-1 1]);\nzlim([-1 1]);\n");
+			fflush(stdout);
+			//if(fseek(stdin, (out_of_n_samples - samples_to_plot)*sizeof(complexf), SEEK_CUR)<0) { perror("fseek error"); return -3; } //this cannot be used on stdin
+			for(int seek_remain=out_of_n_samples-samples_to_plot;seek_remain>0;seek_remain-=samples_to_plot)
+			{
+				fread(read_buf, sizeof(complexf), MIN_M(samples_to_plot,seek_remain), stdin);
+			}
+			FEOF_CHECK;
+			TRY_YIELD;
+		}
+	}
+
 	if(!strcmp(argv[1],"none"))
 	{
 		return 0;
 	}
 
-	fprintf(stderr,"csdr: function name given in argument 1 (%s) does not exist. Possible causes:\n- You mistyped the commandline.\n- You need to update csdr to a newer version (if available).", argv[1]); return -1;
+	if(argv[1][0]=='?')
+	{
+		char buffer[100];
+		snprintf(buffer, 100-1, "csdr 2>&1 | grep %s", argv[1]+1);
+		fprintf(stderr, "csdr ?: %s\n", buffer);
+		system(buffer);
+		return 0;
+	}
+
+	fprintf(stderr,"csdr: function name given in argument 1 (%s) does not exist. Possible causes:\n- You mistyped the commandline.\n- You need to update csdr to a newer version (if available).\n", argv[1]); return -1;
 }

libcsdr.c

@@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "libcsdr.h"
 #include "predefined.h"
 #include <assert.h>
+#include <stdarg.h>
 
 /*
            _           _                   __                  _   _
@@ -970,7 +971,7 @@ float deemphasis_wfm_ff (float* input, float* output, int input_size, float tau,
 	output[0]=alpha*input[0]+(1-alpha)*last_output;
 	for (int i=1;i<input_size;i++) //@deemphasis_wfm_ff
        output[i]=alpha*input[i]+(1-alpha)*output[i-1]; //this is the simplest IIR LPF
-   	return output[input_size-1];
+	return output[input_size-1];
 }
 
 #define DNFMFF_ADD_ARRAY(x) if(sample_rate==x) { taps=deemphasis_nfm_predefined_fir_##x; taps_length=sizeof(deemphasis_nfm_predefined_fir_##x)/sizeof(float); }
@@ -1020,31 +1021,31 @@ void gain_ff(float* input, float* output, int input_size, float gain)
 
 float get_power_f(float* input, int input_size, int decimation)
 {
-  float acc = 0;
+	float acc = 0;
-  for(int i=0;i<input_size;i+=decimation)
+	for(int i=0;i<input_size;i+=decimation)
-  {
+	{
-    acc += (input[i]*input[i])/input_size;
+		acc += (input[i]*input[i])/input_size;
-  }
+	}
-  return acc;
+	return acc;
 }
 
 float get_power_c(complexf* input, int input_size, int decimation)
 {
-  float acc = 0;
+	float acc = 0;
-  for(int i=0;i<input_size;i+=decimation)
+	for(int i=0;i<input_size;i+=decimation)
-  {
+	{
-    acc += (iof(input,i)*iof(input,i)+qof(input,i)*qof(input,i))/input_size;
+		acc += (iof(input,i)*iof(input,i)+qof(input,i)*qof(input,i))/input_size;
-  }
+	}
-  return acc;
+	return acc;
 }
 
 /*
   __  __           _       _       _ 
- |  \/  |         | |     | |     | |
+ |  \/  |         | |     | |     |  |
- | \  / | ___   __| |_   _| | __ _| |_ ___  _ __ ___
+ | \  / | ___   __| |_   _| | __ _|  |_ ___  _ __ ___
- | |\/| |/ _ \ / _` | | | | |/ _` | __/ _ \| '__/ __|
+ | |\/| |/ _ \ / _` | | | | |/ _` |  __/ _ \| '__/ __|
- | |  | | (_) | (_| | |_| | | (_| | || (_) | |  \__ \
+ | |  | | (_) | (_| | |_| | | (_| |  || (_) | |  \__ \
- |_|  |_|\___/ \__,_|\__,_|_|\__,_|\__\___/|_|  |___/
+ |_|  |_|\___/ \__,_|\__,_|_|\__,_|\ __\___/|_|  |___/
 
 */
 
@@ -1175,7 +1176,6 @@ void logpower_cf(complexf* input, float* output, int size, float add_db)
 void accumulate_power_cf(complexf* input, float* output, int size)
 {
 	for(int i=0;i<size;i++) output[i] += iof(input,i)*iof(input,i) + qof(input,i)*qof(input,i); //@logpower_cf: pass 1
-	
 }
 
 void log_ff(float* input, float* output, int size, float add_db) {
@@ -1644,15 +1644,44 @@ 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, ...)
+{
+	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]\nplot3(isig,zsig,qsig,\"b-\",");
+	int point_z;
+	char point_color;
+	va_list vl;
+	va_start(vl,points_size);
+	for(int i=0;i<points_size;i++)
+	{
+		point_z = 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)?',':' ');
+	}
+	va_end(vl);
+	fprintf(stderr, ")");
+
+}
+
 timing_recovery_state_t timing_recovery_init(timing_recovery_algorithm_t algorithm, int decimation_rate, int use_q)
 {
 	timing_recovery_state_t to_return;
 	to_return.algorithm = algorithm;
 	to_return.decimation_rate = decimation_rate;
 	to_return.use_q = use_q;
+	to_return.debug_phase = -1;
 	return to_return;
 }
 
+void timing_recovery_trigger_debug(timing_recovery_state_t* state, int debug_phase)
+{
+	state->debug_phase=debug_phase;
+}
+
+
 void timing_recovery_cc(complexf* input, complexf* output, int input_size, timing_recovery_state_t* state)
 {
 	//We always assume that the input starts at center of the first symbol cross before the first symbol.
@@ -1679,8 +1708,16 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_size, timin
 				) * qof(input, current_bitstart_index + num_samples_halfbit * 2);
 				error /= 2;
 			}
+			if(state->debug_phase == si)
+			{
+				state->debug_phase = -1;
+				octave_plot_point_on_cplxsig(input+current_bitstart_index, state->decimation_rate*2,
+					num_samples_halfbit * 1, 'r',
+					num_samples_halfbit * 2, 'r',
+					num_samples_halfbit * 3, 'r',
+					0); //last argument is dummy, for the comma
+			}
 			current_bitstart_index += num_samples_halfbit * 2 + (error)?((error>0)?1:-1):0;
-			
 		}
 		state->input_processed = current_bitstart_index;
 		state->output_size = si;
@@ -1704,6 +1741,15 @@ void timing_recovery_cc(complexf* input, complexf* output, int input_size, timin
 			//Correction method #2: this can move in proportional to the error
 				if(error>2) error=2;
 				if(error<-2) error=-2;
+			if(state->debug_phase == si)
+			{
+				state->debug_phase = -1;
+				octave_plot_point_on_cplxsig(input+current_bitstart_index, state->decimation_rate*2,
+					num_samples_quarterbit * 1, 'r',
+					num_samples_quarterbit * 2, 'r',
+					num_samples_quarterbit * 3, 'r',
+					0);
+			}
 				current_bitstart_index += num_samples_halfbit * 2 + num_samples_halfbit * (-error/2);
 		}
 		state->input_processed = current_bitstart_index;
@@ -1731,28 +1777,6 @@ char* timing_recovery_get_string_from_algorithm(timing_recovery_algorithm_t algo
 	return "INVALID";
 }
 
-/*
-in struct:
-	char* debug_string;
-	char* debug_string_end;
-	int debug_string_length;
-	int debug_mode;
-	int debug_first_n_symbols;
-func:
-void timing_recovery_write_debug_string
-(
-		int input, 
-		int input_length, 
-		int current_bitstart_index, 
-		int current_output_index, 
-		int current_p1_index, 
-		int current_p2_index, 
-		timing_recovery_state_t* state
-)
-{
-	if(state->debug_string_end==state->debug_string+debug_string_length) return;
-}*/
-
 
 /*
   _____        _                                            _

libcsdr.h

@@ -303,9 +303,12 @@ typedef struct timing_recovery_state_s
 	int output_size;
 	int input_processed;
 	int use_q; //use both I and Q for calculating the error
+	int debug_phase;
 } timing_recovery_state_t;
 
 timing_recovery_state_t timing_recovery_init(timing_recovery_algorithm_t algorithm, int decimation_rate, int use_q);
 void timing_recovery_cc(complexf* input, complexf* output, int input_length, timing_recovery_state_t* state);
 timing_recovery_algorithm_t timing_recovery_get_algorithm_from_string(char* input);
 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 octave_plot_point_on_cplxsig(complexf* signal, int signal_size, int points_size, ...);