From 670a0f32b9d9d22a9e73b202efa1bedfdd8d9de4 Mon Sep 17 00:00:00 2001
From: Rene Hopf <renehopf@mac.com>
Date: Mon, 21 Jul 2014 19:17:36 +0200
Subject: [PATCH] resolver out

---
 src/main.c  | 18 +++++++++---------
 src/setup.c | 19 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main.c b/src/main.c
index 6e175652..fc3fccfe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -66,17 +66,12 @@ void output_pwm(){
 
 void TIM2_IRQHandler(void){//1KHz
     TIM_ClearITPendingBit(TIM2, TIM_IT_Update);
-    GPIO_SetBits(GPIOD,GPIO_Pin_11);
+    //GPIO_SetBits(GPIOD,GPIO_Pin_11);
     mag_pos+=pi/100;
     output_pwm();
-    GPIO_ResetBits(GPIOD,GPIO_Pin_11);
+    //GPIO_ResetBits(GPIOD,GPIO_Pin_11);
 }
 
-void TIM7_IRQHandler(void){//DAC int handler
-    TIM_ClearITPendingBit(TIM7, TIM_IT_Update);
-}
-
-
 void ADC_IRQHandler(void)
 {
     //int t1, t2;
@@ -97,6 +92,11 @@ int main(void)
 
     while(1)  // Do not exit
     {
+     GPIO_SetBits(GPIOD,GPIO_Pin_11);
+     Delay(1000);
+     GPIO_ResetBits(GPIOD,GPIO_Pin_11);
+     Delay(1000);
+        
         /*if(followe){
             GPIO_ResetBits(GPIOD,GPIO_Pin_15);//disable
             TIM4->CCR1 = 0;
@@ -109,10 +109,10 @@ int main(void)
 }
 
 void Delay(volatile uint32_t nCount) {
-    //float one;
+    float one;
     while(nCount--)
     {
-        //one = (float) nCount;
+        one = (float) nCount;
     }
 }
 
diff --git a/src/setup.c b/src/setup.c
index 5e27b494..479e14f5 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -96,7 +96,7 @@ void setup(){
     ADC_EOCOnEachRegularChannelCmd(ADC3,DISABLE);
 */
     
-    /* pwm set up */
+    /* pwm set up, TIM4*/
     /* Compute the prescaler value */       // 168MHz/2         / pwm frq / pwm res - 1
     uint16_t PrescalerValue = (uint16_t) ((SystemCoreClock /2) / 10000 / mag_res) - 1; // = 4
 
@@ -107,29 +107,28 @@ void setup(){
     TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
     TIM_TimeBaseInit(TIM4, &TIM_TimeBaseStructure);
 
-    /* PWM1 Mode configuration: Channel1 */
+
     TIM_OCInitStructure.TIM_OCMode = TIM_OCMode_PWM1;
     TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
     TIM_OCInitStructure.TIM_Pulse = 0;
     TIM_OCInitStructure.TIM_OCPolarity = TIM_OCPolarity_High;
-
-
+    
+    /* PWM1 Mode configuration: Channel1 */
     TIM_OC1Init(TIM4, &TIM_OCInitStructure);
     TIM_OC1PreloadConfig(TIM4, TIM_OCPreload_Enable);
 
     /* PWM1 Mode configuration: Channel2 */
-    TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
-    TIM_OCInitStructure.TIM_Pulse = 0;
     TIM_OC2Init(TIM4, &TIM_OCInitStructure);
     TIM_OC2PreloadConfig(TIM4, TIM_OCPreload_Enable);
 
     /* PWM1 Mode configuration: Channel3 */
-    TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
-    TIM_OCInitStructure.TIM_Pulse = 0;
     TIM_OC3Init(TIM4, &TIM_OCInitStructure);
     TIM_OC3PreloadConfig(TIM4, TIM_OCPreload_Enable);
 
-    /* int set up */
+
+
+
+    /* int set up, TIM2*/
     TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1;
     TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
     TIM_TimeBaseStructure.TIM_Period = 8400;//1kHz
@@ -138,7 +137,7 @@ void setup(){
     TIM_TimeBaseInit(TIM2, &TIM_TimeBaseStructure);
     TIM_ITConfig(TIM2, TIM_IT_Update, ENABLE);
     //TIM_SelectOutputTrigger(TIM2, TIM_TRGOSource_Update);//DAC?
-
+    
     /* int NVIC setup */
     NVIC_InitStructure.NVIC_IRQChannel = TIM2_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;