Diff: main.cpp

Revision:

1:7a3f34b2d18b

Parent:

0:1561c4efda0e

Child:

2:203d58b06b0f

--- a/main.cpp	Sun Jul 31 12:13:36 2016 +0000
+++ b/main.cpp	Thu Aug 11 08:29:22 2016 +0000
@@ -1,14 +1,10 @@
 #include "mbed.h"
 #include <stdio.h>
 #include "SDFileSystem.h"
-#include "stm32f3xx_hal_rcc.h"
-#include "cmsis_nvic.h"
 #include "wavPlayer.h"
+#include "TIM6Driver.h"
 
-static void MX_TIM6_Init(void);
-static void MX_NVIC_Init(void);
 void TIM6_IRQHandler(void);
-TIM_HandleTypeDef htim6;
 Ticker flipper;
 FATFS FatFs;
 wavPlayerOnDAC wavPlayer(PA_4);
@@ -22,33 +18,10 @@
 
 
 void TIM6_IRQHandler() {
-    __HAL_TIM_CLEAR_IT(&htim6 , TIM_FLAG_UPDATE);
+    TIM6ClearInt();
     wavPlayer.DACOutProc();
 }
 
-
-static void MX_NVIC_Init(void)
-{
-    /* TIM6_DAC1_IRQn interrupt configuration */
-    HAL_NVIC_SetPriority(TIM6_DAC1_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(TIM6_DAC1_IRQn);
-}
-/* TIM6 init function */
-static void MX_TIM6_Init(void)
-{
-    __TIM6_CLK_ENABLE();
-    htim6.Instance = TIM6;
-    htim6.Init.Prescaler = 1;
-    htim6.Init.CounterMode = TIM_COUNTERMODE_UP;
-    htim6.Init.Period = 1451;
-    if (HAL_TIM_Base_Init(&htim6) != HAL_OK) {
-        while(1) {
-        }
-    }
-    HAL_TIM_Base_Start_IT(&htim6);
-}
-
-
 int main(void)
 {
     FRESULT wavFileResult;
@@ -62,7 +35,9 @@
     DipSW.mode(PullDown);
     
     f_mount(&FatFs,"",0);
-    wavFileResult = f_open(&fil, "LondonCalling.wav", FA_READ);
+//    wavFileResult = f_open(&fil, "LondonCalling_44k16bitMono.wav", FA_READ);
+//    wavFileResult = f_open(&fil, "LondonCalling_44k8bitMono.wav", FA_READ);
+    wavFileResult = f_open(&fil, "LondonCalling_44k16bitStreo.wav", FA_READ);
     printf("error:%d\r\n",(int)wavFileResult);
     wavPlayer.setFile(&fil);
     printf("buff ok\r\n");