Diff: main.cpp

Revision:

1:3d2fffa6e19f

Parent:

0:ee5cb967aa17

Child:

2:70f92ce7d983

--- a/main.cpp	Sat Jan 10 20:06:07 2015 +0000
+++ b/main.cpp	Tue Sep 29 06:42:15 2015 +0000
@@ -19,26 +19,26 @@
  */
 
 #include "mbed.h"
-#include "Encoder.h"
+#include "counter.h"
 
-TIM_Encoder_InitTypeDef encoder1, encoder2, encoder3, encoder4;
-TIM_HandleTypeDef timer1, timer2, timer3, timer4;
+TIM_IC_InitTypeDef counterSet1;
+TIM_HandleTypeDef timer1;
 
 int main()
 {
     //examples
-    
+    //EncoderInit(TIM_IC_InitTypeDef counterSet, TIM_HandleTypeDef timer, TIM_TypeDef *TIMx, uint32_t maxcount);
     //counting on A-input only, 2 ticks per cycle, rolls over at 100
-    EncoderInit(encoder1, timer1, TIM1, 99, TIM_ENCODERMODE_TI1);
+    CounterInit(counterSet1, timer1, TIM1, 0xffff);
     
     //counting on both A&B inputs, 4 ticks per cycle, full 32-bit count
-    EncoderInit(encoder2, timer2, TIM2, 0xffffffff, TIM_ENCODERMODE_TI12);
+    //EncoderInit(encoder2, timer2, TIM2, 0xffffffff, TIM_ENCODERMODE_TI12);
 
     //counting on B-input only, 2 ticks per cycle, full 16-bit count
-    EncoderInit(encoder3, timer3, TIM3, 0xffff, TIM_ENCODERMODE_TI2);
+    //EncoderInit(encoder3, timer3, TIM3, 0xffff, TIM_ENCODERMODE_TI2);
     
     //counting on both A&B inputs, 4 ticks per cycle, full 16-bit count
-    EncoderInit(encoder4, timer4, TIM4, 0xffff, TIM_ENCODERMODE_TI12);
+    //EncoderInit(encoder4, timer4, TIM4, 0xffff, TIM_ENCODERMODE_TI12);
     
     //TIM5 is used by mbed for systick
     //EncoderInit(encoder2, timer2, TIM5, 0xffffffff, TIM_ENCODERMODE_TI12);
@@ -46,15 +46,14 @@
     printf("STM HAL encoder demo\n\r");
     
     while(1) {
-        int16_t count1=0, count3=0, count4=0;
-        int32_t count2=0, count5=0;
+        int16_t count1;
         
         count1=TIM1->CNT; //OK 401 411 TICKER 030
-        count2=TIM2->CNT; //OK 401 411 N/A 030
-        count3=TIM3->CNT; //OK 401 411 030
-        count4=TIM4->CNT; //OK 401 NOK 411 N/A 030
-        count5=TIM5->CNT; //TICKER 401 411 N/A 030
-        printf("%d %d %d %d %d\r\n", count1, count2, count3, count4, count5);
+        //count2=TIM2->CNT; //OK 401 411 N/A 030
+        //count3=TIM3->CNT; //OK 401 411 030
+        //count4=TIM4->CNT; //OK 401 NOK 411 N/A 030
+        //count5=TIM5->CNT; //TICKER 401 411 N/A 030
+        printf("%d\r\n", count1);
         wait(1.0);
     }
 }