From f4c84ea2b20711519d42b56379a7d4aceec36d90 Mon Sep 17 00:00:00 2001 From: Mooli Tayer Date: Wed, 12 Feb 2020 15:13:27 +0200 Subject: [PATCH 1/4] Fix typo Merges https://github.com/espressif/esp-idf/pull/4752 --- docs/en/api-reference/system/efuse.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api-reference/system/efuse.rst b/docs/en/api-reference/system/efuse.rst index 955e80efc0..61e1d311e6 100644 --- a/docs/en/api-reference/system/efuse.rst +++ b/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 From eda9d8ffa8b28eeecb84d1ed08d01dbb20738e4e Mon Sep 17 00:00:00 2001 From: Rusty Eddy Date: Tue, 4 Feb 2020 07:38:44 -0800 Subject: [PATCH 2/4] Added semi-colon to esp_event_loop_create(...) Title sums it up. Merges https://github.com/espressif/esp-idf/pull/4711 --- docs/en/api-reference/system/esp_event.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api-reference/system/esp_event.rst b/docs/en/api-reference/system/esp_event.rst index b0a96e4ce1..cc6c41aea4 100644 --- a/docs/en/api-reference/system/esp_event.rst +++ b/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. From ba43902fb873f01546807d7c439314c894082d23 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Mon, 17 Feb 2020 20:30:10 +0100 Subject: [PATCH 3/4] Fixes compilation error on verbose level (IDFGH-2439) Closes #4552 Merges https://github.com/espressif/esp-idf/pull/4786 --- components/soc/src/hal/sdio_slave_hal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/soc/src/hal/sdio_slave_hal.c b/components/soc/src/hal/sdio_slave_hal.c index f54a7f08fb..485fb09df2 100644 --- a/components/soc/src/hal/sdio_slave_hal.c +++ b/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; From 85c15812c9c77dcc3fd0aca5e3d3bf3339d5b846 Mon Sep 17 00:00:00 2001 From: khuynh Date: Wed, 8 Jan 2020 23:39:12 -0800 Subject: [PATCH 4/4] fix markdown table formatting fixed markdown for a table in `examples/peripherals/temp_sensor_esp32s2/README.md` Merges https://github.com/espressif/esp-idf/pull/4609 --- examples/peripherals/temp_sensor_esp32s2/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/peripherals/temp_sensor_esp32s2/README.md b/examples/peripherals/temp_sensor_esp32s2/README.md index 3b6e22535a..161798695f 100644 --- a/examples/peripherals/temp_sensor_esp32s2/README.md +++ b/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 :