|
33 | 33 | #include "pinmap.h"
|
34 | 34 | #include "error.h"
|
35 | 35 |
|
36 |
| -// Only TIM2 and TIM3 can be used (TIM1 and TIM4 are used by the us_ticker) |
37 | 36 | static const PinMap PinMap_PWM[] = {
|
38 |
| - // TIM2 default |
39 |
| - //{PA_2, PWM_2, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, // TIM2_CH3 - ARDUINO D1 |
40 |
| - //{PA_3, PWM_2, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, // TIM2_CH4 - ARDUINO D0 |
41 |
| - // TIM2 full remap |
42 |
| - {PB_3, PWM_2, STM_PIN_DATA(GPIO_Mode_AF_PP, 5)}, // TIM2fr_CH2 - ARDUINO D3 |
43 |
| - //{PB_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF_PP, 5)}, // TIM2fr_CH3 - ARDUINO D6 |
44 |
| - // TIM3 default |
45 |
| - //{PA_6, PWM_3, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, // TIM3_CH1 - ARDUINO D12 |
46 |
| - //{PA_7, PWM_3, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, // TIM3_CH2 - ARDUINO D11 |
47 |
| - // TIM3 full remap |
48 |
| - //{PC_7, PWM_3, STM_PIN_DATA(GPIO_Mode_AF_PP, 6)}, // TIM3fr_CH2 - ARDUINO D9 |
49 |
| - // TIM3 partial remap |
50 |
| - {PB_4, PWM_3, STM_PIN_DATA(GPIO_Mode_AF_PP, 7)}, // TIM3pr_CH1 - ARDUINO D5 |
| 37 | + {PB_3, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_TIM2)}, // TIM2_CH2 |
| 38 | + {PB_4, PWM_3, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_TIM3)}, // TIM3_CH1 |
| 39 | + //{PB_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_TIM2)}, // TIM2_CH3 |
| 40 | + //{PC_7, PWM_3, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_TIM3)}, // TIM3_CH2 |
51 | 41 | {NC, NC, 0}
|
52 | 42 | };
|
53 | 43 |
|
@@ -109,18 +99,6 @@ void pwmout_write(pwmout_t* obj, float value) {
|
109 | 99 | TIM_OC2PreloadConfig(tim, TIM_OCPreload_Enable);
|
110 | 100 | TIM_OC2Init(tim, &TIM_OCInitStructure);
|
111 | 101 | }
|
112 |
| - |
113 |
| - // Configure channel 3 |
114 |
| - //if (obj->pin == PB_10) { |
115 |
| - // TIM_OC3PreloadConfig(tim, TIM_OCPreload_Enable); |
116 |
| - // TIM_OC3Init(tim, &TIM_OCInitStructure); |
117 |
| - //} |
118 |
| - |
119 |
| - // Configure channel 4 |
120 |
| - //if (obj->pin == PA_3) { |
121 |
| - // TIM_OC4PreloadConfig(tim, TIM_OCPreload_Enable); |
122 |
| - // TIM_OC4Init(tim, &TIM_OCInitStructure); |
123 |
| - //} |
124 | 102 | }
|
125 | 103 |
|
126 | 104 | float pwmout_read(pwmout_t* obj) {
|
|
0 commit comments