Diff: main.cpp

Revision:

4:4f115819171f

Parent:

2:958e9094b198

Child:

5:29372f6cb533

--- a/main.cpp	Sat Mar 11 23:07:17 2017 +0000
+++ b/main.cpp	Sat May 13 19:04:08 2017 +0000
@@ -21,42 +21,33 @@
 #include "mbed.h"
 #include "Encoder.h"
 
-TIM_Encoder_InitTypeDef encoder1, encoder2;
+TIM_Encoder_InitTypeDef encoder1;
 TIM_HandleTypeDef timer1,  timer2;
 
 int main()
 {
-    
-    //counting on A-input only, 2 ticks per cycle, rolls over at 100
-    EncoderInit(&encoder1, &timer1, TIM1, 0xffff, TIM_ENCODERMODE_TI12);
 
     //counting on both A&B inputs, 4 ticks per cycle, full 32-bit count
     //For L432KC to work with TIM2 one needs to reassign the system ticker 
     //from TIM2 to TIM7 in TARGET/../device/hal_tick.h
-    EncoderInit(&encoder2, &timer2, TIM2, 0xffffffff, TIM_ENCODERMODE_TI12);
+    EncoderInit(&encoder1, &timer2, TIM2, 0xffffffff, TIM_ENCODERMODE_TI12);
     
-    printf("\n\rSTM HAL encoder demo\n\r");
+    printf("\n\rSTM HAL encoder with ADC and DAC\n\r");
     
     while(1) {
-        uint16_t count1=0;
-        uint32_t count2=0;
-        int8_t dir1, dir2;
+        uint16_t count2=0;
+        uint32_t count1=0;
+        int8_t dir1;
 
-        
-        //OK 401 411 446 TICKER 030
-        //count1=TIM1->CNT;
-        //dir1=TIM1->CR1&TIM_CR1_DIR;
-        count1= __HAL_TIM_GET_COUNTER(&timer1);
-        dir1 = __HAL_TIM_IS_TIM_COUNTING_DOWN(&timer1);
 
         //OK 401 411 446 NOK 030
         //count2=TIM2->CNT;
         //dir2=TIM2->CR1&TIM_CR1_DIR;
-        count2=__HAL_TIM_GET_COUNTER(&timer2);
-        dir2 = __HAL_TIM_IS_TIM_COUNTING_DOWN(&timer2);
+        count1=__HAL_TIM_GET_COUNTER(&timer2);
+        dir1 = __HAL_TIM_IS_TIM_COUNTING_DOWN(&timer2);
 
         
-        printf("%d%s %d%s\r\n", count1, dir1==0 ? "+":"-", count2, dir2==0 ? "+":"-" );
+        printf("%d%s\r\n", count1, dir1==0 ? "+":"-");
         wait(0.1);
     }
 }