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

bugfix(pwm): support fractional phase

Browse Source 
* Supports fractional phase, making the phase function produce higher precision waveforms.
* Enhanced stability
This commit is contained in:
xiongyu
2020-06-04 14:17:59 +08:00
parent ac10b42802
commit 72cbf0d55e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp8266/driver/ledc.c
View File

@ -51,7 +51,7 @@ typedef struct {
uint32_t step_01duty; // 0.1 of the duty value
uint32_t step_001duty; // 0.01 of the duty value
uint32_t gpio_num;//gpio pins
int16_t phase; //init phase
float phase; //init phase
int fade_time; // Time to duty by fade
} ledc_obj_t;
@ -277,7 +277,7 @@ static void ledc_task(void* pvParameters)
esp_err_t ledc_fade_func_install(int intr_alloc_flags)
{
int16_t ledc_phase[LEDC_CHANNEL_MAX] = {0};
float ledc_phase[LEDC_CHANNEL_MAX] = {0};
uint32_t ledc_duty[LEDC_CHANNEL_MAX] = {0};
uint32_t ledc_gpio_num[LEDC_CHANNEL_MAX] = {0};

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

@ -59,7 +59,7 @@ static const char *TAG = "pwm";
typedef struct {
uint32_t duty; /*!< pwm duty for each channel */
int16_t phase; /*!< pwm phase for each channel */
float phase; /*!< pwm phase for each channel */
uint8_t io_num; /*!< pwm io_num for each channel */
} pwm_info_t;
@ -113,13 +113,13 @@ static void pwm_phase_init(void)
for (i = 0; i < pwm_obj->channel_num; i++) {
if (-180 < pwm_obj->pwm_info[i].phase && pwm_obj->pwm_info[i].phase < 0) {
time_delay = 0 - ((0 - pwm_obj->pwm_info[i].phase) * pwm_obj->depth / 360);
time_delay = (int32_t)(0 - ((0 - pwm_obj->pwm_info[i].phase) * pwm_obj->depth / 360.0));
} else if (pwm_obj->pwm_info[i].phase == 0) {
continue;
} else if (180 > pwm_obj->pwm_info[i].phase && pwm_obj->pwm_info[i].phase > 0) {
time_delay = pwm_obj->pwm_info[i].phase * pwm_obj->depth / 360;
} else if (180 >= pwm_obj->pwm_info[i].phase && pwm_obj->pwm_info[i].phase > 0) {
time_delay = (int32_t)(pwm_obj->pwm_info[i].phase * pwm_obj->depth / 360.0);
} else {
ESP_LOGE(TAG, "channel[%d] phase error %d, valid ramge from (-180,180)\n", i, pwm_obj->pwm_info[i].phase);
ESP_LOGE(TAG, "channel[%d] phase error %f, valid ramge from (-180,180]\n", i, pwm_obj->pwm_info[i].phase);
continue;
}
@ -224,7 +224,7 @@ esp_err_t pwm_set_period_duties(uint32_t period, uint32_t *duties)
return ESP_OK;
}
esp_err_t pwm_set_phase(uint8_t channel_num, int16_t phase)
esp_err_t pwm_set_phase(uint8_t channel_num, float phase)
{
PWM_CHECK(channel_num < pwm_obj->channel_num, "Channel num error", ESP_ERR_INVALID_ARG);
@ -233,7 +233,7 @@ esp_err_t pwm_set_phase(uint8_t channel_num, int16_t phase)
return ESP_OK;
}
esp_err_t pwm_set_phases(int16_t *phases)
esp_err_t pwm_set_phases(float *phases)
{
uint8_t i;
PWM_CHECK(NULL != phases, "Pointer is empty", ESP_ERR_INVALID_ARG);
@ -246,7 +246,7 @@ esp_err_t pwm_set_phases(int16_t *phases)
return ESP_OK;
}
esp_err_t pwm_get_phase(uint8_t channel_num, uint16_t *phase_p)
esp_err_t pwm_get_phase(uint8_t channel_num, float *phase_p)
{
PWM_CHECK(channel_num < pwm_obj->channel_num, "Channel num error", ESP_ERR_INVALID_ARG);
PWM_CHECK(NULL != phase_p, "Pointer is empty", ESP_ERR_INVALID_ARG);
@ -310,6 +310,7 @@ static void IRAM_ATTR pwm_timer_intr_handler(void)
pwm_obj->this_target = AHEAD_TICKS1 + AHEAD_TICKS3;
}
REG_WRITE(WDEVTSF0TIMER_ENA, 0);
REG_WRITE(WDEVTSFSW0_LO, 0);
//WARNING, pwm_obj->this_target - AHEAD_TICKS1 should be bigger than 2
REG_WRITE(WDEVTSF0_TIMER_LO, pwm_obj->this_target - AHEAD_TICKS1);

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

@ -145,13 +145,13 @@ esp_err_t pwm_set_duties(uint32_t *duties);
*
* @param channel_num PWM channel number
* the channel_num cannot exceed the value initialized by pwm_init.
* @param phase The phase of this PWM channel, the phase range is (-180 ~ 180).
* @param phase The phase of this PWM channel, the phase range is (-180 ~ 180].
*
* @return
* - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error
*/
esp_err_t pwm_set_phase(uint8_t channel_num, int16_t phase);
esp_err_t pwm_set_phase(uint8_t channel_num, float phase);
/**
* @brief Set the phase of all channels.
@ -164,7 +164,7 @@ esp_err_t pwm_set_phase(uint8_t channel_num, int16_t phase);
* - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error
*/
esp_err_t pwm_set_phases(int16_t *phases);
esp_err_t pwm_set_phases(float *phases);
/**
* @brief Get the phase of a PWM channel.
@ -177,7 +177,7 @@ esp_err_t pwm_set_phases(int16_t *phases);
* - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error
*/
esp_err_t pwm_get_phase(uint8_t channel_num, uint16_t *phase_p);
esp_err_t pwm_get_phase(uint8_t channel_num, float *phase_p);
/**
* @brief Set PWM period and duty of each PWM channel.

5
examples/peripherals/pwm/main/pwm_example_main.c
View File

@ -49,14 +49,13 @@ uint32_t duties[4] = {
};
// phase table, delay = (phase[x]/360)*PERIOD
int16_t phase[4] = {
0, 0, 90, -90,
float phase[4] = {
0, 0, 90.0, -90.0,
};
void app_main()
{
pwm_init(PWM_PERIOD, duties, 4, pin_num);
pwm_set_channel_invert(0x1 << 0);
pwm_set_phases(phase);
pwm_start();
int16_t count = 0;