diff --git a/lib/superfox/Makefile b/lib/superfox/Makefile index 6e3127f51..290e897da 100644 --- a/lib/superfox/Makefile +++ b/lib/superfox/Makefile @@ -15,12 +15,17 @@ CFLAGS= -O9 -Wall %.o: %.F90 ${FC} ${FFLAGS} -c $< -all: rstest +all: rstest rs_125_49 -OBJS2 = rstest.o init_rs_sf.o encode_rs_sf.o decode_rs_sf.o \ +OBJS1 = rstest.o init_rs_sf.o encode_rs_sf.o decode_rs_sf.o \ rs_sf.o ran1.o -rstest: $(OBJS2) - $(FC) -o rstest $(OBJS2) +rstest: $(OBJS1) + $(FC) -o rstest $(OBJS1) + +OBJS2 = rs_125_49.o init_rs_sf.o encode_rs_sf.o decode_rs_sf.o \ + rs_sf.o ran1.o get_crc14.o +rs_125_49: $(OBJS2) + $(FC) -o rs_125_49 $(OBJS2) init_rs_sf.o: init_rs.c gcc -DBIGSYM=1 $(CFLAGS) -c -o $@ $^ diff --git a/lib/superfox/sfox_params.f90 b/lib/superfox/sfox_params.f90 index 5bc92079b..601db42f9 100644 --- a/lib/superfox/sfox_params.f90 +++ b/lib/superfox/sfox_params.f90 @@ -1,15 +1,16 @@ - parameter (KK=49) !Information symbols - parameter (ND1=25) !Data symbols before sync waveform - parameter (ND2=100) !Data symbols after sync waveform - parameter (ND=ND1+ND2) !Total data symbols (125) - parameter (NS=23) !Sync symbols (for length) - parameter (NSPS=1024) !Samples per symbol at 12000 S/s - parameter (NSYNC=NS*NSPS) !Samples in sync waveform (23,552) - parameter (NZ=NSPS*(ND+NS)) !Samples in full Tx waveform (151,552) - parameter (NMAX=15*12000) !Samples in iwave (180,000) - parameter (NFFT=32768) !Length of FFT for sync waveform - parameter (NFFT1=2*NSPS) !Length of FFTs for symbol spectra - parameter (MM=7) !Bits per symbol - parameter (NQ=2**MM) !Q, number of MFSK tones - parameter (NN=127) !Our code is (127,51) - parameter (NFZ=3) !First zero +! Our code is RS(127,51). We puncture two symbols to give (125,49) + parameter (NN=127) !Channel symbols, before puncture + parameter (KK=51) !Information symbols, before puncture + parameter (ND1=25) !Data symbols before sync + parameter (ND2=100) !Data symbols after sync + parameter (ND=ND1+ND2) !Total data symbols (125) + parameter (NS=24) !Sync symbols (for length) + parameter (NSPS=1024) !Samples per symbol at 12000 S/s + parameter (NSYNC=NS*NSPS) !Samples in sync waveform (23,552) + parameter (NZ=NSPS*(ND+NS)) !Samples in full Tx waveform (151,552) + parameter (NMAX=15*12000) !Samples in iwave (180,000) + parameter (NFFT=32768) !Length of FFT for sync waveform + parameter (NFFT1=2*NSPS) !Length of FFTs for symbol spectra + parameter (MM=7) !Bits per symbol + parameter (NQ=2**MM) !Q, number of MFSK tones + parameter (NFZ=3) !First zero