Browse Source

add encoder config

Arnaud Vergnet 3 years ago
parent
commit
cdcf3a2f9d
1 changed files with 13 additions and 6 deletions
  1. 13
    6
      Src/Sail.c

+ 13
- 6
Src/Sail.c View File

@@ -1,14 +1,20 @@
1 1
 #include "Sail.h"
2 2
 #include "ServoMotor.h"
3
+#include "IncrementalEncoder.h"
3 4
 
4
-TIM_TypeDef * SAIL_TIMER = TIM4;
5
-const int SAIL_CHANNEL = LL_TIM_CHANNEL_CH3;
6
-GPIO_TypeDef * SAIL_GPIO = GPIOB;
7
-const int SAIL_PIN = LL_GPIO_PIN_8;
5
+TIM_TypeDef * MOTOR_TIMER = TIM4;
6
+const int MOTOR_CHANNEL = LL_TIM_CHANNEL_CH3;
7
+GPIO_TypeDef * MOTOR_GPIO = GPIOB;
8
+const int MOTOR_PIN = LL_GPIO_PIN_8;
9
+
10
+TIM_TypeDef * ENCODER_TIMER = TIM3;
11
+GPIO_TypeDef * ENCODER_GPIO = GPIOA;
12
+const int ENCODER_PIN = LL_GPIO_PIN_5;
8 13
 
9 14
 void Sail_conf()
10 15
 {
11
-	ServoMotor_conf(SAIL_TIMER, SAIL_CHANNEL, SAIL_GPIO, SAIL_PIN);
16
+	ServoMotor_conf(MOTOR_TIMER, MOTOR_CHANNEL, MOTOR_GPIO, MOTOR_PIN);
17
+	IncrementalEncoder_conf(ENCODER_TIMER, ENCODER_GPIO, ENCODER_PIN);
12 18
 }
13 19
 
14 20
 void Sail_background()
@@ -24,5 +30,6 @@ void Sail_reset()
24 30
 
25 31
 void Sail_start()
26 32
 {
27
-	Timer_start(SAIL_TIMER);
33
+	Timer_start(MOTOR_TIMER);
34
+	Timer_start(ENCODER_TIMER);
28 35
 }

Loading…
Cancel
Save