espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-02 02:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/small_typo' into 'master'

Browse Source 
fix: fix small typo in pwm

See merge request sdk/ESP8266_RTOS_SDK!666
This commit is contained in:
Wu Jian Gang
2018-12-21 08:50:16 +08:00
parent b05de84bbf 7f14c1ea4d
commit 7fe529e2c3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp8266/driver/pwm.c
View File

@ -537,12 +537,12 @@ static esp_err_t pwm_obj_malloc(uint32_t channel_num)
return ESP_OK;
}
esp_err_t pwm_init(uint32_t period, uint32_t *duties, uint32_t channel_num, const uint32_t *pin_mum)
esp_err_t pwm_init(uint32_t period, uint32_t *duties, uint32_t channel_num, const uint32_t *pin_num)
{
PWM_CHECK(pwm_obj == NULL, "pwm has been initialized", ESP_FAIL);
PWM_CHECK(channel_num <= MAX_PWM_CHANNEL, "Channel num out of range", ESP_ERR_INVALID_ARG);
PWM_CHECK(NULL != duties, "duties pointer is empty", ESP_ERR_INVALID_ARG);
PWM_CHECK(NULL != pin_mum, "Pointer is empty", ESP_ERR_INVALID_ARG);
PWM_CHECK(NULL != pin_num, "Pointer is empty", ESP_ERR_INVALID_ARG);
PWM_CHECK(period >= 10, "period setting is too short", ESP_ERR_INVALID_ARG);
uint8_t i;
@ -556,8 +556,8 @@ esp_err_t pwm_init(uint32_t period, uint32_t *duties, uint32_t channel_num, cons
pwm_obj->channel_num = channel_num;
for (i = 0; i < channel_num; i++) {
pwm_obj->pwm_info[i].io_num = pin_mum[i];
pwm_obj->gpio_bit_mask |= (0x1 << pin_mum[i]);
pwm_obj->pwm_info[i].io_num = pin_num[i];
pwm_obj->gpio_bit_mask |= (0x1 << pin_num[i]);
}
gpio_config_t io_conf;
io_conf.intr_type = GPIO_INTR_DISABLE;
@ -608,4 +608,4 @@ esp_err_t pwm_deinit(void)
pwm_obj_free();
return ESP_OK;
}
}

6
components/esp8266/include/driver/pwm.h
View File

@ -28,14 +28,14 @@ extern "C" {
* e.g. For 1KHz PWM, period is 1000 us. Do not set the period below 20us.
* @param duties duty cycle of each channels.
* @param pwm_channel_num PWM channel number, maximum is 8
* @param pin_mum GPIO number of PWM channel
* @param pin_num GPIO number of PWM channel
*
* @return
* - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error
* - ESP_FAIL Init error
*/
esp_err_t pwm_init(uint32_t period, uint32_t *duties, uint32_t pwm_channel_num, const uint32_t *pin_mum);
esp_err_t pwm_init(uint32_t period, uint32_t *duties, uint32_t pwm_channel_num, const uint32_t *pin_num);
/**
* @brief PWM function uninstall
@ -224,4 +224,4 @@ esp_err_t pwm_clear_channel_invert(uint16_t channel_mask);
#ifdef __cplusplus
}
#endif
#endif