esp32/DAC: Use SOC_DAC_SUPPORTED.

esp32/DAC: Use SOC_DAC_SUPPORTED as MICROPY_PY_MACHINE_DAC. Signed-off-by: IhorNehrutsa <[email protected]>
IhorNehrutsa · Nov 23, 2023 · 68771b3 · 68771b3
1 parent 305b2be
commit 68771b3
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 21 deletions.
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -4,8 +4,6 @@
 // Network config
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nano-esp32"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (12)
 #define MICROPY_HW_I2C0_SDA                 (11)
 

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -4,7 +4,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32C3"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
 
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.

diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
@@ -4,8 +4,6 @@
 #endif
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.
 #define MICROPY_HW_ENABLE_UART_REPL         (1)
 

diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-c3-mini"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (10)

diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "FeatherS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 

diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.h b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "NanoS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 

diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.h b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "ProS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 

diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 

diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-PICO-1-N8R2"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyWATCHS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 

diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
@@ -32,7 +32,6 @@
 #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)
@@ -135,7 +134,4 @@ 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
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -118,7 +118,7 @@
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #ifndef MICROPY_PY_MACHINE_DAC
-#define MICROPY_PY_MACHINE_DAC              (1)
+#define MICROPY_PY_MACHINE_DAC              (SOC_DAC_SUPPORTED)
 #endif
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (1)