From 7a89e238909902f307e3ccf7aa8fdc5dcd49fe7c Mon Sep 17 00:00:00 2001 From: okcsampson Date: Sun, 11 Jun 2017 22:34:34 +0000 Subject: [PATCH] Remove constants from ofdm_internal.h git-svn-id: https://svn.code.sf.net/p/freetel/code@3171 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/src/ofdm_internal.h | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/codec2-dev/src/ofdm_internal.h b/codec2-dev/src/ofdm_internal.h index dd413d8e..fa966f6b 100644 --- a/codec2-dev/src/ofdm_internal.h +++ b/codec2-dev/src/ofdm_internal.h @@ -47,32 +47,9 @@ extern "C" { #define OFDM_FTWINDOWWIDTH 11 #define OFDM_BITSPERFRAME ((OFDM_NS - 1) * (OFDM_NC * OFDM_BPS)) #define OFDM_ROWSPERFRAME (OFDM_BITSPERFRAME / (OFDM_NC * OFDM_BPS)) -#define OFDM_SAMPLESPERFRAME (OFDM_ROWSPERFRAME * (OFDM_M + OFDM_NCP)) +#define OFDM_SAMPLESPERFRAME (OFDM_NS * (OFDM_M + OFDM_NCP)) #define OFDM_RXBUF (3 * OFDM_SAMPLESPERFRAME + 3 * (OFDM_M + OFDM_NCP)) -/* - * QPSK Quadrant bit-pair values - Gray Coded - * - * 0.0 - 89.9 = 00 - * 90.0 - 179.9 = 01 - * 180.0 - 269.9 = 11 - * 270.0 - 359.9 = 10 - */ -const complex float constellation[] = { - 1.0f + 0.0f * I, - 0.0f + 1.0f * I, - 0.0f - 1.0f * I, - -1.0f + 0.0f * I -}; - -/* - * These pilots are compatible with Octave version - */ -const char pilotvalues[] = { - -1, -1, 1, 1, -1, -1, -1, 1, -1, - 1, -1, 1, 1, 1, 1, 1, 1, 1 -}; - struct OFDM { float foff_est_gain; float foff_est_hz; -- 2.25.1