diff --git a/components/esp_common/src/esp_err_to_name.c b/components/esp_common/src/esp_err_to_name.c index 7ace43d9e9..79bbdc0e6f 100644 --- a/components/esp_common/src/esp_err_to_name.c +++ b/components/esp_common/src/esp_err_to_name.c @@ -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 */ # endif # 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 # 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 // components/esp_common/include/esp_err.h # 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 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) { 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 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) { strlcpy(buf, esp_err_msg_table[i].msg, buflen); return buf; diff --git a/examples/system/ota/README.md b/examples/system/ota/README.md index cec88fd7f6..e78f3504b9 100644 --- a/examples/system/ota/README.md +++ b/examples/system/ota/README.md @@ -35,7 +35,7 @@ The OTA workflow is illustrated in the following diagram: ### Configure the project -Open the project configuration menu (`idf.py menuconfig`). +Open the project configuration menu (`idf.py menuconfig`). In the `Example Connection Configuration` menu: @@ -88,7 +88,7 @@ cp ca_cert.pem /path/to/ota/example/server_certs/ After booting, the firmware prints "Starting OTA example" to the console and: -1. Connects via Ethernet or to the AP using the provided SSID and password (Wi-Fi case) +1. Connects via Ethernet or to the AP using the provided SSID and password (Wi-Fi case) 2. Connects to the HTTPS server and downloads the new image 3. Writes the image to flash, and instructs the bootloader to boot from this image after the next reset 4. Reboots @@ -107,7 +107,7 @@ ACCEPT ## Supporting Rollback -This feature allows you to roll back to a previous firmware if new image is not useable. The menuconfig option `CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE` allows you to track the first boot of the application (see the ``Over The Air Updates (OTA)`` article). +This feature allows you to roll back to a previous firmware if new image is not useable. The menuconfig option `CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE` allows you to track the first boot of the application (see the ``Over The Air Updates (OTA)`` article). The ``native_ota_example`` contains code to demonstrate how a rollback works. To use it, enable the `CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE` option in the `Example Configuration` submenu of menuconfig to set `Number of the GPIO input for diagnostic` to manipulate the rollback process. @@ -136,7 +136,7 @@ In ``native_ota_example``, ``$PROJECT_PATH/version.txt`` is used to define the a ### 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.