Made get_test_bits frame larger, corrected include in fsk.c

git-svn-id: https://svn.code.sf.net/p/freetel/code@2669 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/fsk.c b/codec2-dev/src/fsk.c
index 50ae00ed386c52c61d7b1001fbc9d33014851032..728c48272c86f237657aafa4f4efc692a3420e7a 100644 (file)
--- a/codec2-dev/src/fsk.c
+++ b/codec2-dev/src/fsk.c
@@ -49,7 +49,7 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "fsk4.h"
+#include "fsk.h"
 #include "comp_prim.h"
 #include "kiss_fftr.h"
 #include "modem_probe.h"
@@ -230,7 +230,7 @@ void fsk_destroy(struct FSK *fsk){
 }
 
 #define FEST_MIN 800
-#define FEST_MAX 2500
+#define FEST_MAX (Fs-1500)
 #define FEST_MIN_SPACING 200
 
 /*

diff --git a/codec2-dev/src/fsk_get_test_bits.c b/codec2-dev/src/fsk_get_test_bits.c
index ece1976fedae78afb3af14798b509cd9823bac6d..a303e8fbc3023fa387e59ad403f8b5daf7496c50 100644 (file)
--- a/codec2-dev/src/fsk_get_test_bits.c
+++ b/codec2-dev/src/fsk_get_test_bits.c
@@ -32,7 +32,7 @@
 #include "fsk.h"
 #include "codec2_fdmdv.h"
 
-#define FSK_FRAME_SIZE 100
+#define FSK_FRAME_SIZE 400
 #define INIT_SEQ {0,1,1,0,1,0,0,1,1,1,1,0,1,1,0,0,0,0,1,0,1,1,0,1,0,1,0,1,0,0,1,1}
 
 uint8_t init[] = INIT_SEQ;
@@ -70,8 +70,14 @@ int main(int argc,char *argv[]){
     
     /* Write out sync frame and sequence */
     for(i=0; i<FSK_FRAME_SIZE; i++){
+               bitbuf[i++] = 0;
+               bitbuf[i++] = 0;
+               bitbuf[i++] = 0;
                bitbuf[i++] = 1;
-               bitbuf[i  ] = 0;
+               bitbuf[i++] = 1;
+               bitbuf[i++] = 0;
+               bitbuf[i++] = 1;
+               bitbuf[i  ] = 1;
        }
        for(i=0;i<sizeof(init);i++){
                bitbuf[FSK_FRAME_SIZE-sizeof(init)+i]=init[i];