espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/misc_ci_fixes' into 'master'

Browse Source 
ci: esp_err_to_name and check_readme_links fixes

See merge request espressif/esp-idf!13859
This commit is contained in:
Angus Gratton
2021-06-04 06:46:27 +00:00
parent 5cbea220b0 b1aa9269fd
commit 65f70b946f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_common/src/esp_err_to_name.c
View File

@@ -539,10 +539,10 @@ static const esp_err_msg_t esp_err_msg_table[] = {
ERR_TBL_IT(ESP_ERR_ESP_NETIF_DNS_NOT_CONFIGURED), /* 20490 0x500a */ ERR_TBL_IT(ESP_ERR_ESP_NETIF_DNS_NOT_CONFIGURED), /* 20490 0x500a */
# endif # endif
# ifdef ESP_ERR_ESP_NETIF_MLD6_FAILED # ifdef ESP_ERR_ESP_NETIF_MLD6_FAILED
ERR_TBL_IT(ESP_ERR_ESP_NETIF_MLD6_FAILED), /* 20490 0x500b */ ERR_TBL_IT(ESP_ERR_ESP_NETIF_MLD6_FAILED), /* 20491 0x500b */
# endif # endif
# ifdef ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED # ifdef ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED
ERR_TBL_IT(ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED), /* 20490 0x500a */ ERR_TBL_IT(ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED), /* 20492 0x500c */
# endif # endif
// components/esp_common/include/esp_err.h // components/esp_common/include/esp_err.h
# ifdef ESP_ERR_FLASH_BASE # ifdef ESP_ERR_FLASH_BASE
@@ -765,7 +765,7 @@ const char *esp_err_to_name(esp_err_t code)
#ifdef CONFIG_ESP_ERR_TO_NAME_LOOKUP #ifdef CONFIG_ESP_ERR_TO_NAME_LOOKUP
size_t i; size_t i;
for (i = 0; i < sizeof(esp_err_msg_table) / sizeof(esp_err_msg_table[0]); ++i) { for (i = 0; i < sizeof(esp_err_msg_table)/sizeof(esp_err_msg_table[0]); ++i) {
if (esp_err_msg_table[i].code == code) { if (esp_err_msg_table[i].code == code) {
return esp_err_msg_table[i].msg; return esp_err_msg_table[i].msg;
} }
@@ -780,7 +780,7 @@ const char *esp_err_to_name_r(esp_err_t code, char *buf, size_t buflen)
#ifdef CONFIG_ESP_ERR_TO_NAME_LOOKUP #ifdef CONFIG_ESP_ERR_TO_NAME_LOOKUP
size_t i; size_t i;
for (i = 0; i < sizeof(esp_err_msg_table) / sizeof(esp_err_msg_table[0]); ++i) { for (i = 0; i < sizeof(esp_err_msg_table)/sizeof(esp_err_msg_table[0]); ++i) {
if (esp_err_msg_table[i].code == code) { if (esp_err_msg_table[i].code == code) {
strlcpy(buf, esp_err_msg_table[i].msg, buflen); strlcpy(buf, esp_err_msg_table[i].msg, buflen);
return buf; return buf;

2
examples/system/ota/README.md
View File

@@ -136,7 +136,7 @@ In ``native_ota_example``, ``$PROJECT_PATH/version.txt`` is used to define the a
### Error "ota_begin error err=0x104" ### Error "ota_begin error err=0x104"
If you see this error, check that the configured (and actual) flash size is large enough for the partitions in the partition table. The default "two OTA slots" partition table requires at least 4MB flash size. To use OTA with smaller flash sizes, create a custom partition table CSV (for details see [components/partition_table](../../../compenents/partition_table)) and configure it in menuconfig. If you see this error, check that the configured (and actual) flash size is large enough for the partitions in the partition table. The default "two OTA slots" partition table requires at least 4MB flash size. To use OTA with smaller flash sizes, create a custom partition table CSV (for details see [Partition Tables](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/partition-tables.html)) and configure it in menuconfig.
Make sure to run "idf.py erase_flash" after making changes to the partition table. Make sure to run "idf.py erase_flash" after making changes to the partition table.