Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-14 04:25:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Cleanup transmitter

Browse source
This commit is contained in:
Jonathan Swoboda 2024-11-12 14:06:31 -05:00
parent f296a6c991
commit e18a36e28e
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
esphome/components/remote_transmitter/__init__.py
View file

@ -31,10 +31,7 @@ CONFIG_SCHEMA = cv.Schema(
async def to_code(config):
pin = await cg.gpio_pin_expression(config[CONF_PIN])
if (rmt_channel := config.get(CONF_RMT_CHANNEL, None)) is not None:
var = cg.new_Pvariable(config[CONF_ID], pin, rmt_channel)
else:
var = cg.new_Pvariable(config[CONF_ID], pin)
var = cg.new_Pvariable(config[CONF_ID], pin)
await cg.register_component(var, config)
cg.add(var.set_carrier_duty_percent(config[CONF_CARRIER_DUTY_PERCENT]))

18
esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
View file

@ -30,8 +30,8 @@ void RemoteTransmitterComponent::dump_config() {
void RemoteTransmitterComponent::configure_rmt_() {
rmt_tx_channel_config_t config{};
config.clk_src = RMT_CLK_SRC_DEFAULT;
config.resolution_hz = 1 * 1000 * 1000, // 1 MHz resolution
config.gpio_num = gpio_num_t(this->pin_->get_pin());
config.resolution_hz = 1 * 1000 * 1000;
config.gpio_num = gpio_num_t(this->pin_->get_pin());
config.mem_block_symbols = 64 * this->mem_block_num_;
config.trans_queue_depth = 1;
@ -43,8 +43,8 @@ void RemoteTransmitterComponent::configure_rmt_() {
return;
}
rmt_copy_encoder_config_t asdf;
error = rmt_new_copy_encoder(&asdf, &this->encoder_);
rmt_copy_encoder_config_t encoder{};
error = rmt_new_copy_encoder(&encoder, &this->encoder_);
if (error != ESP_OK) {
this->error_code_ = error;
this->error_string_ = "in rmt_new_copy_encoder";
@ -53,8 +53,14 @@ void RemoteTransmitterComponent::configure_rmt_() {
}
rmt_carrier_config_t carrier{};
carrier.frequency_hz = 0;
carrier.duty_cycle = 100.0;
if (this->current_carrier_frequency_ == 0 || this->carrier_duty_percent_ == 100) {
carrier.frequency_hz = 0;
carrier.duty_cycle = 100.0f;
} else {
carrier.frequency_hz = this->current_carrier_frequency_;
carrier.duty_cycle = this->carrier_duty_percent_;
}
carrier.flags.polarity_active_low = this->inverted_;
error = rmt_apply_carrier(this->channel_, &carrier);
if (error != ESP_OK) {
this->error_code_ = error;