Skip to content

Commit 8de553f

Browse files
author
宋志硕
committed
fix: ADC and PWM are not available
1 parent 82311e0 commit 8de553f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

cores/w806/Arduino.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ void yield(void);
5959
#define ANALOG_INPUT 0x5
6060
#define PWM_OUT 0x6
6161

62+
#define PIN_IDLE 0xff
63+
6264
// undefine mathlib's pi if encountered
6365
#ifdef PI
6466
#undef PI

cores/w806/wiring_analog.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
207207
__HAL_AFIO_REMAP_ADC(GPIOA, GPIO_PIN_2);
208208
}
209209
#if (ADC_MODE == ADC_IT)
210-
// 如果用到中断方式需要使能中�
210+
// 如果用到中断方式需要使能中断
211211
HAL_NVIC_SetPriority(ADC_IRQn, 0);
212212
HAL_NVIC_EnableIRQ(ADC_IRQn);
213213
#endif
@@ -224,7 +224,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
224224
{
225225
if (g_pinStatus[adcPinState[i].pin] == ANALOG_INPUT)
226226
{
227-
g_pinStatus[adcPinState[i].pin] = PIN_ATTR_NONE;
227+
g_pinStatus[adcPinState[i].pin] = PIN_IDLE;
228228
HAL_GPIO_DeInit(GPIOA, adcPinState[i].pin);
229229
break;
230230
}
@@ -288,7 +288,7 @@ void HAL_PWM_MspInit(PWM_HandleTypeDef *hpwm)
288288
{
289289
if (hpwm->Channel == pwmPinState[i].hpwm.Channel)
290290
{
291-
if (g_pinStatus[pwmPinState[i].pin] == PIN_ATTR_PWM)
291+
if (g_pinStatus[pwmPinState[i].pin] == PWM_OUT)
292292
{
293293
if (hpwm->Channel == PWM_CH0)
294294
{
@@ -322,9 +322,9 @@ void HAL_PWM_MspDeInit(PWM_HandleTypeDef *hpwm)
322322
{
323323
if (hpwm->Channel == pwmPinState[i].hpwm.Channel) /*find channel num 0-4*/
324324
{
325-
if (g_pinStatus[pwmPinState[i].pin] == PIN_ATTR_PWM)
325+
if (g_pinStatus[pwmPinState[i].pin] == PWM_OUT)
326326
{
327-
g_pinStatus[pwmPinState[i].pin] = PIN_ATTR_NONE;
327+
g_pinStatus[pwmPinState[i].pin] = PIN_IDLE;
328328

329329
__HAL_RCC_PWM_CLK_DISABLE();
330330
HAL_GPIO_DeInit(g_APinDescription[pwmPinState[i].pin].pPort, g_APinDescription[pwmPinState[i].pin].ulPin);

0 commit comments

Comments
 (0)