Diff: Jareds_DSP/demodulate.cpp

Revision:

78:10b2916b8f5c

Parent:

75:8bb94685c80b

Child:

81:30d699e951a8

Child:

84:5b4466dd2326

--- a/Jareds_DSP/demodulate.cpp	Mon Jun 05 18:09:37 2017 +0000
+++ b/Jareds_DSP/demodulate.cpp	Tue Jun 06 18:15:00 2017 +0000
@@ -1,15 +1,15 @@
 #include "demodulate.h"
 
-#define MAX_NUMBER_DEMOD_FREQ 1
+#define MAX_NUMBER_DEMOD_FREQ 2
 
 #define DEMOD_EXTRA_TABLE_LENGTH 16
 #define TWOPI 6.28318530717959
 
 float *imod[MAX_NUMBER_DEMOD_FREQ];
 float *qmod[MAX_NUMBER_DEMOD_FREQ];
-float demod_Carrier_Frequency[MAX_NUMBER_DEMOD_FREQ] = {200};
-float demod_Table_Length[MAX_NUMBER_DEMOD_FREQ] = {125};
-float demod_Sample_Frequency[MAX_NUMBER_DEMOD_FREQ] = {6250};
+float demod_Carrier_Frequency[MAX_NUMBER_DEMOD_FREQ] = {200,1000};
+float demod_Table_Length[MAX_NUMBER_DEMOD_FREQ] = {125,25};
+float demod_Sample_Frequency[MAX_NUMBER_DEMOD_FREQ] = {12500,12500};
 
 void precompute_tables()
 {
@@ -35,7 +35,7 @@
 }
 void demodulate(float *samples[MAX_NUMBER_OF_FILTERS], int num_filters, int sample_length, int demodulation_frequency)
 {
-    static int demod_counters[MAX_NUMBER_DEMOD_FREQ] = {0};
+    static int demod_counters[MAX_NUMBER_DEMOD_FREQ] = {0,0};
     
     if (demod_counters[demodulation_frequency]>=demod_Table_Length[demodulation_frequency])
     {