From eae6848b42999b434c72534a6bf96aea1c1a5cdf Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Sun, 12 Nov 2023 20:46:26 +0200
Subject: [PATCH] esp32/DAC: Support one-shot mode of driver.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_dac.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 0e85dc9c9bfb2..978a1825e8e16 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -32,23 +32,33 @@
 #include "modmachine.h"
 
 #if MICROPY_PY_MACHINE_DAC
+#if SOC_DAC_SUPPORTED
 
 #include "driver/gpio.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+#include "driver/dac_oneshot.h"
+#else
 #include "driver/dac.h"
+#define DAC_CHAN_0 DAC_CHANNEL_1
+#define DAC_CHAN_1 DAC_CHANNEL_2
+#endif
 
 typedef struct _mdac_obj_t {
     mp_obj_base_t base;
     gpio_num_t gpio_id;
     dac_channel_t dac_id;
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    dac_oneshot_handle_t dac_oneshot_handle;
+    #endif
 } mdac_obj_t;
 
-STATIC const mdac_obj_t mdac_obj[] = {
+STATIC mdac_obj_t mdac_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32
-    {{&machine_dac_type}, GPIO_NUM_25, DAC_CHANNEL_1},
-    {{&machine_dac_type}, GPIO_NUM_26, DAC_CHANNEL_2},
+    {{&machine_dac_type}, GPIO_NUM_25, DAC_CHAN_0},
+    {{&machine_dac_type}, GPIO_NUM_26, DAC_CHAN_1},
     #else
-    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHANNEL_1},
-    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHANNEL_2},
+    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHAN_0},
+    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHAN_1},
     #endif
 };
 
@@ -68,6 +78,12 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
     }
 
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    dac_oneshot_config_t dac_oneshot_config = {.chan_id = self->dac_id};
+    check_esp_err(dac_oneshot_new_channel(&dac_oneshot_config, (dac_oneshot_handle_t *)&self->dac_oneshot_handle));
+    check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, 0));
+    return MP_OBJ_FROM_PTR(self);
+    #else
     esp_err_t err = dac_output_enable(self->dac_id);
     if (err == ESP_OK) {
         err = dac_output_voltage(self->dac_id, 0);
@@ -76,6 +92,7 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         return MP_OBJ_FROM_PTR(self);
     }
     mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+    #endif
 }
 
 STATIC void mdac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -90,11 +107,16 @@ STATIC mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("value out of range"));
     }
 
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, value));
+    return mp_const_none;
+    #else
     esp_err_t err = dac_output_voltage(self->dac_id, value);
     if (err == ESP_OK) {
         return mp_const_none;
     }
     mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mdac_write_obj, mdac_write);
 
@@ -113,4 +135,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mdac_locals_dict
     );
 
+#else
+#error DAC is not supported!
+#endif // SOC_DAC_SUPPORTED
 #endif // MICROPY_PY_MACHINE_DAC