Nikita Ivanykov
/
LAB_Servo
8
Diff: main.cpp
- Revision:
- 1:349234492517
- Parent:
- 0:e0dc7a04fc82
- Child:
- 2:f7adf14d2ef6
--- a/main.cpp Sun Oct 29 09:29:25 2017 +0000 +++ b/main.cpp Mon Oct 30 11:05:17 2017 +0000 @@ -14,7 +14,7 @@ __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_TIM2_CLK_ENABLE(); gpio.Mode = GPIO_MODE_AF_PP; - gpio.Pin = GPIO_PIN_1; + gpio.Pin = GPIO_PIN_1 | GPIO_PIN_0; gpio.Pull = GPIO_PULLUP; gpio.Speed = GPIO_SPEED_HIGH; gpio.Alternate = GPIO_AF2_TIM2; @@ -36,6 +36,9 @@ octim.OCFastMode = TIM_OCFAST_ENABLE; octim.Pulse = pulse; + HAL_TIM_PWM_ConfigChannel(&timer, &octim, TIM_CHANNEL_1); + HAL_TIM_PWM_Start(&timer, TIM_CHANNEL_1); + HAL_TIM_PWM_ConfigChannel(&timer, &octim, TIM_CHANNEL_2); HAL_TIM_PWM_Start(&timer, TIM_CHANNEL_2); } @@ -51,7 +54,7 @@ while(1) { led = !led; - wait(0.1f); + wait(0.05f); if (dir) { pulse -= 100; count--; @@ -66,6 +69,10 @@ } } octim.Pulse = pulse; + + HAL_TIM_PWM_ConfigChannel(&timer, &octim, TIM_CHANNEL_1); + HAL_TIM_PWM_Start(&timer, TIM_CHANNEL_1); + HAL_TIM_PWM_ConfigChannel(&timer, &octim, TIM_CHANNEL_2); HAL_TIM_PWM_Start(&timer, TIM_CHANNEL_2); }