feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Implement DAC based on ESP-IDF API (#5959)

Browse Source 
This PR is refactoring of DAC HAL in order to use IDF instead of current Register manipulation approach.

Edited dacWrite() to use ESP-IDF api.
Added dacDisable() so there is an option to disable dac channel.

Co-authored-by: Me No Dev <me-no-dev@users.noreply.github.com>
This commit is contained in:
P-R-O-C-H-Y
2021-12-14 20:10:30 +01:00
committed by GitHub
parent 40a5c1e461
commit 39b9e1e533
2 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
cores/esp32/esp32-hal-dac.c
View File

@ -13,51 +13,37 @@
// limitations under the License. // limitations under the License.
#include "esp32-hal.h" #include "esp32-hal.h"
#include "soc/soc_caps.h"
#if CONFIG_IDF_TARGET_ESP32 #ifndef SOC_DAC_SUPPORTED
#include "soc/rtc_io_reg.h"
#define DAC1 25
#define DAC2 26
#elif CONFIG_IDF_TARGET_ESP32S2
#include "soc/rtc_io_reg.h"
#define DAC1 17
#define DAC2 18
#elif CONFIG_IDF_TARGET_ESP32C3
#define NODAC #define NODAC
#else #else
#error Target CONFIG_IDF_TARGET is not supported #include "soc/dac_channel.h"
#endif #include "driver/dac_common.h"
#ifndef NODAC
#include "esp_attr.h"
#include "soc/rtc_cntl_reg.h"
#include "soc/rtc_io_periph.h"
#include "soc/sens_reg.h"
#include "soc/sens_struct.h"
#include "driver/dac.h"
void ARDUINO_ISR_ATTR __dacWrite(uint8_t pin, uint8_t value) void ARDUINO_ISR_ATTR __dacWrite(uint8_t pin, uint8_t value)
{ {
if(pin < DAC1 || pin > DAC2){ if(pin < DAC_CHANNEL_1_GPIO_NUM || pin > DAC_CHANNEL_2_GPIO_NUM){
return;//not dac pin return;//not dac pin
} }
pinMode(pin, ANALOG);
uint8_t channel = pin - DAC1; uint8_t channel = pin - DAC_CHANNEL_1_GPIO_NUM;
#if CONFIG_IDF_TARGET_ESP32 dac_output_enable(channel);
CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_SW_TONE_EN); dac_output_voltage(channel, value);
#elif CONFIG_IDF_TARGET_ESP32S2
SENS.sar_dac_ctrl1.dac_clkgate_en = 1;
#endif
RTCIO.pad_dac[channel].dac_xpd_force = 1;
RTCIO.pad_dac[channel].xpd_dac = 1;
if (channel == 0) {
SENS.sar_dac_ctrl2.dac_cw_en1 = 0;
} else if (channel == 1) {
SENS.sar_dac_ctrl2.dac_cw_en2 = 0;
} }
RTCIO.pad_dac[channel].dac = value;
void ARDUINO_ISR_ATTR __dacDisable(uint8_t pin)
{
if(pin < DAC_CHANNEL_1_GPIO_NUM || pin > DAC_CHANNEL_2_GPIO_NUM){
return;//not dac pin
}
uint8_t channel = pin - DAC_CHANNEL_1_GPIO_NUM;
dac_output_disable(channel);
} }
extern void dacWrite(uint8_t pin, uint8_t value) __attribute__ ((weak, alias("__dacWrite"))); extern void dacWrite(uint8_t pin, uint8_t value) __attribute__ ((weak, alias("__dacWrite")));
extern void dacDisable(uint8_t pin) __attribute__ ((weak, alias("__dacDisable")));
#endif #endif

1
cores/esp32/esp32-hal-dac.h
View File

@ -28,6 +28,7 @@ extern "C" {
#include "driver/gpio.h" #include "driver/gpio.h"
void dacWrite(uint8_t pin, uint8_t value); void dacWrite(uint8_t pin, uint8_t value);
void dacDisable(uint8_t pin);
#ifdef __cplusplus #ifdef __cplusplus
} }