sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-20 20:08:20 +00:00
Code Issues Releases Wiki Activity

Add support for the DAC on the S2 (#8030)

Browse Source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Dániel Márai 2025-02-14 01:15:01 +01:00 committed by Jesse Hills
parent 92ad6286aa
commit 6999cc0581
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esphome/components/esp32_dac/esp32_dac.cpp
View File

@ -7,13 +7,16 @@
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
#include <esp32-hal-dac.h> #include <esp32-hal-dac.h>
#endif #endif
#ifdef USE_ESP_IDF
#include <driver/dac.h>
#endif
namespace esphome { namespace esphome {
namespace esp32_dac { namespace esp32_dac {
#ifdef USE_ESP32_VARIANT_ESP32S2
static constexpr uint8_t DAC0_PIN = 17;
#else
static constexpr uint8_t DAC0_PIN = 25;
#endif
static const char *const TAG = "esp32_dac"; static const char *const TAG = "esp32_dac";
void ESP32DAC::setup() { void ESP32DAC::setup() {
@ -22,8 +25,15 @@ void ESP32DAC::setup() {
this->turn_off(); this->turn_off();
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
auto channel = pin_->get_pin() == 25 ? DAC_CHANNEL_1 : DAC_CHANNEL_2; const dac_channel_t channel = this->pin_->get_pin() == DAC0_PIN ? DAC_CHAN_0 : DAC_CHAN_1;
dac_output_enable(channel); const dac_oneshot_config_t oneshot_cfg{channel};
dac_oneshot_new_channel(&oneshot_cfg, &this->dac_handle_);
#endif
}
void ESP32DAC::on_safe_shutdown() {
#ifdef USE_ESP_IDF
dac_oneshot_del_channel(this->dac_handle_);
#endif #endif
} }
@ -40,8 +50,7 @@ void ESP32DAC::write_state(float state) {
state = state * 255; state = state * 255;
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
auto channel = pin_->get_pin() == 25 ? DAC_CHANNEL_1 : DAC_CHANNEL_2; dac_oneshot_output_voltage(this->dac_handle_, state);
dac_output_voltage(channel, (uint8_t) state);
#endif #endif
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
dacWrite(this->pin_->get_pin(), state); dacWrite(this->pin_->get_pin(), state);

8
esphome/components/esp32_dac/esp32_dac.h
View File

@ -7,6 +7,10 @@
#ifdef USE_ESP32 #ifdef USE_ESP32
#ifdef USE_ESP_IDF
#include <driver/dac_oneshot.h>
#endif
namespace esphome { namespace esphome {
namespace esp32_dac { namespace esp32_dac {
@ -16,6 +20,7 @@ class ESP32DAC : public output::FloatOutput, public Component {
/// Initialize pin /// Initialize pin
void setup() override; void setup() override;
void on_safe_shutdown() override;
void dump_config() override; void dump_config() override;
/// HARDWARE setup_priority /// HARDWARE setup_priority
float get_setup_priority() const override { return setup_priority::HARDWARE; } float get_setup_priority() const override { return setup_priority::HARDWARE; }
@ -24,6 +29,9 @@ class ESP32DAC : public output::FloatOutput, public Component {
void write_state(float state) override; void write_state(float state) override;
InternalGPIOPin *pin_; InternalGPIOPin *pin_;
#ifdef USE_ESP_IDF
dac_oneshot_handle_t dac_handle_;
#endif
}; };
} // namespace esp32_dac } // namespace esp32_dac

20
esphome/components/esp32_dac/output.py
View File

@ -1,15 +1,27 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import pins from esphome import pins
from esphome.components import output from esphome.components import output
import esphome.config_validation as cv from esphome.components.esp32 import get_esp32_variant
import esphome.codegen as cg from esphome.components.esp32.const import VARIANT_ESP32, VARIANT_ESP32S2
from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN
DEPENDENCIES = ["esp32"] DEPENDENCIES = ["esp32"]
DAC_PINS = {
VARIANT_ESP32: (25, 26),
VARIANT_ESP32S2: (17, 18),
}
def valid_dac_pin(value): def valid_dac_pin(value):
num = value[CONF_NUMBER] variant = get_esp32_variant()
cv.one_of(25, 26)(num) try:
valid_pins = DAC_PINS[variant]
except KeyError as ex:
raise cv.Invalid(f"DAC is not supported on {variant}") from ex
given_pin = value[CONF_NUMBER]
cv.one_of(*valid_pins)(given_pin)
return value return value