From 6546773a60caca1f46fdfd7b16e98c49d6c620d5 Mon Sep 17 00:00:00 2001
From: baobrien <baobrien@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sun, 22 Mar 2015 02:42:55 +0000
Subject: [PATCH] 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
---
 codec2-dev/octave/dacres.m         | 3 ++-
 codec2-dev/stm32/Makefile          | 6 +++---
 codec2-dev/stm32/inc/iir_duc.h     | 1 +
 codec2-dev/stm32/src/fast_dac_ut.c | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/codec2-dev/octave/dacres.m b/codec2-dev/octave/dacres.m
index e75ac317..6d429362 100644
--- 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 5c83e667..95b9316b 100644
--- 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 3148855d..e4c921ed 100644
--- 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 08107dc3..2e8fa5c2 100644
--- 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>
 #include "gdb_stdio.h"
 #include "comp.h"
-#include "gmsk_test_dat_m4.h"
+//#include "gmsk_test_dat_m4.h"
 #define SINE_SAMPLES  32
 
 
@@ -91,15 +91,15 @@ int main(void) {
     }
     while (1) {
 	cyc+=DUC_N/10;
-        if(cyc>GMSK_TEST_LEN)
-            cyc=0;
+        //if(cyc>GMSK_TEST_LEN)
+        //    cyc=0;
 	/*if(cyc%10000==0){
                 printf("8c80r takes %d uSecs\n",tup-tstart);
 		printf("iir upconvert takes %d uSecs\n",tend-tup);
 	}*/
         tstart = TIM_GetCounter(TIM2);
 
-        upconv_8c_80r(&gmsk_test_d[cyc],tx_imm,1);
+        //upconv_8c_80r(&gmsk_test_d[cyc],tx_imm,1);
 
 	tup = TIM_GetCounter(TIM2);
 
-- 
2.25.1