Merge branch 'bugfix/ledc_pwm_error' into 'master'

donghengqaz · donghengqaz · commit 4d67b793f21b · 2020-06-16T13:05:25.000+08:00
bugfix(ledc):fix pwm duty setting error

See merge request sdk/ESP8266_RTOS_SDK!1394
diff --git a/components/esp8266/driver/ledc.c b/components/esp8266/driver/ledc.c
@@ -203,7 +203,6 @@ esp_err_t ledc_fade_up(ledc_channel_t channel, uint8_t* flag)
             p_ledc_obj[channel]->duty_p += duty_value;
         }
         pwm_set_duty(channel, p_ledc_obj[channel]->duty_p);
-        pwm_start();
         i[channel]++;
         if (i[channel] == 100) {
             i[channel] = 0;
@@ -235,7 +234,6 @@ esp_err_t ledc_fade_down(ledc_channel_t channel, uint8_t* flag)
             p_ledc_obj[channel]->duty_p -= duty_value;
         }
         pwm_set_duty(channel, p_ledc_obj[channel]->duty_p);
-        pwm_start();
         i[channel]++;
         if (i[channel] == 100) {
             i[channel] = 0;
@@ -270,6 +268,7 @@ static void ledc_task(void* pvParameters)
                 }
             }
         }
+        pwm_start();
         xTaskResumeAll();
         vTaskDelay(LEDC_STEP_TIME / portTICK_PERIOD_MS);
     }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,6 @@ esp_err_t ledc_fade_up(ledc_channel_t channel, uint8_t* flag)`
`203`	`203`	`p_ledc_obj[channel]->duty_p += duty_value;`
`204`	`204`	`}`
`205`	`205`	`pwm_set_duty(channel, p_ledc_obj[channel]->duty_p);`
`206`		`- pwm_start();`
`207`	`206`	`i[channel]++;`
`208`	`207`	`if (i[channel] == 100) {`
`209`	`208`	`i[channel] = 0;`
`@@ -235,7 +234,6 @@ esp_err_t ledc_fade_down(ledc_channel_t channel, uint8_t* flag)`
`235`	`234`	`p_ledc_obj[channel]->duty_p -= duty_value;`
`236`	`235`	`}`
`237`	`236`	`pwm_set_duty(channel, p_ledc_obj[channel]->duty_p);`
`238`		`- pwm_start();`
`239`	`237`	`i[channel]++;`
`240`	`238`	`if (i[channel] == 100) {`
`241`	`239`	`i[channel] = 0;`
`@@ -270,6 +268,7 @@ static void ledc_task(void* pvParameters)`
`270`	`268`	`}`
`271`	`269`	`}`
`272`	`270`	`}`
	`271`	`+ pwm_start();`
`273`	`272`	`xTaskResumeAll();`
`274`	`273`	`vTaskDelay(LEDC_STEP_TIME / portTICK_PERIOD_MS);`
`275`	`274`	`}`