Просмотр исходного кода

Merge branch 'bugfix/from_github_v4.1' into 'release/v4.1'

Fixes from Github (backport v4.1)

See merge request espressif/esp-idf!7920
Ivan Grokhotkov 5 лет назад
Родитель
Сommit
7f84669054

+ 1 - 2
components/soc/src/hal/sdio_slave_hal.c

@@ -372,9 +372,8 @@ esp_err_t sdio_slave_hal_send_reset_counter(sdio_slave_context_t* hal)
     SDIO_SLAVE_CHECK(send_get_state(hal) == STATE_IDLE,
                      "reset counter when transmission started", ESP_ERR_INVALID_STATE);
 
-    uint32_t len;
     sdio_slave_ll_send_write_len(hal->slc, 0);
-    ESP_EARLY_LOGV(TAG, "send_length_write: %d, last_len: %08X", len, sdio_slave_ll_send_read_len(hal->host));
+    ESP_EARLY_LOGV(TAG, "last_len: %08X", sdio_slave_ll_send_read_len(hal->host));
 
     hal->tail_pkt_len = 0;
     sdio_slave_hal_send_desc_t *desc = hal->in_flight_head;

+ 1 - 1
docs/en/api-reference/system/efuse.rst

@@ -5,7 +5,7 @@ eFuse Manager
 Introduction
 ------------
 
-The eFuse Manager library is designed to structure access to eFuse bits and make using these easy. This library operates eFuse bits by a structure name wich assigned in eFuse table. This sections introduces some concepts used by eFuse Manager.
+The eFuse Manager library is designed to structure access to eFuse bits and make using these easy. This library operates eFuse bits by a structure name which is assigned in eFuse table. This sections introduces some concepts used by eFuse Manager.
 
 
 Hardware description

+ 1 - 1
docs/en/api-reference/system/esp_event.rst

@@ -54,7 +54,7 @@ In code, the flow above may look like as follows:
 
         esp_event_loop_handle_t loop_handle;
 
-        esp_event_loop_create(&loop_args, &loop_handle)
+        esp_event_loop_create(&loop_args, &loop_handle);
 
         // 3. Register event handler defined in (1). MY_EVENT_BASE and MY_EVENT_ID specifies a hypothetical
         // event that handler run_on_event should execute on when it gets posted to the loop.

+ 7 - 7
examples/peripherals/temp_sensor_esp32s2/README.md

@@ -4,13 +4,13 @@ The ESP32-S2 has a built-in temperature sensor. The temperature sensor module co
 
 The conversion relationship is the first two columns of the table below. Among them, `offset = 0`(default) is the main measurement option, and other values are extended measurement options.  
 
-DAC level | offset | measure range(℃) | measure error(℃)
-    :-:   |   :-:  |        :-:        |       :-:
-     0    |   -2   |      50 ~ 125     |       < 3
-     1    |   -1   |      20 ~ 100     |       < 2
-     2    |    0   |     -10 ~ 80      |       < 1
-     3    |    1   |     -30 ~ 50      |       < 2
-     4    |    2   |     -40 ~ 20      |       < 3
+| DAC level | offset | measure range(℃) | measure error(℃) |
+| :-------: | :----: | :--------------: | :--------------: |
+|     0     |   -2   |     50 ~ 125     |       < 3        |
+|     1     |   -1   |     20 ~ 100     |       < 2        |
+|     2     |   0    |     -10 ~ 80     |       < 1        |
+|     3     |   1    |     -30 ~ 50     |       < 2        |
+|     4     |   2    |     -40 ~ 20     |       < 3        |
 
 * Log output :