diff --git a/dfm/dfm06s b/dfm/dfm06s index 89cf083..b14820c 100755 Binary files a/dfm/dfm06s and b/dfm/dfm06s differ diff --git a/imet/imet1ab.c b/imet/imet1ab.c index e2295d5..702a5ed 100644 --- a/imet/imet1ab.c +++ b/imet/imet1ab.c @@ -143,7 +143,7 @@ int read_signed_sample(FILE *fp) { // int = i32_t } -int par=-1, par_alt=-1; +int par=1, par_alt=1; unsigned long sample_count = 0; int read_afsk_bits(FILE *fp, int *len) { @@ -153,19 +153,19 @@ int read_afsk_bits(FILE *fp, int *len) { start = 0; n = 0; - do{ + do{ // High sample = read_signed_sample(fp); if (sample == EOF_INT) return EOF; if (option_inv) sample = -sample; sample_count++; - if (sample > 0 && !start) continue; + if (sample < 0 && !start) continue; start = 1; par_alt = par; par = (sample >= 0) ? 1 : -1; n++; } while (par*par_alt > 0); - do{ + do{ // Low sample = read_signed_sample(fp); if (sample == EOF_INT) return EOF; if (option_inv) sample = -sample; @@ -420,6 +420,7 @@ int bitl1 = 0, fprintf(stderr, "%s [options] audio.wav\n", fpname); fprintf(stderr, " options:\n"); fprintf(stderr, " -r, --raw\n"); + fprintf(stderr, " -i, --invert\n"); return 0; } /* diff --git a/rs41/rs41stdin.c b/rs41/rs41stdin.c index 98943ba..a61ceb8 100644 --- a/rs41/rs41stdin.c +++ b/rs41/rs41stdin.c @@ -179,7 +179,8 @@ int par=1, par_alt=1; unsigned long sample_count = 0; int read_bits_fsk(FILE *fp, int *bit, int *len) { - int n, sample=0, y0; + static int sample; + int n, y0; float l, x1; static float x0; @@ -203,8 +204,8 @@ int read_bits_fsk(FILE *fp, int *bit, int *len) { *len = (int)(l+0.5); - if (!option_inv) *bit = (1-par_alt)/2; // unten 1, oben -1 - else *bit = (1+par_alt)/2; // inverse + if (!option_inv) *bit = (1+par_alt)/2; // oben 1, unten -1 + else *bit = (1-par_alt)/2; // sdr#\n"); fprintf(stderr, " -e, --ephem \n"); + fprintf(stderr, " -i, --invert\n"); return 0; } else if ( (strcmp(*argv, "-v") == 0) || (strcmp(*argv, "--verbose") == 0) ) { diff --git a/rs92/rs92gps_rawin.c b/rs92/rs92gps_rawin.c index 9f61d41..49c00ab 100644 --- a/rs92/rs92gps_rawin.c +++ b/rs92/rs92gps_rawin.c @@ -231,8 +231,8 @@ int read_bits_fsk(FILE *fp, int *bit, int *len) { *len = (int)(l+0.5); - if (!option_inv) *bit = (1-par_alt)/2; // unten 1, oben -1 - else *bit = (1+par_alt)/2; // inverse: + if (!option_inv) *bit = (1+par_alt)/2; // oben 1, unten -1 + else *bit = (1-par_alt)/2; // sdr#\n"); fprintf(stderr, " -e, --ephem \n"); fprintf(stderr, " -g1 (verbose GPS: 4 sats)\n");