From 8a5850118918cacddf50e02bdae827ba2ceeada0 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Mon, 4 Mar 2019 22:01:29 +1030 Subject: [PATCH] Re-base to latest upstream demodulators (noting this reverts the rs41dm auxdata change) --- demod/demod_dft.c | 128 +++-- demod/demod_dft.h | 10 +- demod/demod_iq.c | 152 +++--- demod/demod_iq.h | 6 +- demod/dfm09dm_dft.c | 28 +- demod/lms6dm_dft.c | 29 +- demod/lmsXdm_dft.c | 1097 +++++++++++++++++++++++++++++++++++++++++++ demod/m10dm_dft.c | 29 +- demod/rs41dm_dft.c | 41 +- demod/rs41dm_iq.c | 35 +- demod/rs92dm_dft.c | 27 +- 11 files changed, 1382 insertions(+), 200 deletions(-) create mode 100644 demod/lmsXdm_dft.c diff --git a/demod/demod_dft.c b/demod/demod_dft.c index e3452df..435ac84 100644 --- a/demod/demod_dft.c +++ b/demod/demod_dft.c @@ -13,6 +13,7 @@ #include #include #include +#include typedef unsigned char ui8_t; @@ -27,7 +28,7 @@ typedef int i32_t; static unsigned int sample_in, sample_out, delay; static int buffered = 0; -static int N, M; +static int L, M; static float *match = NULL, *bufs = NULL; @@ -45,7 +46,6 @@ static float dc = 0.0; /* ------------------------------------------------------------------------------------ */ -#include static int LOG2N, N_DFT; @@ -106,53 +106,54 @@ static void Nidft(float complex *Z, float complex *z) { /* ------------------------------------------------------------------------------------ */ -int getCorrDFT(int abs, int K, unsigned int pos, float *maxv, unsigned int *maxvpos) { +int getCorrDFT(int K, unsigned int pos, float *maxv, unsigned int *maxvpos) { int i; int mp = -1; float mx = 0.0; + float mx2 = 0.0; + float re_cx = 0.0; float xnorm = 1; unsigned int mpos = 0; dc = 0.0; - if (N + K > N_DFT/2 - 2) return -1; - if (sample_in < delay+N+K) return -2; + if (K + L > N_DFT) return -1; + if (sample_out < L) return -2; if (pos == 0) pos = sample_out; - for (i = 0; i < N+K; i++) xn[i] = bufs[(pos+M -(N+K-1) + i) % M]; + for (i = 0; i < K+L; i++) xn[i] = bufs[(pos+M -(K+L-1) + i) % M]; while (i < N_DFT) xn[i++] = 0.0; dft(xn, X); - dc = get_bufmu(pos-sample_out); //oder: dc = creal(X[0])/N_DFT; + dc = get_bufmu(pos-sample_out); //oder: dc = creal(X[0])/(K+L); for (i = 0; i < N_DFT; i++) Z[i] = X[i]*Fm[i]; Nidft(Z, cx); - if (abs) { - for (i = N; i < N+K; i++) { - if (fabs(creal(cx[i])) > fabs(mx)) { // imag(cx)=0 - mx = creal(cx[i]); - mp = i; - } + // relativ Peak - Normierung erst zum Schluss; + // dann jedoch nicht zwingend corr-Max wenn FM-Amplitude bzw. norm(x) nicht konstant + // (z.B. rs41 Signal-Pausen). Moeglicherweise wird dann wahres corr-Max in dem + // K-Fenster nicht erkannt, deshalb K nicht zu gross waehlen. + // + mx2 = 0.0; // t = L-1 + for (i = L-1; i < K+L; i++) { // i=t .. i=t+K < t+1+K + re_cx = creal(cx[i]); // imag(cx)=0 + if (re_cx*re_cx > mx2) { + mx = re_cx; + mx2 = mx*mx; + mp = i; } } - else { - for (i = N; i < N+K; i++) { - if (creal(cx[i]) > mx) { // imag(cx)=0 - mx = creal(cx[i]); - mp = i; - } - } - } - if (mp == N || mp == N+K-1) return -4; // Randwert + if (mp == L-1 || mp == K+L-1) return -4; // Randwert + // mp == t mp == K+t - mpos = pos - ( N+K-1 - mp ); - xnorm = sqrt(qs[(mpos + 2*M) % M]); + mpos = pos - (K + L-1) + mp; + xnorm = sqrt(qs[(mpos + 2*M) % M]); // Nvar = L mx /= xnorm*N_DFT; *maxv = mx; @@ -270,7 +271,7 @@ float get_bufmu(int ofs) { return mu; } -int f32buf_sample(FILE *fp, int inv, int cm) { +int f32buf_sample(FILE *fp, int inv) { float s = 0.0; float xneu, xalt; @@ -288,11 +289,6 @@ int f32buf_sample(FILE *fp, int inv, int cm) { qs[sample_in % M] = qsum; - if (0 && cm) { - // direct correlation - } - - sample_out = sample_in - delay; sample_in += 1; @@ -369,7 +365,7 @@ int headcmp(int symlen, char *hdr, int len, unsigned int mvp, int inv, int optio /* -------------------------------------------------------------------------- */ -int read_sbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int cm) { +int read_sbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset) { // symlen==2: manchester2 10->0,01->1: 2.bit static double bitgrenze; @@ -388,7 +384,7 @@ int read_sbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int c bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; sum -= sample; @@ -400,7 +396,7 @@ int read_sbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int c bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; sum += sample; @@ -414,7 +410,7 @@ int read_sbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int c return 0; } -int read_spkbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int cm, int spike) { +int read_spkbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int spike) { // symlen==2: manchester2 10->0,01->1: 2.bit static double bitgrenze; @@ -435,7 +431,7 @@ int read_spkbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; avg = 0.5*(bufs[(sample_out-buffered-1 + ofs + M) % M] @@ -451,7 +447,7 @@ int read_spkbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; avg = 0.5*(bufs[(sample_out-buffered-1 + ofs + M) % M] @@ -471,7 +467,7 @@ int read_spkbit(FILE *fp, int symlen, int *bit, int inv, int ofs, int reset, int /* -------------------------------------------------------------------------- */ -int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv, int ofs, int reset, int cm) { +int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv, int ofs, int reset) { // symlen==2: manchester2 10->0,01->1: 2.bit static double bitgrenze; @@ -491,7 +487,7 @@ int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; if (scount > bitgrenze-samples_per_bit && scount < bitgrenze-2) @@ -506,7 +502,7 @@ int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv bitgrenze += samples_per_bit; do { if (buffered > 0) buffered -= 1; - else if (f32buf_sample(fp, inv, cm) == EOF) return EOF; + else if (f32buf_sample(fp, inv) == EOF) return EOF; sample = bufs[(sample_out-buffered + ofs + M) % M]; if (scount > bitgrenze-samples_per_bit && scount < bitgrenze-2) @@ -541,9 +537,9 @@ float header_level(char hdr[], int hLen, unsigned int pos, int inv) { n = 0; bitn = 0; - while ( bitn < hLen && (n < N) ) { + while ( bitn < hLen && (n < L) ) { sgn = (hdr[bitn]&1)*2-1; // {'0','1'} -> {-1,1} - s = bufs[(pos-N + n + M) % M]; + s = bufs[(pos-L + n + M) % M]; if (inv) s = -s; sum += s * sgn; n++; @@ -560,7 +556,7 @@ float header_level(char hdr[], int hLen, unsigned int pos, int inv) { static double norm2_match() { int i; double x, y = 0.0; - for (i = 0; i < N; i++) { + for (i = 0; i < L; i++) { x = match[i]; y += x*x; } @@ -576,24 +572,40 @@ int init_buffers(char hdr[], int hLen, int shape) { float alpha, sqalp, a = 1.0; + int p2 = 1; int K; int n, k; float *m = NULL; - N = hLen * samples_per_bit + 0.5; - M = 3*N; - if (samples_per_bit < 6) M = 6*N; - Nvar = N; //N/2; // = N/k + L = hLen * samples_per_bit + 0.5; + M = 3*L; + // if (samples_per_bit < 6) M = 6*L; + + sample_in = 0; + + p2 = 1; + while (p2 < M) p2 <<= 1; + while (p2 < 0x2000) p2 <<= 1; // or 0x4000, if sample not too short + M = p2; + N_DFT = p2; + LOG2N = log(N_DFT)/log(2)+0.1; // 32bit cpu ... intermediate floating-point precision + //while ((1 << LOG2N) < N_DFT) LOG2N++; // better N_DFT = (1 << LOG2N) ... + + delay = L/16; + K = M-L - delay; // L+K < M + + Nvar = L; //L/2; // = L/k + bufs = (float *)calloc( M+1, sizeof(float)); if (bufs == NULL) return -100; - match = (float *)calloc( N+1, sizeof(float)); if (match == NULL) return -100; + match = (float *)calloc( L+1, sizeof(float)); if (match == NULL) return -100; xs = (float *)calloc( M+1, sizeof(float)); if (xs == NULL) return -100; qs = (float *)calloc( M+1, sizeof(float)); if (qs == NULL) return -100; - rawbits = (char *)calloc( N+1, sizeof(char)); if (rawbits == NULL) return -100; + rawbits = (char *)calloc( 2*hLen+1, sizeof(char)); if (rawbits == NULL) return -100; for (i = 0; i < M; i++) bufs[i] = 0.0; @@ -601,7 +613,7 @@ int init_buffers(char hdr[], int hLen, int shape) { sqalp = sqrt(alpha/M_PI); //a = sqalp; - for (i = 0; i < N; i++) { + for (i = 0; i < L; i++) { pos = i/samples_per_bit; x = (i - pos*samples_per_bit)*2.0/samples_per_bit - 1; a = sqalp; @@ -629,25 +641,11 @@ int init_buffers(char hdr[], int hLen, int shape) { } normMatch = sqrt(norm2_match()); - for (i = 0; i < N; i++) { + for (i = 0; i < L; i++) { match[i] /= normMatch; } - delay = N/16; - sample_in = 0; - - K = M-N - delay; //N/2 - delay; // N+K < M - - LOG2N = 2 + (int)(log(N+K)/log(2)); - N_DFT = 1 << LOG2N; - - while (N + K > N_DFT/2 - 2) { - LOG2N += 1; - N_DFT <<= 1; - } - - xn = calloc(N_DFT+1, sizeof(float)); if (xn == NULL) return -1; ew = calloc(LOG2N+1, sizeof(complex float)); if (ew == NULL) return -1; @@ -662,7 +660,7 @@ int init_buffers(char hdr[], int hLen, int shape) { } m = calloc(N_DFT+1, sizeof(float)); if (m == NULL) return -1; - for (i = 0; i < N; i++) m[N-1 - i] = match[i]; + for (i = 0; i < L; i++) m[L-1 - i] = match[i]; // t = L-1 while (i < N_DFT) m[i++] = 0.0; dft(m, Fm); diff --git a/demod/demod_dft.h b/demod/demod_dft.h index 32a89db..923e4ef 100644 --- a/demod/demod_dft.h +++ b/demod/demod_dft.h @@ -1,12 +1,12 @@ float read_wav_header(FILE*, float, int); -int f32buf_sample(FILE*, int, int); -int read_sbit(FILE*, int, int*, int, int, int, int); -int read_spkbit(FILE*, int, int*, int, int, int, int, int); -int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv, int ofs, int reset, int cm); +int f32buf_sample(FILE*, int); +int read_sbit(FILE*, int, int*, int, int, int); +int read_spkbit(FILE*, int, int*, int, int, int, int); +int read_softbit(FILE *fp, int symlen, int *bit, float *sb, float level, int inv, int ofs, int reset); float header_level(char hdr[], int hLen, unsigned int pos, int inv); -int getCorrDFT(int, int, unsigned int, float *, unsigned int *); +int getCorrDFT(int, unsigned int, float *, unsigned int *); int headcmp(int, char*, int, unsigned int, int, int); float get_bufvar(int); float get_bufmu(int); diff --git a/demod/demod_iq.c b/demod/demod_iq.c index db0546c..03b660d 100644 --- a/demod/demod_iq.c +++ b/demod/demod_iq.c @@ -137,57 +137,63 @@ static int dft_window(dft_t *dft, int w) { /* ------------------------------------------------------------------------------------ */ -int getCorrDFT(dsp_t *dsp, int abs, ui32_t pos, float *maxv, ui32_t *maxvpos) { +int getCorrDFT(dsp_t *dsp, ui32_t pos, float *maxv, ui32_t *maxvpos) { int i; int mp = -1; float mx = 0.0; + float mx2 = 0.0; + float re_cx = 0.0; float xnorm = 1; ui32_t mpos = 0; dsp->dc = 0.0; - if (dsp->N + dsp->K > dsp->DFT.N/2 - 2) return -1; - if (dsp->sample_in < dsp->delay + dsp->N + dsp->K) return -2; + if (dsp->K + dsp->L > dsp->DFT.N) return -1; + if (dsp->sample_out < dsp->L) return -2; if (pos == 0) pos = dsp->sample_out; - dsp->dc = get_bufmu(dsp, pos - dsp->sample_out); //oder unten: dft_dc = creal(X[0])/DFT_N; + dsp->dc = get_bufmu(dsp, pos - dsp->sample_out); //oder unten: dft_dc = creal(X[0])/(K+L); // wenn richtige Stelle (Varianz pruefen, kein M10-carrier?), dann von bufs[] subtrahieren - for (i = 0; i < dsp->N + dsp->K; i++) (dsp->DFT).xn[i] = dsp->bufs[(pos+dsp->M -(dsp->N + dsp->K - 1) + i) % dsp->M]; - while (i < (dsp->DFT).N) (dsp->DFT).xn[i++] = 0.0; + for (i = 0; i < dsp->K + dsp->L; i++) (dsp->DFT).xn[i] = dsp->bufs[(pos+dsp->M -(dsp->K + dsp->L-1) + i) % dsp->M]; + while (i < dsp->DFT.N) (dsp->DFT).xn[i++] = 0.0; - rdft(&dsp->DFT, (dsp->DFT).xn, (dsp->DFT).X); + rdft(&dsp->DFT, dsp->DFT.xn, dsp->DFT.X); - // dft_dc = creal((dsp->DFT).X[0])/(dsp->DFT).N; + // dft_dc = creal(dsp->DFT.X[0])/dsp->DFT.N; - for (i = 0; i < (dsp->DFT).N; i++) (dsp->DFT).Z[i] = (dsp->DFT).X[i]*(dsp->DFT).Fm[i]; + for (i = 0; i < dsp->DFT.N; i++) dsp->DFT.Z[i] = dsp->DFT.X[i]*dsp->DFT.Fm[i]; - Nidft(&dsp->DFT, (dsp->DFT).Z, (dsp->DFT).cx); + Nidft(&dsp->DFT, dsp->DFT.Z, dsp->DFT.cx); - if (abs) { - for (i = dsp->N; i < dsp->N + dsp->K; i++) { - if (fabs(creal((dsp->DFT).cx[i])) > fabs(mx)) { // imag(cx)=0 - mx = creal((dsp->DFT).cx[i]); - mp = i; - } + // relativ Peak - Normierung erst zum Schluss; + // dann jedoch nicht zwingend corr-Max wenn FM-Amplitude bzw. norm(x) nicht konstant + // (z.B. rs41 Signal-Pausen). Moeglicherweise wird dann wahres corr-Max in dem + // K-Fenster nicht erkannt, deshalb K nicht zu gross waehlen. + // + mx2 = 0.0; // t = L-1 + for (i = dsp->L-1; i < dsp->K + dsp->L; i++) { // i=t .. i=t+K < t+1+K + re_cx = creal(dsp->DFT.cx[i]); // imag(cx)=0 + if (re_cx*re_cx > mx2) { + mx = re_cx; + mx2 = mx*mx; + mp = i; } } - else { - for (i = dsp->N; i < dsp->N + dsp->K; i++) { - if (creal((dsp->DFT).cx[i]) > mx) { // imag(cx)=0 - mx = creal((dsp->DFT).cx[i]); - mp = i; - } - } - } - if (mp == dsp->N || mp == dsp->N + dsp->K - 1) return -4; // Randwert + if (mp == dsp->L-1 || mp == dsp->K + dsp->L-1) return -4; // Randwert + // mp == t mp == K+t + + mpos = pos - (dsp->K + dsp->L-1) + mp; // t = L-1 + + //xnorm = sqrt(dsp->qs[(mpos + 2*dsp->M) % dsp->M]); // Nvar = L + xnorm = 0.0; + for (i = 0; i < dsp->L; i++) xnorm += dsp->bufs[(mpos-i + dsp->M) % dsp->M]*dsp->bufs[(mpos-i + dsp->M) % dsp->M]; + xnorm = sqrt(xnorm); - mpos = pos - ( dsp->N + dsp->K - 1 - mp ); - xnorm = sqrt(dsp->qs[(mpos + 2*dsp->M) % dsp->M]); mx /= xnorm*(dsp->DFT).N; *maxv = mx; @@ -462,14 +468,14 @@ int headcmp(dsp_t *dsp, int symlen, ui32_t mvp, int inv, int option_dc) { int pos; int step = 1; char sign = 0; - int len = dsp->hdrlen; + int len = dsp->hdrlen/symlen; if (symlen != 1) step = 2; if (inv) sign=1; - for (pos = 0; pos < len; pos += step) { // N = dsp->hdrlen * dsp->sps + 0.5; - //read_bufbit(dsp, symlen, dsp->rawbits+pos, mvp+1-(int)(len*dsp->sps), pos); - read_bufbit(dsp, symlen, dsp->rawbits+pos, mvp+1-dsp->N, pos); + for (pos = 0; pos < len; pos++) { // L = dsp->hdrlen * dsp->sps + 0.5; + //read_bufbit(dsp, symlen, dsp->rawbits+pos*step, mvp+1-(int)(len*dsp->sps), pos); + read_bufbit(dsp, symlen, dsp->rawbits+pos*step, mvp+1-dsp->L, pos); } dsp->rawbits[pos] = '\0'; @@ -527,18 +533,21 @@ int get_fqofs_rs41(dsp_t *dsp, ui32_t mvp, float *freq, float *snr) { /* -------------------------------------------------------------------------- */ -int read_slbit(dsp_t *dsp, int symlen, int *bit, int inv, int ofs, int pos, float l) { +int read_slbit(dsp_t *dsp, int symlen, int *bit, int inv, int ofs, int pos, float l, int spike) { // symlen==2: manchester2 10->0,01->1: 2.bit float bitgrenze = pos*symlen*dsp->sps; - ui32_t scount = bitgrenze+0.99; // ceil + ui32_t scount = ceil(bitgrenze);//+0.99; // dfm? float sample; + float avg; + float ths = 0.5, scale = 0.27; double sum = 0.0; double mid; //double l = 0.5 .. 1.0 .. sps/2; + if (pos == 0) scount = 0; if (symlen == 2) { mid = bitgrenze + (dsp->sps-1)/2.0; @@ -548,6 +557,9 @@ int read_slbit(dsp_t *dsp, int symlen, int *bit, int inv, int ofs, int pos, floa else if (f32buf_sample(dsp, inv) == EOF) return EOF; sample = dsp->bufs[(dsp->sample_out-dsp->buffered + ofs + dsp->M) % dsp->M]; + avg = 0.5*(dsp->bufs[(dsp->sample_out-dsp->buffered-1 + ofs + dsp->M) % dsp->M] + +dsp->bufs[(dsp->sample_out-dsp->buffered+1 + ofs + dsp->M) % dsp->M]); + if (spike && fabs(sample - avg) > ths) sample = avg + scale*(sample - avg); // spikes if ( l < 0 || (mid-l < scount && scount < mid+l)) sum -= sample; @@ -562,6 +574,9 @@ int read_slbit(dsp_t *dsp, int symlen, int *bit, int inv, int ofs, int pos, floa else if (f32buf_sample(dsp, inv) == EOF) return EOF; sample = dsp->bufs[(dsp->sample_out-dsp->buffered + ofs + dsp->M) % dsp->M]; + avg = 0.5*(dsp->bufs[(dsp->sample_out-dsp->buffered-1 + ofs + dsp->M) % dsp->M] + +dsp->bufs[(dsp->sample_out-dsp->buffered+1 + ofs + dsp->M) % dsp->M]); + if (spike && fabs(sample - avg) > ths) sample = avg + scale*(sample - avg); // spikes if ( l < 0 || (mid-l < scount && scount < mid+l)) sum += sample; @@ -609,29 +624,51 @@ int init_buffers(dsp_t *dsp) { float normMatch; double sigma = sqrt(log(2)) / (2*M_PI*dsp->BT); - int K, N, M; + int p2 = 1; + int K, L, M; int n, k; float *m = NULL; - N = dsp->hdrlen * dsp->sps + 0.5; - M = 3*N; - if (dsp->sps < 6) M = 6*N; + L = dsp->hdrlen * dsp->sps + 0.5; + M = 3*L; + //if (dsp->sps < 6) M = 6*L; + + dsp->delay = L/16; + dsp->sample_in = 0; + + p2 = 1; + while (p2 < M) p2 <<= 1; + while (p2 < 0x2000) p2 <<= 1; // or 0x4000, if sample not too short + M = p2; + dsp->DFT.N = p2; + dsp->DFT.LOG2N = log(dsp->DFT.N)/log(2)+0.1; // 32bit cpu ... intermediate floating-point precision + //while ((1 << dsp->DFT.LOG2N) < dsp->DFT.N) dsp->DFT.LOG2N++; // better N = (1 << LOG2N) ... + + K = M-L - dsp->delay; // L+K < M + + dsp->DFT.sr = dsp->sr; + + dsp->K = K; + dsp->L = L; + dsp->M = M; + + dsp->Nvar = L; // wenn Nvar fuer xnorm, dann Nvar=rshd.L dsp->bufs = (float *)calloc( M+1, sizeof(float)); if (dsp->bufs == NULL) return -100; - dsp->match = (float *)calloc( N+1, sizeof(float)); if (dsp->match == NULL) return -100; + dsp->match = (float *)calloc( L+1, sizeof(float)); if (dsp->match == NULL) return -100; dsp->xs = (float *)calloc( M+1, sizeof(float)); if (dsp->xs == NULL) return -100; dsp->qs = (float *)calloc( M+1, sizeof(float)); if (dsp->qs == NULL) return -100; - dsp->rawbits = (char *)calloc( N+1, sizeof(char)); if (dsp->rawbits == NULL) return -100; + dsp->rawbits = (char *)calloc( 2*dsp->hdrlen+1, sizeof(char)); if (dsp->rawbits == NULL) return -100; for (i = 0; i < M; i++) dsp->bufs[i] = 0.0; - for (i = 0; i < N; i++) { + for (i = 0; i < L; i++) { pos = i/dsp->sps; t = (i - pos*dsp->sps)/dsp->sps - 0.5; @@ -651,31 +688,12 @@ int init_buffers(dsp_t *dsp) { dsp->match[i] = b; } - normMatch = sqrt( norm2_vect(dsp->match, N) ); - for (i = 0; i < N; i++) { + normMatch = sqrt( norm2_vect(dsp->match, L) ); + for (i = 0; i < L; i++) { dsp->match[i] /= normMatch; } - dsp->N = N; - dsp->M = M; - dsp->Nvar = N; //N/2; // = N/k - - dsp->delay = N/16; - dsp->sample_in = 0; - - K = M - N - dsp->delay; //N/2 - delay; // N+K < M - dsp->K = K; - - dsp->DFT.sr = dsp->sr; - dsp->DFT.LOG2N = 2 + (int)(log(N+K)/log(2)); - dsp->DFT.N = 1 << dsp->DFT.LOG2N; - - while (N + K > dsp->DFT.N/2 - 2) { - dsp->DFT.LOG2N += 1; - dsp->DFT.N <<= 1; - } - dsp->DFT.xn = calloc(dsp->DFT.N+1, sizeof(float)); if (dsp->DFT.xn == NULL) return -1; dsp->DFT.Fm = calloc(dsp->DFT.N+1, sizeof(float complex)); if (dsp->DFT.Fm == NULL) return -1; @@ -690,7 +708,7 @@ int init_buffers(dsp_t *dsp) { // b) N2 < N (interpolation) dsp->DFT.win = calloc(dsp->DFT.N+1, sizeof(float complex)); if (dsp->DFT.win == NULL) return -1; // float real dsp->DFT.N2 = dsp->DFT.N; - //dsp->DFT.N2 = dsp->DFT.N/2 - 1; // DFT_N=2^log2N + //dsp->DFT.N2 = dsp->DFT.N/2 - 1; // N=2^log2N dft_window(&dsp->DFT, 1); for (n = 0; n < dsp->DFT.LOG2N; n++) { @@ -699,7 +717,7 @@ int init_buffers(dsp_t *dsp) { } m = calloc(dsp->DFT.N+1, sizeof(float)); if (m == NULL) return -1; - for (i = 0; i < N; i++) m[N-1 - i] = dsp->match[i]; + for (i = 0; i < L; i++) m[L-1 - i] = dsp->match[i]; // t = L-1 while (i < dsp->DFT.N) m[i++] = 0.0; rdft(&dsp->DFT, m, dsp->DFT.Fm); @@ -709,13 +727,7 @@ int init_buffers(dsp_t *dsp) { if (dsp->opt_iq) { if (dsp->nch < 2) return -1; -/* - N2 = dsp->sps*256+0.5; - while ( (1 << LOG2N) < N2 ) LOG2N++; - LOG2N++; - N = (1 << LOG2N); - N_IQBUF = N2 + sps*(64+16); -*/ + dsp->N_IQBUF = dsp->DFT.N; dsp->raw_iqbuf = calloc(dsp->N_IQBUF+1, sizeof(float complex)); if (dsp->raw_iqbuf == NULL) return -1; dsp->rot_iqbuf = calloc(dsp->N_IQBUF+1, sizeof(float complex)); if (dsp->rot_iqbuf == NULL) return -1; diff --git a/demod/demod_iq.h b/demod/demod_iq.h index 877d28c..605a931 100644 --- a/demod/demod_iq.h +++ b/demod/demod_iq.h @@ -43,7 +43,7 @@ typedef struct { ui32_t sample_out; ui32_t delay; int buffered; - int N; + int L; int M; int K; float *match; @@ -100,9 +100,9 @@ typedef struct { float read_wav_header(pcm_t *, FILE *); int f32buf_sample(dsp_t *, int); -int read_slbit(dsp_t *, int, int*, int, int, int, float); +int read_slbit(dsp_t *, int, int*, int, int, int, float, int); -int getCorrDFT(dsp_t *, int, ui32_t, float *, ui32_t *); +int getCorrDFT(dsp_t *, ui32_t, float *, ui32_t *); int headcmp(dsp_t *, int, ui32_t, int, int); int get_fqofs_rs41(dsp_t *, ui32_t, float *, float *); float get_bufvar(dsp_t *, int); diff --git a/demod/dfm09dm_dft.c b/demod/dfm09dm_dft.c index 8b0267e..abd4210 100644 --- a/demod/dfm09dm_dft.c +++ b/demod/dfm09dm_dft.c @@ -686,7 +686,7 @@ void print_gpx() { } } else { - if (option_auto && option_verbose >= 2) printf("[%c] ", option_inv?'-':'+'); + if (option_auto && option_verbose >= 2) printf("<%c> ", option_inv?'-':'+'); printf("[%3d] ", gpx.frnr); printf("%4d-%02d-%02d ", gpx.jahr, gpx.monat, gpx.tag); printf("%02d:%02d:%04.1f ", gpx.std, gpx.min, gpx.sek); @@ -851,8 +851,9 @@ int main(int argc, char **argv) { float thres = 0.65; - int bitofs = 0; int symlen = 2; + int bitofs = 2; // +1 .. +2 + int shift = 0; #ifdef CYGWIN @@ -904,6 +905,15 @@ int main(int argc, char **argv) { } else return -1; } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } else { fp = fopen(*argv, "rb"); if (fp == NULL) { @@ -932,8 +942,9 @@ int main(int argc, char **argv) { symlen = 2; + bitofs += shift; + headerlen = strlen(rawheader); - bitofs = 2; // +1 .. +2 K = init_buffers(rawheader, headerlen, 0); // shape=0 (alt. shape=1) if ( K < 0 ) { fprintf(stderr, "error: init buffers\n"); @@ -941,14 +952,16 @@ int main(int argc, char **argv) { }; k = 0; - mv = 0; mv_pos = 0; + mv = 0; + mv_pos = 0; - while ( f32buf_sample(fp, option_inv, 1) != EOF ) { + while ( f32buf_sample(fp, option_inv) != EOF ) { k += 1; if (k >= K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(option_auto, K, 0, &mv, &mv_pos); + mp = getCorrDFT(K, 0, &mv, &mv_pos); + if (option_auto == 0 && mv < 0) mv = 0; k = 0; } else { @@ -993,8 +1006,7 @@ int main(int argc, char **argv) { while ( frm < nfrms ) { // nfrms=1,2,4,8 frm_cnt = mv_pos/(spb*2.0*BITFRAME_LEN) + frm; while ( pos < BITFRAME_LEN ) { - header_found = !(frm==nfrms-1 && pos>=BITFRAME_LEN-10); - bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0, !header_found); // symlen=2, return: zeroX/bit + bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0); // symlen=2 if (bitQ == EOF) { frm = nfrms; break; } frame_bits[pos] = 0x30 + bit; pos++; diff --git a/demod/lms6dm_dft.c b/demod/lms6dm_dft.c index bc280bd..6d92335 100644 --- a/demod/lms6dm_dft.c +++ b/demod/lms6dm_dft.c @@ -873,8 +873,10 @@ int main(int argc, char **argv) { float thres = 0.76; - int bitofs = 0; int symlen = 1; + int bitofs = 1; // +1 .. +2 + int shift = 0; + unsigned int bc = 0; float sb = 0.0; @@ -931,6 +933,15 @@ int main(int argc, char **argv) { } else return -1; } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } else if ( (strcmp(*argv, "--level") == 0) ) { ++argv; if (*argv) { @@ -973,8 +984,9 @@ int main(int argc, char **argv) { symlen = 1; + bitofs += shift; + headerlen = strlen(rawheader); - bitofs = 1; // +1 .. +2 K = init_buffers(rawheader, headerlen, 2); // shape=2 (alt. shape=1) if ( K < 0 ) { fprintf(stderr, "error: init buffers\n"); @@ -983,14 +995,15 @@ int main(int argc, char **argv) { level = ll; k = 0; - mv = -1; mv_pos = 0; + mv = 0; + mv_pos = 0; - while ( f32buf_sample(fp, option_inv, 1) != EOF ) { + while ( f32buf_sample(fp, option_inv) != EOF ) { k += 1; if (k >= K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(-1, K, 0, &mv, &mv_pos); + mp = getCorrDFT(K, 0, &mv, &mv_pos); k = 0; } else { @@ -1024,9 +1037,9 @@ int main(int argc, char **argv) { if (mv > 0) bc = 0; else bc = 1; while ( pos < RAWBITBLOCK_LEN ) { - header_found = !(pos>=RAWBITBLOCK_LEN-10); - //bitQ = read_sbit(fp, symlen, &rbit, option_inv, bitofs, bitpos==0, !header_found); // symlen=1, return: zeroX/bit - bitQ = read_softbit(fp, symlen, &rbit, &sb, level, option_inv, bitofs, bitpos==0, !header_found); // symlen=1, return: zeroX/bit + + //bitQ = read_sbit(fp, symlen, &rbit, option_inv, bitofs, bitpos==0); // symlen=1 + bitQ = read_softbit(fp, symlen, &rbit, &sb, level, option_inv, bitofs, bitpos==0); // symlen=1 if (bitQ == EOF) { break; } bit = rbit ^ (bc%2); // (c0,inv(c1)) diff --git a/demod/lmsXdm_dft.c b/demod/lmsXdm_dft.c new file mode 100644 index 0000000..671d9c8 --- /dev/null +++ b/demod/lmsXdm_dft.c @@ -0,0 +1,1097 @@ + +/* + * LMSx + * (403 MHz) + * + * sync header: correlation/matched filter + * files: lmsXdm_dft.c demod_dft.h demod_dft.c bch_ecc.c + * compile: + * gcc -c demod_dft.c + * gcc lmsXdm_dft.c demod_dft.o -lm -o lmsXdm_dft + * usage: + * ./lmsXdm_dft -v --vit --ecc + * + * author: zilog80 + */ + +#include +#include +#include +#include + +#ifdef CYGWIN + #include // cygwin: _setmode() + #include +#endif + + +typedef unsigned char ui8_t; +typedef unsigned short ui16_t; +typedef unsigned int ui32_t; + +#include "demod_dft.h" + +#include "bch_ecc.c" // RS/ecc/ + + +int option_verbose = 0, // ausfuehrliche Anzeige + option_raw = 0, // rohe Frames + option_ecc = 0, + option_vit = 0, + option_inv = 0, // invertiert Signal + option_dc = 0, + wavloaded = 0; +int wav_channel = 0; // audio channel: left + + +/* -------------------------------------------------------------------------- */ + +#define BAUD_RATE (4797.7) // = 4800 / (48023/48000) ? + +#define BITS 8 +#define HEADOFS 0 //16 +#define HEADLEN ((4*16)-HEADOFS) + +char rawheader[] = "0101011000001000""0001110010010111""0001101010100111""0011110100111110"; // (c0,inv(c1)) +// (00) 58 f3 3f b8 +//char header[] = "0000001101011101""0100100111000010""0100111111110010""0110100001101011"; // (c0,c1) +ui8_t rs_sync[] = { 0x00, 0x58, 0xf3, 0x3f, 0xb8}; +// 0x58f33fb8 little-endian <-> 0x1ACFFC1D big-endian bytes + +#define FRAME_LEN (300) // 4800baud, 16bits/byte +#define SYNC_LEN 5 +#define FRM_LEN (223) +#define PAR_LEN (32) +#define FRMBUF_LEN (3*FRM_LEN) +#define BLOCKSTART (SYNC_LEN*BITS*2) +#define BLOCK_LEN (FRM_LEN+PAR_LEN+SYNC_LEN) // 255+5 = 260 +//#define RAWBITBLOCK_LEN ((BLOCK_LEN+1)*BITS*2) // (+1 tail) +#define RAWBITBLOCK_LEN ((300)*BITS*2) + +// (00) 58 f3 3f b8 +char blk_rawbits[RAWBITBLOCK_LEN+SYNC_LEN*BITS*2 +8] = "0000000000000000""0000001101011101""0100100111000010""0100111111110010""0110100001101011"; +//char *block_rawbits = blk_rawbits+SYNC_LEN*BITS*2; + +float soft_rawbits[RAWBITBLOCK_LEN+SYNC_LEN*BITS*2 +8] = + { -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, + -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, 1.0, 1.0, -1.0, 1.0, + -1.0, 1.0, -1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, + -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0, 1.0, -1.0, + -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, 1.0 }; + +ui8_t block_bytes[FRAME_LEN+8]; // BLOCK_LEN + 40 + + +//ui8_t frm_sync[] = { 0x24, 0x54, 0x00, 0x00}; +ui8_t frm_sync[] = { 0x24, 0x46, 0x05, 0x00}; +ui8_t frame[FRM_LEN] = { 0x24, 0x54, 0x00, 0x00}; // dataheader + +ui8_t *p_frame = frame; + + +#define BITFRAME_LEN (FRAME_LEN*BITS) +#define RAWBITFRAME_LEN (BITFRAME_LEN*2) +#define OVERLAP 64 +#define OFS 4 + + +char frame_bits[BITFRAME_LEN+OVERLAP*BITS +8]; // init L-1 bits mit 0 + +#define L 7 // d_f=10 + char polyA[] = "1001111"; // 0x4f: x^6+x^3+x^2+x+1 + char polyB[] = "1101101"; // 0x6d: x^6+x^5+x^3+x^2+1 +/* +// d_f=6 +qA[] = "1110011"; // 0x73: x^6+x^5+x^4+x+1 +qB[] = "0011110"; // 0x1e: x^4+x^3+x^2+x +pA[] = "10010101"; // 0x95: x^7+x^4+x^2+1 = (x+1)(x^6+x^5+x^4+x+1) = (x+1)qA +pB[] = "00100010"; // 0x22: x^5+x = (x+1)(x^4+x^3+x^2+x)=x(x+1)^3 = (x+1)qB +polyA = qA + x*qB +polyB = qA + qB +*/ + +char vit_rawbits[RAWBITFRAME_LEN+OVERLAP*BITS*2 +8]; +char vits_rawbits[RAWBITFRAME_LEN+OVERLAP*BITS*2 +8]; +char vits_bits[BITFRAME_LEN+OVERLAP*BITS +8]; + +#define N (1 << L) +#define M (1 << (L-1)) + +typedef struct { + ui8_t bIn; + ui8_t codeIn; + int w; + int prevState; + float sw; +} states_t; + +states_t vit_state[RAWBITFRAME_LEN+OVERLAP +8][M]; + +states_t vit_d[N]; + +ui8_t vit_code[N]; + + +int vit_initCodes() { + int cA, cB; + int i, bits; + + for (bits = 0; bits < N; bits++) { + cA = 0; + cB = 0; + for (i = 0; i < L; i++) { + cA ^= (polyA[L-1-i]&1) & ((bits >> i)&1); + cB ^= (polyB[L-1-i]&1) & ((bits >> i)&1); + } + vit_code[bits] = (cA<<1) | cB; + } + + return 0; +} + +int vit_dist(int c, char *rc) { + return (((c>>1)^rc[0])&1) + ((c^rc[1])&1); +} + +int vit_start(char *rc) { + int t, m, j, c, d; + + t = L-1; + m = M; + while ( t > 0 ) { // t=0..L-2: nextState 0) { + c = vit_state[t][j].codeIn; + vit_rawbits[2*t -2] = 0x30 + ((c>>1) & 1); + vit_rawbits[2*t -1] = 0x30 + (c & 1); + j = vit_state[t][j].prevState; + t--; + } + + return 0; +} + +int viterbi(char *rc) { + int t, tmax; + int j, j_min, w_min; + + vit_start(rc); + + tmax = strlen(rc)/2; + + for (t = L-1; t < tmax; t++) + { + vit_next(t, rc+2*t); + } + + w_min = -1; + for (j = 0; j < M; j++) { + if (w_min < 0) { + w_min = vit_state[tmax][j].w; + j_min = j; + } + if (vit_state[tmax][j].w < w_min) { + w_min = vit_state[tmax][j].w; + j_min = j; + } + } + vit_path(j_min, tmax); + + return 0; +} + + +float vits_dist(int c, float *rc) { + int bit0 = ((c>>1)&1) * 2 - 1; + int bit1 = (c&1) * 2 - 1; + return sqrt( (bit0-rc[0])*(bit0-rc[0]) + (bit1-rc[1])*(bit1-rc[1]) ); +} + +int vits_start(float *rc) { + int t, m, j, c; + float d; + + t = L-1; + m = M; + while ( t > 0 ) { // t=0..L-2: nextState 0) { + dec = vit_state[t][j].bIn; + vits_bits[t-1] = 0x30 + dec; + c = vit_state[t][j].codeIn; + vits_rawbits[2*t -2] = 0x30 + ((c>>1) & 1); + vits_rawbits[2*t -1] = 0x30 + (c & 1); + j = vit_state[t][j].prevState; + t--; + } + + return 0; +} + +int viterbi_soft(float *rc, int len) { + int t, tmax; + int j, j_min; + float sw_min; + + vits_start(rc); + + tmax = len/2; + + for (t = L-1; t < tmax; t++) + { + vits_next(t, rc+2*t); + } + + sw_min = -1.0; + for (j = 0; j < M; j++) { + if (sw_min < 0.0) { + sw_min = vit_state[tmax][j].sw; + j_min = j; + } + if (vit_state[tmax][j].sw < sw_min) { + sw_min = vit_state[tmax][j].sw; + j_min = j; + } + } + vits_path(j_min, tmax); + + return 0; +} + +// ------------------------------------------------------------------------ + +int deconv(char* rawbits, char *bits) { + + int j, n, bitA, bitB; + char *p; + int len; + int errors = 0; + int m = L-1; + + len = strlen(rawbits); + for (j = 0; j < m; j++) bits[j] = '0'; + n = 0; + while ( 2*(m+n) < len ) { + p = rawbits+2*(m+n); + bitA = bitB = 0; + for (j = 0; j < m; j++) { + bitA ^= (bits[n+j]&1) & (polyA[j]&1); + bitB ^= (bits[n+j]&1) & (polyB[j]&1); + } + if ( (bitA^(p[0]&1))==(polyA[m]&1) && (bitB^(p[1]&1))==(polyB[m]&1) ) bits[n+m] = '1'; + else if ( (bitA^(p[0]&1))==0 && (bitB^(p[1]&1))==0 ) bits[n+m] = '0'; + else { + if ( (bitA^(p[0]&1))!=(polyA[m]&1) && (bitB^(p[1]&1))==(polyB[m]&1) ) bits[n+m] = 0x39; + else bits[n+m] = 0x38; + errors = n; + break; + } + n += 1; + } + bits[n+m] = '\0'; + + return errors; +} + +// ------------------------------------------------------------------------ + +int crc16_0(ui8_t frame[], int len) { + int crc16poly = 0x1021; + int rem = 0x0, i, j; + int byte; + + for (i = 0; i < len; i++) { + byte = frame[i]; + rem = rem ^ (byte << 8); + for (j = 0; j < 8; j++) { + if (rem & 0x8000) { + rem = (rem << 1) ^ crc16poly; + } + else { + rem = (rem << 1); + } + rem &= 0xFFFF; + } + } + return rem; +} + +int check_CRC(ui8_t frame[]) { + ui32_t crclen = 0, + crcdat = 0; + + crclen = 221; + crcdat = (frame[crclen]<<8) | frame[crclen+1]; + if ( crcdat != crc16_0(frame, crclen) ) { + return 1; // CRC NO + } + else return 0; // CRC OK +} + +// ------------------------------------------------------------------------ + +int bits2bytes(char *bitstr, ui8_t *bytes) { + int i, bit, d, byteval; + int len = strlen(bitstr)/8; + int bitpos, bytepos; + + bitpos = 0; + bytepos = 0; + + while (bytepos < len) { + + byteval = 0; + d = 1; + for (i = 0; i < BITS; i++) { + bit=*(bitstr+bitpos+i); /* little endian */ + //bit=*(bitstr+bitpos+7-i); /* big endian */ + if ((bit == '1') || (bit == '9')) byteval += d; + else /*if ((bit == '0') || (bit == '8'))*/ byteval += 0; + d <<= 1; + } + bitpos += BITS; + bytes[bytepos++] = byteval & 0xFF; + } + + //while (bytepos < FRAME_LEN+OVERLAP) bytes[bytepos++] = 0; + + return bytepos; +} + +/* -------------------------------------------------------------------------- */ + + +typedef struct { + int frnr; + int sn; + int week; int gpstow; + int jahr; int monat; int tag; + int wday; + int std; int min; float sek; + double lat; double lon; double h; + double vH; double vD; double vV; + double vE; double vN; double vU; + //int freq; +} gpx_t; + +gpx_t gpx; + +gpx_t gpx0 = { 0 }; + + +#define pos_SondeSN (OFS+0x00) // ?4 byte 00 7A.... +#define pos_FrameNb (OFS+0x04) // 2 byte +//GPS Position +#define pos_GPSTOW (OFS+0x06) // 4 byte +#define pos_GPSlat (OFS+0x0E) // 4 byte +#define pos_GPSlon (OFS+0x12) // 4 byte +#define pos_GPSalt (OFS+0x16) // 4 byte +//GPS Velocity East-North-Up (ENU) +#define pos_GPSvO (OFS+0x1A) // 2 byte +#define pos_GPSvN (OFS+0x1C) // 2 byte +#define pos_GPSvV (OFS+0x1E) // 2 byte + + +int get_SondeSN() { + unsigned byte; + + byte = (p_frame[pos_SondeSN]<<24) | (p_frame[pos_SondeSN+1]<<16) + | (p_frame[pos_SondeSN+2]<<8) | p_frame[pos_SondeSN+3]; + gpx.sn = byte & 0xFFFFFF; + + return 0; +} + +int get_FrameNb() { + int i; + unsigned byte; + ui8_t frnr_bytes[2]; + int frnr; + + gpx = gpx0; + + for (i = 0; i < 2; i++) { + byte = p_frame[pos_FrameNb + i]; + frnr_bytes[i] = byte; + } + + frnr = (frnr_bytes[0] << 8) + frnr_bytes[1] ; + gpx.frnr = frnr; + + return 0; +} + + +char weekday[7][3] = { "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"}; +//char weekday[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + +int get_GPStime() { + int i; + unsigned byte; + ui8_t gpstime_bytes[4]; + int gpstime = 0, // 32bit + day; + float ms; + + for (i = 0; i < 4; i++) { + byte = p_frame[pos_GPSTOW + i]; + gpstime_bytes[i] = byte; + } + gpstime = 0; + for (i = 0; i < 4; i++) { + gpstime |= gpstime_bytes[i] << (8*(3-i)); + } + + gpx.gpstow = gpstime; + + ms = gpstime % 1000; + gpstime /= 1000; + + day = gpstime / (24 * 3600); + gpstime %= (24*3600); + + //if ((day < 0) || (day > 6)) return -1; + + gpx.wday = day; + gpx.std = gpstime / 3600; + gpx.min = (gpstime % 3600) / 60; + gpx.sek = gpstime % 60 + ms/1000.0; + + return 0; +} + +double B60B60 = 0xB60B60; // 2^32/360 = 0xB60B60.xxx + +int get_GPSlat() { + int i; + unsigned byte; + ui8_t gpslat_bytes[4]; + int gpslat; + double lat; + + for (i = 0; i < 4; i++) { + byte = p_frame[pos_GPSlat + i]; + if (byte > 0xFF) return -1; + gpslat_bytes[i] = byte; + } + + gpslat = 0; + for (i = 0; i < 4; i++) { + gpslat |= gpslat_bytes[i] << (8*(3-i)); + } + lat = gpslat / 1e7; // / B60B60; + gpx.lat = lat; + + return 0; +} + +int get_GPSlon() { + int i; + unsigned byte; + ui8_t gpslon_bytes[4]; + int gpslon; + double lon; + + for (i = 0; i < 4; i++) { + byte = p_frame[pos_GPSlon + i]; + if (byte > 0xFF) return -1; + gpslon_bytes[i] = byte; + } + + gpslon = 0; + for (i = 0; i < 4; i++) { + gpslon |= gpslon_bytes[i] << (8*(3-i)); + } + lon = gpslon / 1e7; // B60B60; + gpx.lon = lon; + + return 0; +} + +int get_GPSalt() { + int i; + unsigned byte; + ui8_t gpsheight_bytes[4]; + int gpsheight; + double height; + + for (i = 0; i < 4; i++) { + byte = p_frame[pos_GPSalt + i]; + if (byte > 0xFF) return -1; + gpsheight_bytes[i] = byte; + } + + gpsheight = 0; + for (i = 0; i < 4; i++) { + gpsheight |= gpsheight_bytes[i] << (8*(3-i)); + } + height = gpsheight / 100.0; + gpx.h = height; + + if (height < -100 || height > 60000) return -1; + return 0; +} + +int get_GPSvel24() { + int i; + unsigned byte; + ui8_t gpsVel_bytes[3]; + int vel24; + double vx, vy, vz, dir; //, alpha; + + for (i = 0; i < 3; i++) { + byte = p_frame[pos_GPSvO + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel24 = gpsVel_bytes[0] << 16 | gpsVel_bytes[1] << 8 | gpsVel_bytes[2]; + if (vel24 > (0x7FFFFF)) vel24 -= 0x1000000; + vx = vel24 / 1e3; // ost + + for (i = 0; i < 3; i++) { + byte = p_frame[pos_GPSvN + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel24 = gpsVel_bytes[0] << 16 | gpsVel_bytes[1] << 8 | gpsVel_bytes[2]; + if (vel24 > (0x7FFFFF)) vel24 -= 0x1000000; + vy= vel24 / 1e3; // nord + + for (i = 0; i < 3; i++) { + byte = p_frame[pos_GPSvV + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel24 = gpsVel_bytes[0] << 16 | gpsVel_bytes[1] << 8 | gpsVel_bytes[2]; + if (vel24 > (0x7FFFFF)) vel24 -= 0x1000000; + vz = vel24 / 1e3; // hoch + + gpx.vE = vx; + gpx.vN = vy; + gpx.vU = vz; + + + gpx.vH = sqrt(vx*vx+vy*vy); +/* + alpha = atan2(vy, vx)*180/M_PI; // ComplexPlane (von x-Achse nach links) - GeoMeteo (von y-Achse nach rechts) + dir = 90-alpha; // z=x+iy= -> i*conj(z)=y+ix=re(i(pi/2-t)), Achsen und Drehsinn vertauscht + if (dir < 0) dir += 360; // atan2(y,x)=atan(y/x)=pi/2-atan(x/y) , atan(1/t) = pi/2 - atan(t) + gpx.vD2 = dir; +*/ + dir = atan2(vx, vy) * 180 / M_PI; + if (dir < 0) dir += 360; + gpx.vD = dir; + + gpx.vV = vz; + + return 0; +} + +int get_GPSvel16() { + int i; + unsigned byte; + ui8_t gpsVel_bytes[2]; + short vel16; + double vx, vy, vz, dir; //, alpha; + + for (i = 0; i < 2; i++) { + byte = p_frame[pos_GPSvO + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel16 = gpsVel_bytes[0] << 8 | gpsVel_bytes[1]; + vx = vel16 / 1e2; // ost + + for (i = 0; i < 2; i++) { + byte = p_frame[pos_GPSvN + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel16 = gpsVel_bytes[0] << 8 | gpsVel_bytes[1]; + vy= vel16 / 1e2; // nord + + for (i = 0; i < 2; i++) { + byte = p_frame[pos_GPSvV + i]; + if (byte > 0xFF) return -1; + gpsVel_bytes[i] = byte; + } + vel16 = gpsVel_bytes[0] << 8 | gpsVel_bytes[1]; + vz = vel16 / 1e2; // hoch + + gpx.vH = vx; + gpx.vD = vy; + gpx.vV = vz; + + return 0; +} + + +// RS(255,223)-CCSDS +#define rs_N 255 +#define rs_K 223 +#define rs_R (rs_N-rs_K) // 32 +ui8_t rs_cw[rs_N]; + +int lms6_ecc(ui8_t *cw) { + int errors; + ui8_t err_pos[rs_R], + err_val[rs_R]; + + errors = rs_decode(cw, err_pos, err_val); + + return errors; +} + +void print_frame(int crc_err, int len) { + int err=0; + + if (p_frame[0] != 0) + { + //if ((p_frame[pos_SondeSN+1] & 0xF0) == 0x70) // ? beginnen alle SNs mit 0x7A.... bzw 80..... ? + if ( p_frame[pos_SondeSN+1] ) + { + get_FrameNb(); + get_GPStime(); + get_SondeSN(); + if (option_verbose) printf(" (%7d) ", gpx.sn); + printf(" [%5d] ", gpx.frnr); + // + get_GPSlat(); + get_GPSlon(); + err = get_GPSalt(); + if (!err) { + printf(" lat: %.6f° ", gpx.lat); + printf(" lon: %.6f° ", gpx.lon); + printf(" alt: %.2fm ", gpx.h); + //if (option_verbose) + { + get_GPSvel16(); + printf(" vH: %.1fm/s D: %.1f° vV: %.1fm/s ", gpx.vH, gpx.vD, gpx.vV); + } + } + if (crc_err==0) printf(" [OK]"); else printf(" [NO]"); + + printf("\n"); + } + } +} + +int blk_pos = SYNC_LEN; +int frm_pos = 0; +int sf = 0; + +void proc_frame(int len) { + + char *rawbits = NULL; + int i, j; + int err = 0; + int errs = 0; + int crc_err = 0; + int flen, blen; + + + if ((len % 8) > 4) { + while (len % 8) blk_rawbits[len++] = '0'; + } + //if (len > RAWBITFRAME_LEN+OVERLAP*BITS*2) len = RAWBITFRAME_LEN+OVERLAP*BITS*2; + //for (i = len; i < RAWBITFRAME_LEN+OVERLAP*BITS*2; i++) frame_rawbits[i] = 0; // oder: '0' + blk_rawbits[len] = '\0'; + + flen = len / (2*BITS); + + if (option_vit == 1) { + viterbi(blk_rawbits); + rawbits = vit_rawbits; + } + else if (option_vit == 2) { + viterbi_soft(soft_rawbits, len); + rawbits = vits_rawbits; + } + else rawbits = blk_rawbits; + + err = deconv(rawbits, frame_bits); + + if (err) { for (i=err; i < RAWBITBLOCK_LEN/2; i++) frame_bits[i] = 0; } + + + blen = bits2bytes(frame_bits, block_bytes); + for (j = blen; j < flen; j++) block_bytes[j] = 0; + + sf = 0; + blk_pos = SYNC_LEN; + for (j = 0; j < 4; j++) sf += (block_bytes[SYNC_LEN+j] == frm_sync[j]); + if (sf < 4) { // scan 1..40 ? + sf = 0; + for (j = 0; j < 4; j++) sf += (block_bytes[SYNC_LEN+35+j] == frm_sync[j]); + if (sf == 4) blk_pos = SYNC_LEN+35; + else { + sf = 0; + for (j = 0; j < 4; j++) sf += (block_bytes[SYNC_LEN+40+j] == frm_sync[j]); + if (sf == 4) blk_pos = SYNC_LEN+40; // 300-260 + } + } + + if (blen > 100 && option_ecc) { + for (j = 0; j < rs_N; j++) rs_cw[rs_N-1-j] = block_bytes[blk_pos+j]; + errs = lms6_ecc(rs_cw); + for (j = 0; j < rs_N; j++) block_bytes[blk_pos+j] = rs_cw[rs_N-1-j]; + } + + if (option_raw == 2) { + for (i = 0; i < flen; i++) printf("%02x ", block_bytes[i]); + if (blen > 100 && option_ecc) printf("(%d)", errs); + printf("\n"); + } + else if (option_raw == 4 && option_ecc && blen > 100) { + for (i = 0; i < rs_N; i++) printf("%02x", block_bytes[blk_pos+i]); + printf(" (%d)", errs); + printf("\n"); + } + else if (option_raw == 8) { + if (option_vit) { + for (i = 0; i < len; i++) printf("%c", vit_rawbits[i]); printf("\n"); + } + else { + for (i = 0; i < len; i++) printf("%c", blk_rawbits[i]); printf("\n"); + } + } + + for (j = 0; j < rs_K; j++) frame[j] = block_bytes[blk_pos+j]; + + crc_err = check_CRC(p_frame); + + if (option_raw == 1) { + for (i = 0; i < FRM_LEN; i++) printf("%02x ", p_frame[i]); + if (crc_err==0) printf(" [OK]"); else printf(" [NO]"); + printf("\n"); + } + + if (option_raw == 0) print_frame(crc_err, len); + +} + + +int main(int argc, char **argv) { + + FILE *fp = NULL; + char *fpname = NULL; + float spb = 0.0; + int header_found = 0; + + int bit, rbit; + int bitpos = 0; + int bitQ; + int pos; + int herrs, herr1; + int headerlen = 0; + + int k,K; + float mv; + unsigned int mv_pos, mv0_pos; + int mp = 0; + + float thres = 0.76; + + int symlen = 1; + int bitofs = 1; // +1 .. +2 + int shift = 0; + + unsigned int bc = 0; + + float sb = 0.0; + float sbit = 0.0; + float level = -1.0, ll = -1.0; + + +#ifdef CYGWIN + _setmode(fileno(stdin), _O_BINARY); // _setmode(_fileno(stdin), _O_BINARY); +#endif + setbuf(stdout, NULL); + + fpname = argv[0]; + ++argv; + while ((*argv) && (!wavloaded)) { + if ( (strcmp(*argv, "-h") == 0) || (strcmp(*argv, "--help") == 0) ) { + fprintf(stderr, "%s [options] audio.wav\n", fpname); + fprintf(stderr, " options:\n"); + fprintf(stderr, " -v, --verbose\n"); + fprintf(stderr, " -r, --raw\n"); + fprintf(stderr, " --vit,--vit2 (Viterbi/soft)\n"); + fprintf(stderr, " --ecc (Reed-Solomon)\n"); + return 0; + } + else if ( (strcmp(*argv, "-v") == 0) || (strcmp(*argv, "--verbose") == 0) ) { + option_verbose = 1; + } + else if ( (strcmp(*argv, "-r") == 0) || (strcmp(*argv, "--raw") == 0) ) { + option_raw = 1; // bytes - rs_ecc_codewords + } + else if ( (strcmp(*argv, "-r0") == 0) || (strcmp(*argv, "--raw0") == 0) ) { + option_raw = 2; // bytes: sync + codewords + } + else if ( (strcmp(*argv, "-rc") == 0) || (strcmp(*argv, "--rawecc") == 0) ) { + option_raw = 4; // rs_ecc_codewords + } + else if ( (strcmp(*argv, "-R") == 0) || (strcmp(*argv, "--RAW") == 0) ) { + option_raw = 8; // rawbits + } + else if (strcmp(*argv, "--ecc" ) == 0) { option_ecc = 1; } // RS-ECC + else if (strcmp(*argv, "--vit" ) == 0) { option_vit = 1; } // viterbi-hard + else if (strcmp(*argv, "--vit2") == 0) { option_vit = 2; } // viterbi-soft + else if ( (strcmp(*argv, "-i") == 0) || (strcmp(*argv, "--invert") == 0) ) { + option_inv = 1; + } + else if ( (strcmp(*argv, "--dc") == 0) ) { + option_dc = 1; + } + else if ( (strcmp(*argv, "--ch2") == 0) ) { wav_channel = 1; } // right channel (default: 0=left) + else if ( (strcmp(*argv, "--ths") == 0) ) { + ++argv; + if (*argv) { + thres = atof(*argv); + } + else return -1; + } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } + else if ( (strcmp(*argv, "--level") == 0) ) { + ++argv; + if (*argv) { + ll = atof(*argv); + } + else return -1; + } + else { + fp = fopen(*argv, "rb"); + if (fp == NULL) { + fprintf(stderr, "%s konnte nicht geoeffnet werden\n", *argv); + return -1; + } + wavloaded = 1; + } + ++argv; + } + if (!wavloaded) fp = stdin; + + + spb = read_wav_header(fp, (float)BAUD_RATE, wav_channel); + if ( spb < 0 ) { + fclose(fp); + fprintf(stderr, "error: wav header\n"); + return -1; + } + if ( spb < 8 ) { + fprintf(stderr, "note: sample rate low\n"); + } + + + if (option_raw == 4) option_ecc = 1; + + if (option_vit) { + vit_initCodes(); + } + if (option_ecc) { + rs_init_RS255ccsds(); // bch_ecc.c + } + + + symlen = 1; + bitofs += shift; + + headerlen = strlen(rawheader); + K = init_buffers(rawheader, headerlen, 2); // shape=2 (alt. shape=1) + if ( K < 0 ) { + fprintf(stderr, "error: init buffers\n"); + return -1; + }; + + level = ll; + k = 0; + mv = 0; + mv_pos = 0; + + while ( f32buf_sample(fp, option_inv) != EOF ) { + + k += 1; + if (k >= K-4) { + mv0_pos = mv_pos; + mp = getCorrDFT(K, 0, &mv, &mv_pos); + k = 0; + } + else { + mv = 0.0; + continue; + } + + if (mp > 0 && (mv > thres || mv < -thres)) { + if (mv_pos > mv0_pos) { + + header_found = 0; + herrs = headcmp(symlen, rawheader, headerlen, mv_pos, mv<0, option_dc); // (symlen=1) + herr1 = 0; + + if (herrs <= 3 && herrs > 0) { + herr1 = headcmp(symlen, rawheader, headerlen, mv_pos+1, mv<0, option_dc); + if (herr1 < herrs) { + herrs = herr1; + herr1 = 1; + } + } + if (herrs <= 3) header_found = 1; // herrs <= 3 bitfehler in header + + if (header_found) { + + if (ll <= 0) level = header_level(rawheader, headerlen, mv_pos, mv<0) * 0.6; + + bitpos = 0; + pos = BLOCKSTART; + + if (mv > 0) bc = 0; else bc = 1; + + while ( pos < RAWBITBLOCK_LEN ) { + header_found = !(pos>=RAWBITBLOCK_LEN-10); + //bitQ = read_sbit(fp, symlen, &rbit, option_inv, bitofs, bitpos==0); // symlen=1 + bitQ = read_softbit(fp, symlen, &rbit, &sb, level, option_inv, bitofs, bitpos==0); // symlen=1 + if (bitQ == EOF) { break; } + + bit = rbit ^ (bc%2); // (c0,inv(c1)) + blk_rawbits[pos] = 0x30 + bit; + + sbit = sb * (-(int)(bc%2)*2+1); + soft_rawbits[pos] = sbit; + + bc++; + pos++; + bitpos += 1; + } + + blk_rawbits[pos] = '\0'; + soft_rawbits[pos] = 0; + + proc_frame(pos); + + if (pos < RAWBITBLOCK_LEN) break; + + pos = BLOCKSTART; + header_found = 0; + } + } + } + + } + + + free_buffers(); + + fclose(fp); + + return 0; +} + diff --git a/demod/m10dm_dft.c b/demod/m10dm_dft.c index 151290a..5f96dd4 100644 --- a/demod/m10dm_dft.c +++ b/demod/m10dm_dft.c @@ -802,8 +802,9 @@ int main(int argc, char **argv) { float thres = 0.76; - int bitofs = 0; int symlen = 2; + int bitofs = 0; // 0 .. +2 + int shift = 0; #ifdef CYGWIN @@ -854,6 +855,15 @@ int main(int argc, char **argv) { } else return -1; } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } else { fp = fopen(*argv, "rb"); if (fp == NULL) { @@ -879,8 +889,9 @@ int main(int argc, char **argv) { symlen = 2; + bitofs += shift; + headerlen = strlen(rawheader); - bitofs = 0; // 0 .. +2 K = init_buffers(rawheader, headerlen, 1); // shape=0 (alt. shape=1) if ( K < 0 ) { fprintf(stderr, "error: init buffers\n"); @@ -889,14 +900,15 @@ int main(int argc, char **argv) { k = 0; - mv = -1; mv_pos = 0; + mv = 0; + mv_pos = 0; - while ( f32buf_sample(fp, option_inv, 1) != EOF ) { + while ( f32buf_sample(fp, option_inv) != EOF ) { k += 1; if (k >= K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(-1, K, 0, &mv, &mv_pos); + mp = getCorrDFT(K, 0, &mv, &mv_pos); k = 0; } else { @@ -925,11 +937,10 @@ int main(int argc, char **argv) { bitpos = 0; pos = 0; pos /= 2; - bit0 = '0'; + bit0 = '0'; // oder: mv[j] > 0 while ( pos < BITFRAME_LEN+BITAUX_LEN ) { - header_found = !(pos>=BITFRAME_LEN-10); - bitQ = read_spkbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0, !header_found, spike); // symlen=2, return: zeroX/bit + bitQ = read_spkbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0, spike); // symlen=2 if (bitQ == EOF) { break; } frame_bits[pos] = 0x31 ^ (bit0 ^ bit); pos++; @@ -945,7 +956,7 @@ int main(int argc, char **argv) { // bis Ende der Sekunde vorspulen; allerdings Doppel-Frame alle 10 sek if (option_verbose < 3) { // && (regulare frame) // print_frame-return? while ( bitpos < 5*BITFRAME_LEN ) { - bitQ = read_spkbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0, 0, spike); // symlen=2, return: zeroX/bit + bitQ = read_spkbit(fp, symlen, &bit, option_inv, bitofs, bitpos==0, spike); // symlen=2 if ( bitQ == EOF) break; bitpos++; } diff --git a/demod/rs41dm_dft.c b/demod/rs41dm_dft.c index 4238668..46f976f 100644 --- a/demod/rs41dm_dft.c +++ b/demod/rs41dm_dft.c @@ -789,7 +789,7 @@ int get_GPS3() { return err; } -int get_Aux(char* aux_data) { +int get_Aux() { // // "Ozone Sounding with Vaisala Radiosonde RS41" user's guide // @@ -813,7 +813,6 @@ int get_Aux(char* aux_data) { //fprintf(stdout, " # %02x : ", framebyte(pos7E+2)); for (i = 1; i < auxlen; i++) { ui8_t c = framebyte(pos7E+2+i); - aux_data[i-1] = c; if (c > 0x1E) fprintf(stdout, "%c", c); } count7E++; @@ -1098,26 +1097,18 @@ int print_position(int ec) { get_Calconf(output); - char aux_data[FRAME_LEN] = ""; - if (option_verbose > 1 || option_json) get_Aux(aux_data); + if (option_verbose > 1) get_Aux(); fprintf(stdout, "\n"); // fflush(stdout); if (option_json) { - char auxbuffer[FRAME_LEN] = ""; - fprintf(stdout, "\n"); // fflush(stdout) as get_Aux prints to stdout // Print JSON output required by auto_rx. if (!err && !err1 && !err3) { // frame-nb/id && gps-time && gps-position (crc-)ok; 3 CRCs, RS not needed - if ( strlen(aux_data) > 0 ){ - strcpy( auxbuffer, ", \"aux\":\""); - strcpy( auxbuffer+9, aux_data); - strcpy( auxbuffer+strlen(aux_data)+8, "\"\0" ); - } if (option_ptu && !err0 && gpx.T > -273.0) { - printf("{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d, \"temp\":%.1f %s}\n", gpx.frnr, gpx.id, gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vU, gpx.numSV, gpx.T, auxbuffer); + printf("{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d, \"temp\":%.1f }\n", gpx.frnr, gpx.id, gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vU, gpx.numSV, gpx.T ); } else { - printf("{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d %s}\n", gpx.frnr, gpx.id, gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vU, gpx.numSV, auxbuffer); + printf("{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d }\n", gpx.frnr, gpx.id, gpx.jahr, gpx.monat, gpx.tag, gpx.std, gpx.min, gpx.sek, gpx.lat, gpx.lon, gpx.alt, gpx.vH, gpx.vD, gpx.vU, gpx.numSV ); } printf("\n"); } @@ -1218,6 +1209,7 @@ int main(int argc, char *argv[]) { int symlen = 1; int bitofs = 2; + int shift = 0; #ifdef CYGWIN @@ -1270,6 +1262,15 @@ int main(int argc, char *argv[]) { } else return -1; } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } else { fp = fopen(*argv, "rb"); if (fp == NULL) { @@ -1300,8 +1301,9 @@ int main(int argc, char *argv[]) { symlen = 1; + bitofs += shift; + headerlen = strlen(header); - bitofs = 2; // +1 .. +2 K = init_buffers(header, headerlen, 2); // shape=2 if ( K < 0 ) { fprintf(stderr, "error: init buffers\n"); @@ -1310,14 +1312,15 @@ int main(int argc, char *argv[]) { k = 0; - mv = -1; mv_pos = 0; + mv = 0; + mv_pos = 0; - while ( f32buf_sample(fp, option_inv, 1) != EOF ) { + while ( f32buf_sample(fp, option_inv) != EOF ) { k += 1; if (k >= K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(0, K, 0, &mv, &mv_pos); + mp = getCorrDFT(K, 0, &mv, &mv_pos); k = 0; } else { @@ -1350,7 +1353,7 @@ int main(int argc, char *argv[]) { ft_len = frmlen; while ( byte_count < frmlen ) { - bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0, 0); // symlen=1, return: zeroX/bit + bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0); // symlen=1 if ( bitQ == EOF) break; bit_count += 1; bitbuf[bitpos] = bit; @@ -1380,7 +1383,7 @@ int main(int argc, char *argv[]) { header_found = 0; while ( bit_count < BITS*(FRAME_LEN-8+24) ) { - bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0, 0); // symlen=1, return: zeroX/bit + bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0); // symlen=1 if ( bitQ == EOF) break; bit_count++; } diff --git a/demod/rs41dm_iq.c b/demod/rs41dm_iq.c index abeb333..3fba9e2 100644 --- a/demod/rs41dm_iq.c +++ b/demod/rs41dm_iq.c @@ -33,6 +33,7 @@ typedef struct { i8_t ecc; // Reed-Solomon ECC i8_t sat; // GPS sat data i8_t ptu; // PTU: temperature + i8_t jsn; // JSON output (auto_rx) } option_t; typedef struct { @@ -789,7 +790,7 @@ static int get_Aux(gpx_t *gpx) { if ( auxcrc == crc16(gpx, pos7E+2, auxlen) ) { if (count7E == 0) fprintf(stdout, "\n # xdata = "); - else { fprintf(stdout, " # "); gpx->xdata[n++] = '#'; } + else { fprintf(stdout, " # "); gpx->xdata[n++] = '#'; } // aux separator //fprintf(stdout, " # %02x : ", gpx->frame[pos7E+2]); for (i = 1; i < auxlen; i++) { @@ -1073,10 +1074,29 @@ static int print_position(gpx_t *gpx, int ec) { get_Calconf(gpx, output); - if (gpx->option.vbs > 1) gpx->aux = get_Aux(gpx); + if (gpx->option.vbs > 1 || gpx->option.jsn) { + gpx->aux = get_Aux(gpx); + //if (gpx->aux) fprintf(stdout, "\n%d: %s", gpx->aux, gpx->xdata); + } fprintf(stdout, "\n"); // fflush(stdout); + + if (gpx->option.jsn) { + // Print JSON output required by auto_rx. + if (!err && !err1 && !err3) { // frame-nb/id && gps-time && gps-position (crc-)ok; 3 CRCs, RS not needed + printf("{ \"frame\": %d, \"id\": \"%s\", \"datetime\": \"%04d-%02d-%02dT%02d:%02d:%06.3fZ\", \"lat\": %.5f, \"lon\": %.5f, \"alt\": %.5f, \"vel_h\": %.5f, \"heading\": %.5f, \"vel_v\": %.5f, \"sats\": %d", gpx->frnr, gpx->id, gpx->jahr, gpx->monat, gpx->tag, gpx->std, gpx->min, gpx->sek, gpx->lat, gpx->lon, gpx->alt, gpx->vH, gpx->vD, gpx->vU, gpx->numSV ); + if (gpx->option.ptu && !err0 && gpx->T > -273.0) { + printf(", \"temp\":%.1f", gpx->T ); + } + if (gpx->aux) { // <=> gpx->xdata[0]!='\0' + printf(", \"aux\":\"%s\"", gpx->xdata ); + } + printf(" }\n"); + printf("\n"); + } + } + } err |= err1 | err3; @@ -1210,6 +1230,11 @@ int main(int argc, char *argv[]) { else if (strcmp(*argv, "--ecc2") == 0) { gpx.option.ecc = 2; } else if (strcmp(*argv, "--sat") == 0) { gpx.option.sat = 1; } else if (strcmp(*argv, "--ptu") == 0) { gpx.option.ptu = 1; } + else if (strcmp(*argv, "--json") == 0) { + gpx.option.jsn = 1; + gpx.option.ecc = 2; + gpx.option.crc = 1; + } else if (strcmp(*argv, "--ch2") == 0) { sel_wavch = 1; } // right channel (default: 0=left) else if (strcmp(*argv, "--ths") == 0) { ++argv; @@ -1310,7 +1335,7 @@ int main(int argc, char *argv[]) { k += 1; if (k >= dsp.K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(&dsp, 0, 0, &mv, &mv_pos); + mp = getCorrDFT(&dsp, 0, &mv, &mv_pos); k = 0; } else { @@ -1340,10 +1365,10 @@ int main(int argc, char *argv[]) { while ( byte_count < FRAME_LEN ) { if (option_iq >= 2) { - bitQ = read_slbit(&dsp, symlen, &bit, option_inv, bitofs, bit_count, 1.0); + bitQ = read_slbit(&dsp, symlen, &bit, option_inv, bitofs, bit_count, 1.0, 0); } else { - bitQ = read_slbit(&dsp, symlen, &bit, option_inv, bitofs, bit_count, -1); + bitQ = read_slbit(&dsp, symlen, &bit, option_inv, bitofs, bit_count, -1, 0); } if ( bitQ == EOF) break; bit_count += 1; diff --git a/demod/rs92dm_dft.c b/demod/rs92dm_dft.c index 9af507e..dbde296 100644 --- a/demod/rs92dm_dft.c +++ b/demod/rs92dm_dft.c @@ -1240,8 +1240,9 @@ int main(int argc, char *argv[]) { float thres = 0.7; - int bitofs = 0; int symlen = 2; + int bitofs = 2; // +0 .. +3 + int shift = 0; #ifdef CYGWIN @@ -1342,7 +1343,7 @@ int main(int argc, char *argv[]) { else if (strcmp(*argv, "-g2") == 0) { option_vergps = 2; } // verbose2 GPS (bancroft) else if (strcmp(*argv, "-gg") == 0) { option_vergps = 8; } // vverbose GPS else if (strcmp(*argv, "--ecc") == 0) { option_ecc = 1; } - else if (strcmp(*argv, "--json") == 0) { option_json = 1; } // JSON output (for auto_rx) + else if (strcmp(*argv, "--json") == 0) {option_json = 1; option_ecc = 1; option_crc = 1; } else if (strcmp(*argv, "--ch2") == 0) { wav_channel = 1; } // right channel (default: 0=left) else if (strcmp(*argv, "--ths") == 0) { ++argv; @@ -1351,6 +1352,15 @@ int main(int argc, char *argv[]) { } else return -1; } + else if ( (strcmp(*argv, "-d") == 0) ) { + ++argv; + if (*argv) { + shift = atoi(*argv); + if (shift > 4) shift = 4; + if (shift < -4) shift = -4; + } + else return -1; + } else { if (!rawin) fp = fopen(*argv, "rb"); else fp = fopen(*argv, "r"); @@ -1405,8 +1415,9 @@ int main(int argc, char *argv[]) { symlen = 2; + bitofs += shift; + headerlen = strlen(rawheader); - bitofs = 2; // +1 .. +2 K = init_buffers(rawheader, headerlen, 2); // shape=2 if ( K < 0 ) { fprintf(stderr, "error: init buffers\n"); @@ -1414,14 +1425,15 @@ int main(int argc, char *argv[]) { }; k = 0; - mv = -1; mv_pos = 0; + mv = 0; + mv_pos = 0; - while ( f32buf_sample(fp, option_inv, 1) != EOF ) { + while ( f32buf_sample(fp, option_inv) != EOF ) { k += 1; if (k >= K-4) { mv0_pos = mv_pos; - mp = getCorrDFT(0, K, 0, &mv, &mv_pos); + mp = getCorrDFT(K, 0, &mv, &mv_pos); k = 0; } else { @@ -1451,8 +1463,7 @@ int main(int argc, char *argv[]) { bitpos = 0; while ( byte_count < FRAME_LEN ) { - header_found = !(byte_count>=FRAME_LEN-2); - bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0, !header_found); // symlen=2, return: zeroX/bit + bitQ = read_sbit(fp, symlen, &bit, option_inv, bitofs, bit_count==0); // symlen=2 if ( bitQ == EOF) break; bit_count += 1; bitbuf[bitpos] = bit;