Update DAC driver to use the new ESP-IDF driver API

Author: me-no-dev

cores/esp32/esp32-hal-dac.c

@@ -1,49 +1,77 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-#include "esp32-hal.h"
-#include "soc/soc_caps.h"
+#include "esp32-hal-dac.h"
 
-#ifndef SOC_DAC_SUPPORTED           
-#define NODAC
-#else
+#if SOC_DAC_SUPPORTED
+#include "esp32-hal.h"
+#include "esp32-hal-periman.h"
 #include "soc/dac_channel.h"
-#include "driver/dac.h"
+#include "driver/dac_oneshot.h"
+
+static bool dacDetachBus(void * bus){
+    esp_err_t err = dac_oneshot_del_channel((dac_oneshot_handle_t)bus);
+    if(err != ESP_OK){
+        log_e("dac_oneshot_del_channel failed with error: %d", err);
+        return false;
+    }
+    return true;
+}
 
-void ARDUINO_ISR_ATTR __dacWrite(uint8_t pin, uint8_t value)
+bool __dacWrite(uint8_t pin, uint8_t value)
 {
-    if(pin < DAC_CHANNEL_1_GPIO_NUM || pin > DAC_CHANNEL_2_GPIO_NUM){
-        return;//not dac pin
+    esp_err_t err = ESP_OK;
+    if(pin != DAC_CHAN0_GPIO_NUM && pin != DAC_CHAN1_GPIO_NUM){
+        log_e("pin %u is not a DAC pin", pin);
+        return false;//not dac pin
     }
 
-    uint8_t channel = pin - DAC_CHANNEL_1_GPIO_NUM;
-    dac_output_enable(channel);
-    dac_output_voltage(channel, value);
+    dac_oneshot_handle_t bus = (dac_oneshot_handle_t)perimanGetPinBus(pin, ESP32_BUS_TYPE_DAC_ONESHOT);
+    if(bus == NULL){
+        perimanSetBusDeinit(ESP32_BUS_TYPE_DAC_ONESHOT, dacDetachBus);
+        dac_channel_t channel = (pin == DAC_CHAN0_GPIO_NUM)?DAC_CHAN_0:DAC_CHAN_1;
+        dac_oneshot_config_t config = {
+            .chan_id = channel
+        };
+        err = dac_oneshot_new_channel(&config, &bus);
+        if(err != ESP_OK){
+            log_e("dac_oneshot_new_channel failed with error: %d", err);
+            return false;
+        }
+        if(!perimanSetPinBus(pin, ESP32_BUS_TYPE_DAC_ONESHOT, (void *)bus)){
+            dacDetachBus((void *)bus);
+            return false;
+        }
+    }
 
+    err = dac_oneshot_output_voltage(bus, value);
+    if(err != ESP_OK){
+        log_e("dac_oneshot_output_voltage failed with error: %d", err);
+        return false;
+    }
+    return true;
 }
 
-void ARDUINO_ISR_ATTR __dacDisable(uint8_t pin)
+bool __dacDisable(uint8_t pin)
 {
-    if(pin < DAC_CHANNEL_1_GPIO_NUM || pin > DAC_CHANNEL_2_GPIO_NUM){
-        return;//not dac pin
+    if(pin != DAC_CHAN0_GPIO_NUM && pin != DAC_CHAN1_GPIO_NUM){
+        log_e("pin %u is not a DAC pin", pin);
+        return false;//not dac pin
     }
-
-    uint8_t channel = pin - DAC_CHANNEL_1_GPIO_NUM;
-    dac_output_disable(channel);
+    void * bus = perimanGetPinBus(pin, ESP32_BUS_TYPE_DAC_ONESHOT);
+    if(bus != NULL){
+        // will call dacDetachBus
+        return perimanSetPinBus(pin, ESP32_BUS_TYPE_INIT, NULL);
+    } else {
+        log_e("pin %u is not attached to DAC", pin);
+    }
+    return false;
 }
 
-extern void dacWrite(uint8_t pin, uint8_t value) __attribute__ ((weak, alias("__dacWrite")));
-extern void dacDisable(uint8_t pin) __attribute__ ((weak, alias("__dacDisable")));
+extern bool dacWrite(uint8_t pin, uint8_t value) __attribute__ ((weak, alias("__dacWrite")));
+extern bool dacDisable(uint8_t pin) __attribute__ ((weak, alias("__dacDisable")));
 
 #endif

cores/esp32/esp32-hal-dac.h

@@ -1,37 +1,26 @@
 /*
- Arduino.h - Main include file for the Arduino SDK
- Copyright (c) 2005-2013 Arduino Team.  All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef MAIN_ESP32_HAL_DAC_H_
-#define MAIN_ESP32_HAL_DAC_H_
+#pragma once
+
+#include "soc/soc_caps.h"
+#if SOC_DAC_SUPPORTED
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "esp32-hal.h"
-#include "driver/gpio.h"
+#include <stdint.h>
+#include <stdbool.h>
 
-void dacWrite(uint8_t pin, uint8_t value);
-void dacDisable(uint8_t pin);
+bool dacWrite(uint8_t pin, uint8_t value);
+bool dacDisable(uint8_t pin);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* MAIN_ESP32_HAL_DAC_H_ */
+#endif /* SOC_DAC_SUPPORTED */

cores/esp32/esp32-hal-sigmadelta.c

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "esp32-hal.h"
-#include "esp32-hal-periman.h"
+#include "esp32-hal-sigmadelta.h"
 
 #if SOC_SDM_SUPPORTED
+#include "esp32-hal.h"
+#include "esp32-hal-periman.h"
 #include "driver/sdm.h"
 
 static bool sigmaDeltaDetachBus(void * bus){
@@ -82,7 +83,7 @@ bool sigmaDeltaDetach(uint8_t pin)
         // will call sigmaDeltaDetachBus
         return perimanSetPinBus(pin, ESP32_BUS_TYPE_INIT, NULL);
     } else {
-        log_e("pin %u is not attached to SigmaDelta");
+        log_e("pin %u is not attached to SigmaDelta", pin);
     }
     return false;
 }

cores/esp32/esp32-hal-sigmadelta.h

@@ -6,13 +6,13 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+#if SOC_SDM_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "soc/soc_caps.h"
-#if SOC_SDM_SUPPORTED
-
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -21,7 +21,8 @@ bool    sigmaDeltaAttach(uint8_t pin, uint32_t freq);
 bool    sigmaDeltaWrite(uint8_t pin, uint8_t duty);
 bool    sigmaDeltaDetach(uint8_t pin);
 
-#endif
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* SOC_SDM_SUPPORTED */