alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes from Github (backport v4.1)

See merge request espressif/esp-idf!7920
This commit is contained in:
Ivan Grokhotkov 2020-03-11 21:49:19 +08:00
commit 7f84669054
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/soc/src/hal/sdio_slave_hal.c
View File

@ -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, SDIO_SLAVE_CHECK(send_get_state(hal) == STATE_IDLE,
"reset counter when transmission started", ESP_ERR_INVALID_STATE); "reset counter when transmission started", ESP_ERR_INVALID_STATE);
uint32_t len;
sdio_slave_ll_send_write_len(hal->slc, 0); 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; hal->tail_pkt_len = 0;
sdio_slave_hal_send_desc_t *desc = hal->in_flight_head; sdio_slave_hal_send_desc_t *desc = hal->in_flight_head;

2
docs/en/api-reference/system/efuse.rst
View File

@ -5,7 +5,7 @@ eFuse Manager
Introduction 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 Hardware description

2
docs/en/api-reference/system/esp_event.rst
View File

@ -54,7 +54,7 @@ In code, the flow above may look like as follows:
esp_event_loop_handle_t loop_handle; 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 // 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. // event that handler run_on_event should execute on when it gets posted to the loop.

14
examples/peripherals/temp_sensor_esp32s2/README.md
View File

@ -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. 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(℃) | DAC level | offset | measure range(℃) | measure error(℃) |
:-: | :-: | :-: | :-: | :-------: | :----: | :--------------: | :--------------: |
0 | -2 | 50 ~ 125 | < 3 | 0 | -2 | 50 ~ 125 | < 3 |
1 | -1 | 20 ~ 100 | < 2 | 1 | -1 | 20 ~ 100 | < 2 |
2 | 0 | -10 ~ 80 | < 1 | 2 | 0 | -10 ~ 80 | < 1 |
3 | 1 | -30 ~ 50 | < 2 | 3 | 1 | -30 ~ 50 | < 2 |
4 | 2 | -40 ~ 20 | < 3 | 4 | 2 | -40 ~ 20 | < 3 |
* Log output : * Log output :