Use new style library

limosky · Feb 22, 2019 · 8d590ac · 8d590ac
1 parent 072eb54
commit 8d590ac
Show file tree

Hide file tree

Showing 38 changed files with 794 additions and 1,050 deletions.
diff --git a/2fsk.png b/2fsk.png
diff --git a/2fsk.raw b/2fsk.raw
diff --git a/4fsk.png b/4fsk.png
diff --git a/4fsk.raw b/4fsk.raw
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/bin-test.c b/bin-test.c
diff --git a/crc-scrambler-interleaver-test.c b/crc-scrambler-interleaver-test.c
diff --git a/export-mfsk.zip b/export-mfsk.zip
diff --git a/header/demodulator.h b/header/demodulator.h
@@ -17,36 +17,9 @@ extern "C" {
 
 #include <stdint.h>
 #include <complex.h>
-
-#ifndef M_PI
-#define M_PI    3.14159265358979f
-#endif
-
-#define TAU     (2.0f * M_PI)
-
-#define MODE_2FSK 2
-#define MODE_4FSK 4
-#define MAX_TONES 4
-#define FFT_SIZE  1024
-#define FSK_SCALE 16383
-
-int fsk_create(int, int, int, int);
-int fsk_create_hbr(int, int, int, int, int, int);
-void fsk_destroy(void);
-void fsk_demod(uint8_t [], complex float []);
-void fsk_demod_sd(float [], complex float []);
-
-/* Getters/Setters */
-
-int fsk_get_nin(void);
-int fsk_get_N(void);
-int fsk_get_Nmem(void);
-int fsk_get_Nbits(void);
-int fsk_get_Ts(void);
-float fsk_get_f_est(int);
-void fsk_set_nsym(int);
-void fsk_set_est_limits(int, int);
-void fsk_set_estimators(void);
+
+void fsk_demod(struct FSK *, uint8_t [], complex float []);
+void fsk_demod_sd(struct FSK *, float [], complex float []);
 
 #ifdef __cplusplus
 }

diff --git a/header/fft.h b/header/fft.h
diff --git a/header/fsk.h b/header/fsk.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) January 2016 David Rowe, Brady O'Brien
+ *
+ * All rights reserved.
+ *
+ * Modified by Steve Sampson for C99 complex math
+ *
+ * Licensed under GNU LGPL V2.1
+ * See LICENSE file for information
+ */
+
+#ifndef FSK_H
+#define FSK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <complex.h>
+
+#include "fft.h"
+#include "statistics.h"
+
+#define MODE_2FSK 2
+#define MODE_4FSK 4
+#define MAX_TONES 4
+#define FFT_SIZE  1024
+#define FSK_SCALE 16383
+
+#define OVERSAMPLE_RATE    8
+#define MIN_FREQUENCY    300
+#define MAX_FREQUENCY   2200
+#define MIN_SPACING      100
+
+#define cmplx(value) (cosf(value) + sinf(value) * I)
+#define cmplxconj(value) (cosf(value) + sinf(value) * -I)
+
+struct FSK {
+    struct STATS *stats;
+    complex float phase[MAX_TONES];
+    float f_est[MAX_TONES];
+    float norm_rx_timing;
+    float EbNodB;
+    float ppm;
+    int Ndft;
+    int Fs;
+    int N;
+    int Rs;
+    int Ts;
+    int Nmem;
+    int P;
+    int Nsym;
+    int Nbits;
+    int f1;
+    int shift;
+    int mode;
+    int est_min;
+    int est_max;
+    int est_space;
+    int nstash;
+    int nin;
+    bool burst_mode;
+    fft_cfg fftcfg;
+    float *hann_table;
+    float *fft_est;
+    complex float *samp_old;
+};
+
+struct FSK *fsk_create(int, int, int, int);
+struct FSK *fsk_create_hbr(int, int, int, int, int, int);
+void fsk_destroy(struct FSK *);
+
+/* Getters/Setters */
+
+int fsk_get_nin(struct FSK *);
+int fsk_get_N(struct FSK *);
+int fsk_get_Nmem(struct FSK *);
+int fsk_get_Nbits(struct FSK *);
+int fsk_get_Ts(struct FSK *);
+float fsk_get_f_est(struct FSK *, int);
+void fsk_set_nsym(struct FSK *, int);
+void fsk_set_est_limits(struct FSK *, int, int);
+void fsk_set_estimators(struct FSK *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FSK_H */
+
diff --git a/header/modulator.h b/header/modulator.h
@@ -16,11 +16,24 @@ extern "C" {
 #endif
 
 #include <complex.h>
-
-int mod_create(int, int, int, int, int);
-void mod_destroy(void);
-void modulate(complex float [], int);
-void manchester_modulate(complex float [], int);
+
+#include "fsk.h"
+
+struct MODULATE {
+    complex float oscillator[MAX_TONES];
+    complex float phase;
+    float fs;
+    float rs;
+    float f1;
+    float shift;
+    int mode;
+    int cycles;
+};
+
+struct MODULATE *mod_create(int, int, int, int, int);
+void mod_destroy(struct MODULATE *);
+void modulate(struct MODULATE *, complex float [], int);
+void manchester_modulate(struct MODULATE *, complex float [], int);
 
 #ifdef __cplusplus
 }

diff --git a/header/statistics.h b/header/statistics.h
@@ -17,30 +17,37 @@ extern "C" {
 
 #include <complex.h>
 
-#include "modulator.h"
-#include "demodulator.h"
+#include "fsk.h"
 #include "fft.h"
 
 #define STATS_FFTSIZE   1024
 #define ASCALE  ((STATS_FFTSIZE / 2) * 1000)
 
-int stats_open(void);
-void stats_close(void);
-void stats_spectrum(float [], complex float [], int);
-
-float stats_get_snr_est(void);
-float stats_get_foff(void);
-float stats_get_rx_timing(void);
-float stats_get_clock_offset(void);
-float stats_get_f_est(int);
-
-float *stats_get_fft_buf_ptr(void);
-
-void stats_set_snr_est(float);
-void stats_set_foff(float);
-void stats_set_rx_timing(float);
-void stats_set_clock_offset(float);
-void stats_set_f_est(int, float);
+struct STATS {
+    fft_cfg fftcfg;
+    float snr_est; /* estimated SNR of rx signal in dB (3 kHz noise BW) */
+    float foff; /* estimated freq offset in Hz */
+    float rx_timing; /* estimated optimum timing offset in samples */
+    float clock_offset; /* Estimated tx/rx sample clock offset in ppm */
+    float scale_dB;
+    float fftbuffer[STATS_FFTSIZE];
+};
+
+struct STATS *stats_open(void);
+void stats_close(struct STATS *);
+void stats_spectrum(struct STATS *, float [], complex float [], int);
+
+float stats_get_snr_est(struct STATS *);
+float stats_get_foff(struct STATS *);
+float stats_get_rx_timing(struct STATS *);
+float stats_get_clock_offset(struct STATS *);
+
+float *stats_get_fft_buf_ptr(struct STATS *);
+
+void stats_set_snr_est(struct STATS *, float);
+void stats_set_foff(struct STATS *, float);
+void stats_set_rx_timing(struct STATS *, float);
+void stats_set_clock_offset(struct STATS *, float);
 
 #ifdef __cplusplus
 }

diff --git a/horus/api/export-horus_api.zip b/horus/api/export-horus_api.zip
diff --git a/horus/api/header/demodulator.h b/horus/api/header/demodulator.h
diff --git a/horus/api/header/golay23.h b/horus/api/header/golay23.h
diff --git a/horus/api/header/golaydectable.h b/horus/api/header/golaydectable.h
diff --git a/horus/api/header/golayenctable.h b/horus/api/header/golayenctable.h
diff --git a/horus/api/header/horus_api.h b/horus/api/header/horus_api.h
@@ -106,7 +106,7 @@ int horus_get_max_packet_len(void);
 /**
  * In-Place Algebraic Golden Prime Interleaver
  * 
- * inout  - The data to be operated on
+ * inout  - The byte data to be operated on
  * nbytes - The number of data bytes in the input/output
  * dir    - Direction is 0 to Interleave and 1 to De-Interleave
  */

diff --git a/horus/api/header/modulator.h b/horus/api/header/modulator.h
diff --git a/horus/api/header/statistics.h b/horus/api/header/statistics.h
diff --git a/horus/api/libhorus_api.so b/horus/api/libhorus_api.so
diff --git a/horus/api/src/golay23.c b/horus/api/src/golay23.c