Merge branch 'espressif:master' into feature/resistive_touch

Author: dvosully

.gitlab-ci.yml

@@ -30,28 +30,38 @@ before_script:
   artifacts:
     when: always
     paths:
-      - $BUILD_PATH/*/*/build/*.bin
-      - $BUILD_PATH/*/*/build/*.elf
-      - $BUILD_PATH/*/*/build/*.map
-      - $BUILD_PATH/*/*/build/download.config
-      - $BUILD_PATH/*/*/build/bootloader/*.bin
-      - $LOG_PATH
+      - $BUILD_PATH/*/*/*/build/*.bin
+      - $BUILD_PATH/*/*/*/build/*/*.bin
+      - $BUILD_PATH/*/*/*/build/*.json
+      - $BUILD_PATH/*.json
+      - $LOG_PATH/*
     expire_in: 1 week
   variables:
     IDF_CI_BUILD: "1"
     LOG_PATH: "$CI_PROJECT_DIR/log_examples"
     BUILD_PATH: "$CI_PROJECT_DIR/build_examples"
+    SIZE_INFO_LOCATION: "$CI_PROJECT_DIR/log_examples/size_info.txt"
+    PEDANTIC_CFLAGS: ""
+    PEDANTIC_CXXFLAGS: ""
   script:
     # it's not possible to build 100% out-of-tree and have the "artifacts"
     # mechanism work, but this is the next best thing
     - rm -rf ${BUILD_PATH}
-    - mkdir ${BUILD_PATH}
-    - mkdir -p ${LOG_PATH}
     # build some of examples
-    - ${IOT_SOLUTION_PATH}/tools/ci/build_examples.sh "${CI_JOB_NAME}"
+    - python ${IOT_SOLUTION_PATH}/tools/ci/genarate_build_json.py
+    - ${IOT_SOLUTION_PATH}/tools/ci/build_examples.sh
 
-build_examples_00:
+build_examples_00_with_idf_v4.2:
   <<: *build_examples_template
+  image: espressif/idf:release-v4.2
+
+build_examples_00_with_idf_v4.3:
+  <<: *build_examples_template
+  image: espressif/idf:release-v4.3
+
+build_examples_00_with_idf_v4.4:
+  <<: *build_examples_template
+  image: espressif/idf:release-v4.4
 
 build_docs:
   stage: build

.readthedocs.yml

@@ -14,4 +14,5 @@ formats:
 python:
   version: 3.7
   install:
+    - requirements: docs/setuptools.requirements.txt
     - requirements: docs/requirements.txt

components/audio/dac_audio/dac_audio.c

@@ -154,7 +154,11 @@ esp_err_t dac_audio_init(dac_audio_config_t *cfg)
     i2s_config.mode = I2S_MODE_MASTER |  I2S_MODE_TX | I2S_MODE_DAC_BUILT_IN;
     i2s_config.sample_rate =  cfg->sample_rate;
     i2s_config.bits_per_sample = cfg->bits_per_sample;
+#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0))
+    i2s_config.communication_format = I2S_COMM_FORMAT_I2S_MSB;
+#else
     i2s_config.communication_format = I2S_COMM_FORMAT_STAND_MSB;
+#endif
     if (I2S_DAC_CHANNEL_RIGHT_EN == cfg->dac_mode) {
         i2s_config.channel_format = I2S_CHANNEL_FMT_ALL_RIGHT;
     } else if (I2S_DAC_CHANNEL_LEFT_EN == cfg->dac_mode) {

components/audio/pwm_audio/pwm_audio.c

@@ -29,7 +29,7 @@
 #include "pwm_audio.h"
 #include "sdkconfig.h"
 
-#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32)
+#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S3)
 
 static const char *TAG = "pwm_audio";
 
@@ -121,7 +121,7 @@ static esp_err_t rb_destroy(ringbuf_handle_t *rb)
     rb = NULL;
     return ESP_OK;
 }
-static ringbuf_handle_t* rb_create(uint32_t size)
+static ringbuf_handle_t *rb_create(uint32_t size)
 {
     if (size < (BUFFER_MIN_SIZE << 2)) {
         ESP_LOGE(TAG, "Invalid buffer size, Minimum = %d", (int32_t)(BUFFER_MIN_SIZE << 2));
@@ -260,31 +260,13 @@ static void IRAM_ATTR timer_group_isr(void *para)
     if (handle == NULL) {
         return;
     }
-
-#ifdef CONFIG_IDF_TARGET_ESP32S2
-
     /* Clear the interrupt */
-    if ((handle->timg_dev)->int_st.val & BIT(handle->config.timer_num)) {
-        (handle->timg_dev)->int_clr.val |= (1UL << handle->config.timer_num);
+    if (REG_GET_BIT(TIMG_INT_ST_TIMERS_REG(handle->config.timer_num), BIT(handle->config.timer_num))) {
+        REG_SET_BIT(TIMG_INT_CLR_TIMERS_REG(handle->config.timer_num), BIT(handle->config.timer_num));
     }
-
     /* After the alarm has been triggered
-      we need enable it again, so it is triggered the next time */
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.alarm_en = TIMER_ALARM_EN;
-#endif /**< CONFIG_IDF_TARGET_ESP32S2 */
-
-#ifdef CONFIG_IDF_TARGET_ESP32
-
-    /* Clear the interrupt */
-    if (handle->timg_dev->int_st_timers.val & BIT(handle->config.timer_num)) {
-        handle->timg_dev->int_clr_timers.val |= (1UL << handle->config.timer_num);
-    }
-
-    /* After the alarm has been triggered
-      we need enable it again, so it is triggered the next time */
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.alarm_en = TIMER_ALARM_EN;
-
-#endif /**< CONFIG_IDF_TARGET_ESP32 */
+        we need enable it again, so it is triggered the next time */
+    REG_SET_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_ALARM_EN_M);
 
     static uint8_t wave_h, wave_l;
     static uint16_t value;
@@ -557,7 +539,7 @@ esp_err_t pwm_audio_set_param(int rate, ledc_timer_bit_t bits, int ch)
     timer_set_counter_value(handle->config.tg_num, handle->config.timer_num, 0x00000000ULL);
 
     /* Configure the alarm value and the interrupt on alarm. */
-    uint32_t divider = handle->timg_dev->hw_timer[handle->config.timer_num].config.divider;
+    uint32_t divider = REG_GET_FIELD(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_DIVIDER);
     timer_set_alarm_value(handle->config.tg_num, handle->config.timer_num, (TIMER_BASE_CLK / divider) / handle->framerate);
     // timer_enable_intr(handle->config.tg_num, handle->config.timer_num);
     return res;
@@ -572,7 +554,7 @@ esp_err_t pwm_audio_set_sample_rate(int rate)
 
     pwm_audio_data_t *handle = g_pwm_audio_handle;
     handle->framerate = rate;
-    uint32_t divider = handle->timg_dev->hw_timer[handle->config.timer_num].config.divider;
+    uint32_t divider = REG_GET_FIELD(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_DIVIDER);
     res = timer_set_alarm_value(handle->config.tg_num, handle->config.timer_num, (TIMER_BASE_CLK / divider) / handle->framerate);
     return res;
 }
@@ -751,10 +733,12 @@ esp_err_t pwm_audio_start(void)
 
     /**< timer enable interrupt */
     portENTER_CRITICAL_SAFE(&timer_spinlock);
-    handle->timg_dev->int_ena.val |= BIT(handle->config.timer_num);
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.enable = 1;
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.alarm_en = TIMER_ALARM_EN; /** Make sure the interrupt is enabled*/
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.level_int_en = 1;
+    REG_SET_BIT(TIMG_INT_ENA_TIMERS_REG(handle->config.timer_num), BIT(handle->config.timer_num));
+    REG_SET_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_EN_M);
+    REG_SET_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_ALARM_EN_M);
+#ifdef TIMG_T0_LEVEL_INT_EN_M
+    REG_SET_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_LEVEL_INT_EN_M);
+#endif
     portEXIT_CRITICAL_SAFE(&timer_spinlock);
 
     res = timer_start(handle->config.tg_num, handle->config.timer_num);
@@ -770,9 +754,12 @@ esp_err_t pwm_audio_stop(void)
     /**< just disable timer ,keep pwm output to reduce switching nosie */
     /**< timer disable interrupt */
     portENTER_CRITICAL_SAFE(&timer_spinlock);
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.enable = 0;
-    handle->timg_dev->int_ena.val &= (~BIT(handle->config.timer_num));
-    handle->timg_dev->hw_timer[handle->config.timer_num].config.level_int_en = 0;
+    REG_CLR_BIT(TIMG_INT_ENA_TIMERS_REG(handle->config.timer_num), BIT(handle->config.timer_num));
+    REG_CLR_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_EN_M);
+    REG_CLR_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_ALARM_EN_M);
+#ifdef TIMG_T0_LEVEL_INT_EN_M
+    REG_CLR_BIT(TIMG_T0CONFIG_REG(handle->config.timer_num), TIMG_T0_LEVEL_INT_EN_M);
+#endif
     portEXIT_CRITICAL_SAFE(&timer_spinlock);
 
     // timer_pause(handle->config.tg_num, handle->config.timer_num);