Skip to content

Commit

Permalink
Merge branch 'contrib/github_pr_8139' into 'master'
Browse files Browse the repository at this point in the history
ledc.h - fix extern "C" to include ledc_cb_register() (GitHub PR)

Closes IDFGH-6484

See merge request espressif/esp-idf!16557
  • Loading branch information
suda-morris committed Dec 28, 2021
2 parents f79602c + d4de081 commit 5624dff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/driver/include/driver/ledc.h
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,6 @@ esp_err_t ledc_set_fade_time_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
* - ESP_FAIL Fade function init error
*/
esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t target_duty, uint32_t scale, uint32_t cycle_num, ledc_fade_mode_t fade_mode);
#ifdef __cplusplus
}
#endif

/**
* @brief LEDC callback registration function
Expand All @@ -493,3 +490,6 @@ esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
* - ESP_FAIL Fade function init error
*/
esp_err_t ledc_cb_register(ledc_mode_t speed_mode, ledc_channel_t channel, ledc_cbs_t *cbs, void *user_arg);
#ifdef __cplusplus
}
#endif

0 comments on commit 5624dff

Please sign in to comment.