Update IDF to 1e0710f

Author: me-no-dev

tools/sdk/bin/bootloader.bin

@@ -9,7 +9,6 @@
 #defineCONFIG_PHY_ENABLED 1
 #defineCONFIG_TRACEMEM_RESERVE_DRAM 0x0
 #defineCONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
-#defineCONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1
 #defineCONFIG_SW_COEXIST_ENABLE 1
 #defineCONFIG_ESPTOOLPY_FLASHSIZE_4MB 1
 #defineCONFIG_ESPTOOLPY_FLASHFREQ "80m"
@@ -24,7 +23,6 @@
 #defineCONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
 #defineCONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10
 #defineCONFIG_BT_RESERVE_DRAM 0x10000
-#defineCONFIG_LOG_BOOTLOADER_LEVEL_ERROR 1
 #defineCONFIG_CONSOLE_UART_BAUDRATE 115200
 #defineCONFIG_LWIP_MAX_SOCKETS 10
 #defineCONFIG_EMAC_TASK_PRIORITY 20
@@ -40,8 +38,10 @@
 #defineCONFIG_CONSOLE_UART_NUM 0
 #defineCONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
 #defineCONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
+#defineCONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
 #defineCONFIG_CONSOLE_UART_DEFAULT 1
 #defineCONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
+#defineCONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
 #defineCONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
 #defineCONFIG_AUTOSTART_ARDUINO 1
 #defineCONFIG_LOG_DEFAULT_LEVEL_ERROR 1
@@ -73,10 +73,8 @@
 #defineCONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #defineCONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #defineCONFIG_PARTITION_TABLE_SINGLE_APP 1
-#defineCONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 #defineCONFIG_WIFI_ENABLED 1
 #defineCONFIG_FLASHMODE_QIO 1
-#defineCONFIG_BASE_MAC_STORED_DEFAULT_EFUSE 1
 #defineCONFIG_ESPTOOLPY_FLASHFREQ_80M 1
 #defineCONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 2048
 #defineCONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 2000
@@ -90,11 +88,12 @@
 #defineCONFIG_FREERTOS_ASSERT_FAIL_ABORT 1
 #defineCONFIG_ESP32_XTAL_FREQ 0
 #defineCONFIG_MONITOR_BAUD_115200B 1
-#defineCONFIG_LOG_BOOTLOADER_LEVEL1
+#defineCONFIG_LOG_BOOTLOADER_LEVEL0
 #defineCONFIG_SMP_ENABLE 1
 #defineCONFIG_ESPTOOLPY_BEFORE_RESET 1
 #defineCONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
 #defineCONFIG_ENABLE_ARDUINO_DEPENDS 1
+#defineCONFIG_LOG_BOOTLOADER_LEVEL_NONE 1
 #defineCONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
 #defineCONFIG_ESP32_XTAL_FREQ_AUTO 1
 #defineCONFIG_TCP_MAXRTX 12

tools/sdk/include/config/sdkconfig.h

@@ -28,13 +28,31 @@ typedef enum{
 DAC_CHANNEL_MAX,
 } dac_channel_t;
 
+
+/**
+ * @brief Set DAC output voltage.
+ *
+ * @note Function has been deprecated, please use dac_output_voltage instead.
+ * This name will be removed in a future release.
+ * The difference is that before calling dac_output_voltage, we need to initialize the dac pad by dac_output_enable
+ *
+ *
+ * @param channel DAC channel
+ * @param dac_value DAC output value
+ *
+ * @return
+ * - ESP_OK success
+ * - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_tdac_out_voltage(dac_channel_tchannel, uint8_tdac_value) __attribute__ ((deprecated));
+
 /**
  * @brief Set DAC output voltage.
  *
  * DAC output is 8-bit. Maximum (255) corresponds to VDD.
  *
- * @note When this function is called, function for the DAC
- * channel's GPIO pin is reconfigured for RTC DAC function.
+ * @note Need to configure DAC pad before calling this function.
+ *  DAC channel 1 is attached to GPIO25, DAC channel 2 is attached to GPIO26
  *
  * @param channel DAC channel
  * @param dac_value DAC output value
@@ -43,8 +61,35 @@ typedef enum{
  * - ESP_OK success
  * - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_tdac_out_voltage(dac_channel_tchannel, uint8_tdac_value);
+esp_err_tdac_output_voltage(dac_channel_tchannel, uint8_tdac_value);
+
+/**
+ * @brief DAC pad output enable
+ *
+ * @param channel DAC channel
+ * @note DAC channel 1 is attached to GPIO25, DAC channel 2 is attached to GPIO26
+ * I2S left channel will be mapped to DAC channel 2
+ * I2S right channel will be mapped to DAC channel 1
+ */
+esp_err_tdac_output_enable(dac_channel_tchannel);
+
+/**
+ * @brief DAC pad output disable
+ *
+ * @param channel DAC channel
+ * @note DAC channel 1 is attached to GPIO25, DAC channel 2 is attached to GPIO26
+ */
+esp_err_tdac_output_disable(dac_channel_tchannel);
 
+/**
+ * @brief Enable DAC output data from I2S
+ */
+esp_err_tdac_i2s_enable();
+
+/**
+ * @brief Disable DAC output data from I2S
+ */
+esp_err_tdac_i2s_disable();
 #ifdef__cplusplus
 }
 #endif

tools/sdk/include/driver/driver/dac.h

@@ -109,13 +109,17 @@ typedef enum{
 /**
  * @brief I2S Mode, defaut is I2S_MODE_MASTER | I2S_MODE_TX
  *
+ * @note PDM and built-in DAC functions are only supported on I2S0 for current ESP32 chip.
+ *
  */
 typedefenum{
 I2S_MODE_MASTER=1,
 I2S_MODE_SLAVE=2,
 I2S_MODE_TX=4,
 I2S_MODE_RX=8,
-I2S_MODE_DAC_BUILT_IN=16
+I2S_MODE_DAC_BUILT_IN=16, /*!< Output I2S data to built-in DAC, no matter the data format is 16bit or 32 bit, the DAC module will only take the 8bits from MSB*/
+//I2S_MODE_ADC_BUILT_IN = 32, /*!< Currently not supported yet, will be added for the next version*/
+I2S_MODE_PDM=64,
 } i2s_mode_t;
 
 /**
@@ -144,6 +148,19 @@ typedef enum{
 I2S_EVENT_MAX, /*!< I2S event max index*/
 } i2s_event_type_t;
 
+/**
+ * @brief I2S DAC mode for i2s_set_dac_mode.
+ *
+ * @note PDM and built-in DAC functions are only supported on I2S0 for current ESP32 chip.
+ */
+typedefenum{
+I2S_DAC_CHANNEL_DISABLE=0, /*!< Disable I2S built-in DAC signals*/
+I2S_DAC_CHANNEL_RIGHT_EN=1, /*!< Enable I2S built-in DAC right channel, maps to DAC channel 1 on GPIO25*/
+I2S_DAC_CHANNEL_LEFT_EN=2, /*!< Enable I2S built-in DAC left channel, maps to DAC channel 2 on GPIO26*/
+I2S_DAC_CHANNEL_BOTH_EN=0x3, /*!< Enable both of the I2S built-in DAC channels.*/
+I2S_DAC_CHANNEL_MAX=0x4, /*!< I2S built-in DAC mode max index*/
+} i2s_dac_mode_t;
+
 /**
  * @brief Event structure used in I2S event queue
  *
@@ -166,6 +183,7 @@ typedef struct{
 intdata_in_num; /*!< DATA in pin*/
 } i2s_pin_config_t;
 
+
 typedefintr_handle_ti2s_isr_handle_t;
 /**
  * @brief Set I2S pin number
@@ -181,12 +199,30 @@ typedef intr_handle_t i2s_isr_handle_t;
  * Inside the pin configuration structure, set I2S_PIN_NO_CHANGE for any pin where
  * the current configuration should not be changed.
  *
+ * @note if *pin is set as NULL, this function will initialize both of the built-in DAC channels by default.
+ * if you don't want this to happen and you want to initialize only one of the DAC channels, you can call i2s_set_dac_mode instead.
+ *
  * @return
  * - ESP_OK Success
  * - ESP_FAIL Parameter error
  */
 esp_err_ti2s_set_pin(i2s_port_ti2s_num, consti2s_pin_config_t*pin);
 
+/**
+ * @brief Set I2S dac mode, I2S built-in DAC is disabled by default
+ *
+ * @param dac_mode DAC mode configurations - see i2s_dac_mode_t
+ *
+ * @note Built-in DAC functions are only supported on I2S0 for current ESP32 chip.
+ * If either of the built-in DAC channel are enabled, the other one can not
+ * be used as RTC DAC function at the same time.
+ *
+ * @return
+ * - ESP_OK Success
+ * - ESP_ERR_INVALID_ARG Parameter error
+ */
+esp_err_ti2s_set_dac_mode(i2s_dac_mode_tdac_mode);
+
 /**
  * @brief Install and start I2S driver.
  *