jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-29 06:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ledc] Various optimizations/clean-up (#8922)

Browse Source
This commit is contained in:
Keith Burzinski 2025-05-28 05:50:48 -05:00 committed by GitHub
parent 18a1d31845
commit ca6295d1bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
esphome/components/ledc/ledc_output.cpp
View File

@ -46,11 +46,13 @@ inline ledc_mode_t get_speed_mode(uint8_t) { return LEDC_LOW_SPEED_MODE; }
#endif #endif
#endif #endif
float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return CLOCK_FREQUENCY / float(1 << bit_depth); } float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) {
return static_cast<float>(CLOCK_FREQUENCY) / static_cast<float>(1 << bit_depth);
}
float ledc_min_frequency_for_bit_depth(uint8_t bit_depth, bool low_frequency) { float ledc_min_frequency_for_bit_depth(uint8_t bit_depth, bool low_frequency) {
const float max_div_num = ((1 << MAX_RES_BITS) - 1) / (low_frequency ? 32.0f : 256.0f); const float max_div_num = ((1 << MAX_RES_BITS) - 1) / (low_frequency ? 32.0f : 256.0f);
return CLOCK_FREQUENCY / (max_div_num * float(1 << bit_depth)); return static_cast<float>(CLOCK_FREQUENCY) / (max_div_num * static_cast<float>(1 << bit_depth));
} }
optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) { optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
@ -100,13 +102,13 @@ esp_err_t configure_timer_frequency(ledc_mode_t speed_mode, ledc_timer_t timer_n
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
constexpr int ledc_angle_to_htop(float angle, uint8_t bit_depth) { constexpr int ledc_angle_to_htop(float angle, uint8_t bit_depth) {
return static_cast<int>(angle * ((1U << bit_depth) - 1) / 360.); return static_cast<int>(angle * ((1U << bit_depth) - 1) / 360.0f);
} }
#endif // USE_ESP_IDF #endif // USE_ESP_IDF
void LEDCOutput::write_state(float state) { void LEDCOutput::write_state(float state) {
if (!initialized_) { if (!this->initialized_) {
ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!"); ESP_LOGW(TAG, "Not yet initialized");
return; return;
} }
@ -122,8 +124,8 @@ void LEDCOutput::write_state(float state) {
ledcWrite(this->channel_, duty); ledcWrite(this->channel_, duty);
#endif #endif
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
auto speed_mode = get_speed_mode(channel_); auto speed_mode = get_speed_mode(this->channel_);
auto chan_num = static_cast<ledc_channel_t>(channel_ % 8); auto chan_num = static_cast<ledc_channel_t>(this->channel_ % 8);
int hpoint = ledc_angle_to_htop(this->phase_angle_, this->bit_depth_); int hpoint = ledc_angle_to_htop(this->phase_angle_, this->bit_depth_);
if (duty == max_duty) { if (duty == max_duty) {
ledc_stop(speed_mode, chan_num, 1); ledc_stop(speed_mode, chan_num, 1);
@ -145,9 +147,9 @@ void LEDCOutput::setup() {
ledcAttachPin(this->pin_->get_pin(), this->channel_); ledcAttachPin(this->pin_->get_pin(), this->channel_);
#endif #endif
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
auto speed_mode = get_speed_mode(channel_); auto speed_mode = get_speed_mode(this->channel_);
auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2); auto timer_num = static_cast<ledc_timer_t>((this->channel_ % 8) / 2);
auto chan_num = static_cast<ledc_channel_t>(channel_ % 8); auto chan_num = static_cast<ledc_channel_t>(this->channel_ % 8);
esp_err_t timer_init_result = esp_err_t timer_init_result =
configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_); configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);
@ -163,23 +165,23 @@ void LEDCOutput::setup() {
ESP_LOGV(TAG, "Angle of %.1f° results in hpoint %u", this->phase_angle_, hpoint); ESP_LOGV(TAG, "Angle of %.1f° results in hpoint %u", this->phase_angle_, hpoint);
ledc_channel_config_t chan_conf{}; ledc_channel_config_t chan_conf{};
chan_conf.gpio_num = pin_->get_pin(); chan_conf.gpio_num = this->pin_->get_pin();
chan_conf.speed_mode = speed_mode; chan_conf.speed_mode = speed_mode;
chan_conf.channel = chan_num; chan_conf.channel = chan_num;
chan_conf.intr_type = LEDC_INTR_DISABLE; chan_conf.intr_type = LEDC_INTR_DISABLE;
chan_conf.timer_sel = timer_num; chan_conf.timer_sel = timer_num;
chan_conf.duty = inverted_ == pin_->is_inverted() ? 0 : (1U << bit_depth_); chan_conf.duty = this->inverted_ == this->pin_->is_inverted() ? 0 : (1U << this->bit_depth_);
chan_conf.hpoint = hpoint; chan_conf.hpoint = hpoint;
ledc_channel_config(&chan_conf); ledc_channel_config(&chan_conf);
initialized_ = true; this->initialized_ = true;
this->status_clear_error(); this->status_clear_error();
#endif #endif
} }
void LEDCOutput::dump_config() { void LEDCOutput::dump_config() {
ESP_LOGCONFIG(TAG, "LEDC Output:"); ESP_LOGCONFIG(TAG, "Output:");
LOG_PIN(" Pin ", this->pin_); LOG_PIN(" Pin ", this->pin_);
ESP_LOGCONFIG(TAG, " LEDC Channel: %u", this->channel_); ESP_LOGCONFIG(TAG, " Channel: %u", this->channel_);
ESP_LOGCONFIG(TAG, " PWM Frequency: %.1f Hz", this->frequency_); ESP_LOGCONFIG(TAG, " PWM Frequency: %.1f Hz", this->frequency_);
ESP_LOGCONFIG(TAG, " Phase angle: %.1f°", this->phase_angle_); ESP_LOGCONFIG(TAG, " Phase angle: %.1f°", this->phase_angle_);
ESP_LOGCONFIG(TAG, " Bit depth: %u", this->bit_depth_); ESP_LOGCONFIG(TAG, " Bit depth: %u", this->bit_depth_);
@ -211,11 +213,11 @@ void LEDCOutput::update_frequency(float frequency) {
// Configure LEDC channel, frequency and bit depth with fallback // Configure LEDC channel, frequency and bit depth with fallback
int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX; int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX;
while (attempt_count_max > 0 && configured_frequency == 0) { while (attempt_count_max > 0 && configured_frequency == 0) {
ESP_LOGV(TAG, "Trying initialize channel %u with frequency %.1f and bit depth of %u...", this->channel_, ESP_LOGV(TAG, "Initializing channel %u with frequency %.1f and bit depth of %u...", this->channel_,
this->frequency_, this->bit_depth_); this->frequency_, this->bit_depth_);
configured_frequency = ledcSetup(this->channel_, frequency, this->bit_depth_); configured_frequency = ledcSetup(this->channel_, frequency, this->bit_depth_);
if (configured_frequency != 0) { if (configured_frequency != 0) {
initialized_ = true; this->initialized_ = true;
this->status_clear_error(); this->status_clear_error();
ESP_LOGV(TAG, "Configured frequency: %u with bit depth: %u", configured_frequency, this->bit_depth_); ESP_LOGV(TAG, "Configured frequency: %u with bit depth: %u", configured_frequency, this->bit_depth_);
} else { } else {
@ -236,14 +238,14 @@ void LEDCOutput::update_frequency(float frequency) {
#endif // USE_ARDUINO #endif // USE_ARDUINO
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
if (!initialized_) { if (!this->initialized_) {
ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!"); ESP_LOGW(TAG, "Not yet initialized");
return; return;
} }
auto speed_mode = get_speed_mode(channel_); auto speed_mode = get_speed_mode(this->channel_);
auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2); auto timer_num = static_cast<ledc_timer_t>((this->channel_ % 8) / 2);
auto chan_num = static_cast<ledc_channel_t>(channel_ % 8); auto chan_num = static_cast<ledc_channel_t>(this->channel_ % 8);
esp_err_t timer_init_result = esp_err_t timer_init_result =
configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_); configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);