Edited Makefile

Changed functionality of pack_bits_8to1_u8_u8
Added pack_bits_1to8_u8_u8, pattern_search_u8_u8, dbpsk_decoder_c_u8, bfsk_demod_cf

Author: ha7ilm

Makefile

@@ -42,6 +42,7 @@ PARAMS_MISC = -Wno-unused-result
 #DEBUG_ON = 0 #debug is always on by now (anyway it could be compiled with `make DEBUG_ON=1`)
 #PARAMS_DEBUG = $(if $(DEBUG_ON),-g,)
 FFTW_PACKAGE = fftw-3.3.3
+PARSEVECT ?= yes
 
 .PHONY: clean-vect clean codequality
 all: codequality csdr nmux
@@ -51,7 +52,9 @@ libcsdr.so: fft_fftw.c fft_rpi.c libcsdr_wrapper.c libcsdr.c libcsdr_gpl.c fastd
 	@echo
 	rm -f dumpvect*.vect
 	gcc -std=gnu99 $(PARAMS_LOOPVECT) $(PARAMS_SIMD) $(LIBSOURCES) $(PARAMS_LIBS) $(PARAMS_MISC) -fpic -shared -o libcsdr.so
+ifeq ($(PARSEVECT),yes)
 	-./parsevect dumpvect*.vect
+endif
 csdr: csdr.c libcsdr.so
 	gcc -std=gnu99 $(PARAMS_LOOPVECT) $(PARAMS_SIMD) csdr.c $(PARAMS_LIBS) -L. -lcsdr $(PARAMS_MISC) -o csdr
 ddcd: ddcd.cpp libcsdr.so ddcd.h

README.md

@@ -832,7 +832,7 @@ For this input, the output of `psk31_varicode_encoder_u8_u8` will be the followi
 
 Syntax:
 
-    csdr repeat_u8 <taps_length> [resonator_rate × N]\n"
+    csdr repeat_u8 <data_bytes × N>
 
 It repeatedly outputs a set of data bytes (given with decimal numbers).
 
@@ -871,6 +871,16 @@ Syntax:
 
     csdr pack_bits_8to1_u8_u8 
 
+TODO 
+
+----
+
+### [pack_bits_1to8_u8_u8](#pack_bits_1to8_u8_u8)
+
+Syntax:
+
+    csdr pack_bits_1to8_u8_u8 
+
 It serializes the bytes on the input: it outputs each bit of the input byte as a single byte valued 0x00 or 0x01, starting from the lowest bit and going to the highest bit.
 
 The output is 8 times as large in size as the input. 

csdr.c

@@ -146,6 +146,7 @@ char usage[]=
 "    gaussian_noise_c\n"
 "    awgn_cc <snr_db> [--snrshow]\n"
 "    pack_bits_8to1_u8_u8\n"
+"    pack_bits_1to8_u8_u8\n"
 "    firdes_pulse_shaping_filter_f (RRC <samples_per_symbol> <num_taps> <beta> | COSINE <samples_per_symbol>)\n"
 "    pulse_shaping_filter_cc (RRC <samples_per_symbol> <num_taps> <beta> | COSINE <samples_per_symbol>)\n"
 "    add_n_zero_samples_at_beginning_f <n_zero_samples>\n"
@@ -154,6 +155,9 @@ char usage[]=
 "    add_const_cc <i> <q>\n"
 "    tee <path> [buffers]\n"
 "    pll_cc (1 [alpha] |2 [bandwidth [damping_factor [ko [kd]]]])\n"
+"    pattern_search_u8_u8 <values_after> <pattern_values × N>\n" 
+"    dbpsk_decoder_c_u8\n" 
+"    bfsk_demod_cf <spacing> <filter_length>\n"
 "    ?<search_the_function_list>\n"
 "    =<evaluate_python_expression>\n"
 "    \n"
@@ -2723,7 +2727,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if(!strcmp(argv[1],"pack_bits_8to1_u8_u8")) 
+    if(!strcmp(argv[1],"pack_bits_1to8_u8_u8")) 
     {
         if(!initialize_buffers()) return -2;
         sendbufsize(the_bufsize*8);
@@ -2733,12 +2737,27 @@ int main(int argc, char *argv[])
         {
             FEOF_CHECK;
             fread((void*)local_input_buffer, sizeof(unsigned char), the_bufsize, stdin);
-            pack_bits_8to1_u8_u8(local_input_buffer, local_output_buffer, the_bufsize);
+            pack_bits_1to8_u8_u8(local_input_buffer, local_output_buffer, the_bufsize);
             fwrite((void*)local_output_buffer, sizeof(unsigned char), the_bufsize*8, stdout);
             TRY_YIELD;
         }
     }
 
+    if(!strcmp(argv[1],"pack_bits_8to1_u8_u8")) 
+    {
+        if(!initialize_buffers()) return -2;
+        sendbufsize(1);
+        char local_input_buffer[8];
+        for(;;)
+        {
+            FEOF_CHECK;
+            fread((void*)local_input_buffer, sizeof(unsigned char), 8, stdin);
+            unsigned char c = pack_bits_8to1_u8_u8(local_input_buffer);
+            fwrite(&c, sizeof(unsigned char), 1, stdout);
+            TRY_YIELD;
+        }
+    }
+
     if(!strcmp(argv[1],"psk31_varicode_encoder_u8_u8")) 
     {
         if(!initialize_buffers()) return -2;
@@ -2914,7 +2933,7 @@ int main(int argc, char *argv[])
         complexf* taps=(complexf*)malloc(sizeof(complexf)*length);
 
         //Make the filter
-        firdes_add_resonator_c(taps, length, rate, window, 0, 1);
+        firdes_add_peak_c(taps, length, rate, window, 0, 1);
 
         //Do the output
         if(octave) printf("taps=[");
@@ -2960,7 +2979,7 @@ int main(int argc, char *argv[])
         for(int i=0; i<num_peaks; i++)
         {
             //fprintf(stderr, "nr = %d\n", i==num_peaks-1);
-            firdes_add_resonator_c(taps, taps_length, peak_rate[i], window, 1, i==num_peaks-1);
+            firdes_add_peak_c(taps, taps_length, peak_rate[i], window, 1, i==num_peaks-1);
         }
 
         int output_size=0;
@@ -3215,6 +3234,53 @@ int main(int argc, char *argv[])
         return 0;
     }
 
+    if(!strcmp(argv[1], "dbpsk_decoder_c_u8")) 
+    {
+        if(!sendbufsize(initialize_buffers())) return -2;
+        unsigned char* local_output_buffer = (unsigned char*)malloc(sizeof(unsigned char)*the_bufsize);
+        for(;;)
+        {
+            FEOF_CHECK;
+            FREAD_C;
+            dbpsk_decoder_c_u8((complexf*)input_buffer, local_output_buffer, the_bufsize);
+            fwrite(local_output_buffer, sizeof(unsigned char), the_bufsize, stdout);
+            TRY_YIELD;
+        }
+        return 0;
+    }
+
+    if(!strcmp(argv[1], "bfsk_demod_cf")) //<spacing> <filter_length> 
+    {
+        float frequency_shift = 0;
+        if(argc<=2) return badsyntax("required parameter <frequency_shift> is missing.");
+        sscanf(argv[2],"%f",&frequency_shift);
+
+        int filter_length = 0;
+        if(argc<=3) return badsyntax("required parameter <filter_length> is missing.");
+        sscanf(argv[3],"%d",&filter_length);
+
+        complexf* mark_filter = (complexf*)malloc(sizeof(complexf)*filter_length);
+        complexf* space_filter = (complexf*)malloc(sizeof(complexf)*filter_length);
+        firdes_add_peak_c(mark_filter, filter_length, frequency_shift/2, WINDOW_DEFAULT, 0, 1);
+        firdes_add_peak_c(space_filter, filter_length, -frequency_shift/2, WINDOW_DEFAULT, 0, 1);
+
+        if(!sendbufsize(initialize_buffers())) return -2;
+
+        int input_skip=0;
+        int output_size=0;
+        FREAD_C;
+        for(;;)
+        {
+            FEOF_CHECK;
+            output_size=bfsk_demod_cf((complexf*)input_buffer, output_buffer, the_bufsize, mark_filter, space_filter, filter_length);
+            fwrite(output_buffer, sizeof(float), output_size, stdout);
+            TRY_YIELD;
+            memmove((complexf*)input_buffer,((complexf*)input_buffer)+output_size,(the_bufsize-output_size)*sizeof(complexf));
+            fread(((complexf*)input_buffer)+(the_bufsize-output_size), sizeof(complexf), output_size, stdin);
+        }
+        return 0;
+    }
+
     if(!strcmp(argv[1], "add_const_cc")) //<i> <q>
     {
         complexf x;
@@ -3411,6 +3477,105 @@ int main(int argc, char *argv[])
             TRY_YIELD;
         }
     }
+/*
+    if(!strcmp(argv[1],"syncword_search"))
+    {
+        if(argc<3) return badsyntax("need required parameter (syncword)");
+        unsigned long syncword=0UL;
+        int syncword_length=strlen(argv[2]);
+        for(int i=0; i<sycword_len;i++)
+        {
+            syncword<<=4;
+            char c=argv[2][i];
+            unsigned char cval = 0;
+            if(c<='9'&&c>='0') cval = c-'0';
+            if(c<='f'&&c>='a') cval = c-'a'+10;
+            syncword|=cval;
+        }
+        errhead(); fprintf("syncword = 0x%0x, syncword_length=%d\n", syncword, syncword_length);
+        if(argc<4) return badsyntax("need required parameter (bits_after)");
+        int bits_after = 0;
+        sscanf(argv[3], &bits_after);
+        if(bits_after<0) return badsyntax("bits_after should be >0");
+        unsigned char* syncword_bits = malloc(sizeof(unsigned char)*syncword_length*4);
+        int k=0;
+        for(int i=0;i<syncword_length;i++)
+        {
+            for(int j=7;j;j--)
+            {
+                syncword_bits[k++]=syncword[i]>>j
+            }
+        }
+        malloc
+
+    }
+*/
+    if(!strcmp(argv[1],"pattern_search_u8_u8")) //<values_after> <pattern_values × N>
+    {
+        if(argc<3) return badsyntax("need required parameter (values_after)");
+        int values_after = 0;
+        sscanf(argv[2], "%d", &values_after);
+        if(argc<4) return badsyntax("need required parameter (pattern_values × N)");
+        int pattern_values_length = argc-3;
+        unsigned* pattern_values = (unsigned*)malloc(sizeof(unsigned)*pattern_values_length);
+        for(int i=0;i<pattern_values_length;i++)
+            sscanf(argv[3+i],"%u",pattern_values+i);
+
+        errhead(); fprintf(stderr,"pattern values: ");
+        for(int i=0;i<pattern_values_length;i++)
+            fprintf(stderr, "%x ", *(pattern_values+i));
+        fprintf(stderr,"\n");
+
+        unsigned char* input_buffer = (unsigned char*)malloc(sizeof(unsigned char)*pattern_values_length); //circular buffer
+        unsigned char* output_buffer = (unsigned char*)malloc(sizeof(unsigned char)*values_after);
+        int input_index = 0;
+        int valid_values = 0;
+        for(;;)
+        {
+            FEOF_CHECK;
+            unsigned char cchar = input_buffer[input_index++]=(unsigned char)fgetc(stdin);
+            if(valid_values<pattern_values_length) { valid_values++; continue; }
+            if(input_index>=pattern_values_length) input_index=0;
+            int match=1;
+            //fprintf(stderr, "ov1: ");
+            //for(int i=0;i<pattern_values_length;i++) fprintf(stderr, "%02x ",  input_buffer[i]);
+            //fprintf(stderr, "\nov2: ");
+            //for(int i=0;i<pattern_values_length;i++) fprintf(stderr, "%02x ",  pattern_values[i]);
+            //fprintf(stderr, "\n");
+
+            //fprintf(stderr, "v1: ");
+            //for(int i=input_index;i<pattern_values_length;i++) fprintf(stderr, "%s%02x ", ((input_buffer[i])?"\x1B[34m":"\x1B[0m"), input_buffer[i]);
+            //for(int i=0;i<input_index;i++) fprintf(stderr, "%s%02x ", ((input_buffer[i])?"\x1B[34m":"\x1B[0m"), input_buffer[i]);
+            //fprintf(stderr, "\x1B[0m  %02x\n", cchar);
+
+            //fprintf(stderr, "========\n");
+            int j=0;
+            for(int i=input_index;i<pattern_values_length;i++) 
+            {
+                //fprintf(stderr, "%02x ~ %02x\n",  input_buffer[i], pattern_values[j]);
+                if(input_buffer[i]!=pattern_values[j++]) { match=0; break;}
+            }
+            //fprintf(stderr, "~~~~~~~~\n");
+            if(input_index!=0 && match) 
+            {
+                for(int i=0;i<input_index;i++) 
+                {
+                    //fprintf(stderr, "%02x ~ %02x\n",  input_buffer[i], pattern_values[j]);
+                    if(input_buffer[i]!=pattern_values[j++]) { match=0; break;}
+                }
+            }
+           
+            //if(match) fprintf(stderr, "j=%d\n", j);
+            if(match ) 
+            {
+                valid_values = 0;
+                //fprintf(stderr,"matched!\n");
+                fread(output_buffer, sizeof(unsigned char), values_after, stdin);
+                fwrite(output_buffer, sizeof(unsigned char), values_after, stdout);
+            }
+            TRY_YIELD;
+        }
+    }
 
     if(!strcmp(argv[1],"none"))
     {

grc_tests/psk31_sigmodel.m

@@ -14,15 +14,19 @@
 	end
 end
 
+global padding=[-2 2];
+
 function [toreturny, plotrange]=y(s)
 	global Tb
+    global padding
 	slen=size(s)(2)
-	plotrange=(-3*Tb):(slen+2)*Tb-1;
+	plotrange=((padding(1)-1)*Tb):(slen+padding(2))*Tb-1;
 	plotlen=size(plotrange)(2)
 	toreturny=zeros(1,plotlen);
 	for i=1:slen %sum of (symbol[i] * filter impulse response) for all symbols
 		toreturny+=s(i)*gbb(plotrange.-(i-1)*Tb); 
 	end
+    plotrange=plotrange/Tb
 end
 
 function fmtplot(h)
@@ -36,15 +40,31 @@ function fmtplot(h)
 
 h=figure(1);
 subplot(2, 1, 1);
-plot(y([1]), 'linewidth', 2)
-title(sprintf("Impulse response of pulse shaping filter\n(1 symbol = %d samples)", Tb))
-xlabel('t [1/Ts]')
+[a b]=y([1]);
+plot(b, a, 'linewidth', 2)
+title(sprintf("Impulse response of pulse shaping filter"))
+xlabel('t/Ts')
 ylabel('h(t)')
 
 subplot(2, 1, 2);
-plot(y([1 1 -1 -1 1 1 1 -1 1 -1 1 1]), 'linewidth', 2)
+[a b]=y([1 1 -1 -1 1 1 1 -1 1 -1 1 1]);
+plot(b, a, 'linewidth', 2)
 title("Baseband signal for modulator input\nbit sequence: 110011101011") %assuming that differential encoding has already been performed
-xlabel('t [1/Ts]')
+xlabel('t/Ts')
 ylabel('s(t)')
+xbounds = xlim;
+set(gca,'XTick',xbounds(1):xbounds(2));
 fmtplot(h);
 pause
+exit
+
+%fourier analisys of baseband signal
+h2=figure(2);
+padding=[-1 1]
+plot(y([1]))
+h3=figure(3);
+fftvals=abs(fft(y([1])));
+sizefftvals=size(fftvals)(2)
+fftvals=[fftvals(sizefftvals/2:sizefftvals) fftvals(2:sizefftvals/2)]
+plot(fftvals, "-")
+pause

grc_tests/test_bpsk_costas_loop_convertwavs.sh

@@ -4,6 +4,7 @@ sox -r 48k -t f32 -c 1 /s/costas_error -t wav -e floating-point /s/costas_error.
 sox -r 48k -t f32 -c 1 /s/costas_dphase -t wav -e floating-point --norm=-6 /s/costas_dphase.wav 
 sox -r 48k -t f32 -c 2 /s/costas_input -t wav -e floating-point /s/costas_input.wav 
 sox -r 48k -t f32 -c 2 /s/costas_output -t wav -e floating-point /s/costas_output.wav 
+sox -r 48k -t f32 -c 2 /s/tr_input -t wav -e floating-point /s/tr_input.wav 
 ls -al /s/costas_nco.wav /s/costas_error.wav /s/costas_dphase.wav /s/costas_output.wav /s/costas_input.wav