Modified stm32 makefile for stm32 periphlib 1.5.0

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

diff --git a/codec2-dev/octave/dacres.m b/codec2-dev/octave/dacres.m
index e75ac317d4b6af4e7bdba6885b8a12887b4d2ece..6d429362835090dd5a28cd67834f7c87a0cbe255 100644 (file)
--- a/codec2-dev/octave/dacres.m
+++ b/codec2-dev/octave/dacres.m
@@ -138,6 +138,7 @@ sdac = filter(1,[1 b1x beta1],sducinterp); %select wanted signal
 sdac = sdac + median(sdac);  %Center above zero
 sdac = sdac / max(sdac);     %normalize
 sdac = int32(sdac*2000);     %integerize
+sdac = sdac + sdac .^ 5;
 
 figure(1)
 subplot(211)
@@ -161,4 +162,4 @@ subplot(212)
 plot(20*log10(abs(fft(sdac)/fd)))
 grid
 title('After bandpass');
-axis([0 (fd/2) -20 80])
+%axis([0 (fd/2) -20 80])

diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile
index 5c83e6679896891d2b19902f7d1aecdc33158552..95b9316b81e4d9eca033f5de6dd66210a1f434e3 100644 (file)
--- a/codec2-dev/stm32/Makefile
+++ b/codec2-dev/stm32/Makefile
@@ -30,9 +30,9 @@ endif
 
 PERIPHLIBURL    = http://www.st.com/st-web-ui/static/active/en/st_prod_software_internet/resource/technical/software/firmware/
 PERIPHLIBZIP    = stm32f4_dsp_stdperiph_lib.zip
-PERIPHLIBVER   = V1.4.0
+PERIPHLIBVER   = V1.5.0
 PERIPHLIBNAME  = STM32F4xx_DSP_StdPeriph_Lib
-PERIPHLIBDIR   = $(PERIPHLIBNAME)_$(PERIPHLIBVER)
+PERIPHLIBDIR   = $(PERIPHLIBNAME)
 CMSIS          = $(PERIPHLIBDIR)/Libraries/CMSIS
 STM32F4LIB     = $(PERIPHLIBDIR)/Libraries/STM32F4xx_StdPeriph_Driver
 STM32F4TEMPLATE        = $(PERIPHLIBDIR)/Project/STM32F4xx_StdPeriph_Templates
@@ -79,7 +79,7 @@ CFLAGS += -I../unittest
 CFLAGS += -Iinc
 
 FFT_TEST_SRCS = \
-$(DSPLIB)/Examples/arm_fft_bin_example/arm_fft_bin_data.c \
+$(DSPLIB)/Examples/arm_fft_bin_example/ARM/arm_fft_bin_data.c \
 fft_test.c \
 src/startup_stm32f4xx.s \
 stm32f4_machdep.c \

diff --git a/codec2-dev/stm32/inc/iir_duc.h b/codec2-dev/stm32/inc/iir_duc.h
index 3148855dca68dc7a5a4e4a65648f2cfefc94feea..e4c921ed505bea4686257530bf280a831bbdc6b5 100644 (file)
--- a/codec2-dev/stm32/inc/iir_duc.h
+++ b/codec2-dev/stm32/inc/iir_duc.h
@@ -30,6 +30,7 @@
 #include "comp.h"
 
 void iir_upconv(float modin[],unsigned short dac_out[]);
+void upconv_48c_80r(COMP comp_8[],float real_80[],int count);
 void upconv_8c_80r(COMP comp_8[],float real_80[],int count);
 
 #endif

diff --git a/codec2-dev/stm32/src/fast_dac_ut.c b/codec2-dev/stm32/src/fast_dac_ut.c
index 08107dc3e3a2a7ea7612fcba4a56423025f3f631..2e8fa5c2c21da9a3c943dc2996efa1d6907f6694 100644 (file)
--- a/codec2-dev/stm32/src/fast_dac_ut.c
+++ b/codec2-dev/stm32/src/fast_dac_ut.c
@@ -35,7 +35,7 @@
 #include <stm32f4xx_rcc.h>\r
 #include "gdb_stdio.h"\r
 #include "comp.h"\r
-#include "gmsk_test_dat_m4.h"\r
+//#include "gmsk_test_dat_m4.h"\r
 #define SINE_SAMPLES  32\r
 \r
 \r
@@ -91,15 +91,15 @@ int main(void) {
     }\r
     while (1) {\r
        cyc+=DUC_N/10;\r
-        if(cyc>GMSK_TEST_LEN)\r
-            cyc=0;\r
+        //if(cyc>GMSK_TEST_LEN)\r
+        //    cyc=0;\r
        /*if(cyc%10000==0){\r
                 printf("8c80r takes %d uSecs\n",tup-tstart);\r
                printf("iir upconvert takes %d uSecs\n",tend-tup);\r
        }*/\r
         tstart = TIM_GetCounter(TIM2);\r
 \r
-        upconv_8c_80r(&gmsk_test_d[cyc],tx_imm,1);\r
+        //upconv_8c_80r(&gmsk_test_d[cyc],tx_imm,1);\r
 \r
        tup = TIM_GetCounter(TIM2);\r
 \r