Merge branch 'bugfix/err_code_collision_v4.0' into 'release/v4.0'
Fix error code collisions and re-enable CI check (v4.0) See merge request espressif/esp-idf!5984
This commit is contained in:
commit
538c56426a
5 changed files with 306 additions and 204 deletions
|
@ -17,6 +17,9 @@
|
||||||
#if __has_include("esp_http_server.h")
|
#if __has_include("esp_http_server.h")
|
||||||
#include "esp_http_server.h"
|
#include "esp_http_server.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if __has_include("esp_https_ota.h")
|
||||||
|
#include "esp_https_ota.h"
|
||||||
|
#endif
|
||||||
#if __has_include("esp_image_format.h")
|
#if __has_include("esp_image_format.h")
|
||||||
#include "esp_image_format.h"
|
#include "esp_image_format.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -35,11 +38,17 @@
|
||||||
#if __has_include("esp_spi_flash.h")
|
#if __has_include("esp_spi_flash.h")
|
||||||
#include "esp_spi_flash.h"
|
#include "esp_spi_flash.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if __has_include("esp_supplicant/esp_wps.h")
|
||||||
|
#include "esp_supplicant/esp_wps.h"
|
||||||
|
#endif
|
||||||
|
#if __has_include("esp_tls.h")
|
||||||
|
#include "esp_tls.h"
|
||||||
|
#endif
|
||||||
#if __has_include("esp_wifi.h")
|
#if __has_include("esp_wifi.h")
|
||||||
#include "esp_wifi.h"
|
#include "esp_wifi.h"
|
||||||
#endif
|
#endif
|
||||||
#if __has_include("esp_wps.h")
|
#if __has_include("hal/esp_flash_err.h")
|
||||||
#include "esp_wps.h"
|
#include "hal/esp_flash_err.h"
|
||||||
#endif
|
#endif
|
||||||
#if __has_include("nvs.h")
|
#if __has_include("nvs.h")
|
||||||
#include "nvs.h"
|
#include "nvs.h"
|
||||||
|
@ -105,8 +114,8 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_NOT_INITIALIZED), /* 4353 0x1101 The storage driver is not initialized */
|
ERR_TBL_IT(ESP_ERR_NVS_NOT_INITIALIZED), /* 4353 0x1101 The storage driver is not initialized */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_NOT_FOUND
|
# ifdef ESP_ERR_NVS_NOT_FOUND
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_NOT_FOUND), /* 4354 0x1102 Id namespace doesn’t exist yet and mode is
|
ERR_TBL_IT(ESP_ERR_NVS_NOT_FOUND), /* 4354 0x1102 Id namespace doesn’t exist yet and mode
|
||||||
NVS_READONLY */
|
is NVS_READONLY */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_TYPE_MISMATCH
|
# ifdef ESP_ERR_NVS_TYPE_MISMATCH
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_TYPE_MISMATCH), /* 4355 0x1103 The type of set or get operation doesn't
|
ERR_TBL_IT(ESP_ERR_NVS_TYPE_MISMATCH), /* 4355 0x1103 The type of set or get operation doesn't
|
||||||
|
@ -116,8 +125,8 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_READ_ONLY), /* 4356 0x1104 Storage handle was opened as read only */
|
ERR_TBL_IT(ESP_ERR_NVS_READ_ONLY), /* 4356 0x1104 Storage handle was opened as read only */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_NOT_ENOUGH_SPACE
|
# ifdef ESP_ERR_NVS_NOT_ENOUGH_SPACE
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_NOT_ENOUGH_SPACE), /* 4357 0x1105 There is not enough space in the underlying
|
ERR_TBL_IT(ESP_ERR_NVS_NOT_ENOUGH_SPACE), /* 4357 0x1105 There is not enough space in the
|
||||||
storage to save the value */
|
underlying storage to save the value */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_INVALID_NAME
|
# ifdef ESP_ERR_NVS_INVALID_NAME
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_INVALID_NAME), /* 4358 0x1106 Namespace name doesn’t satisfy constraints */
|
ERR_TBL_IT(ESP_ERR_NVS_INVALID_NAME), /* 4358 0x1106 Namespace name doesn’t satisfy constraints */
|
||||||
|
@ -126,18 +135,19 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_INVALID_HANDLE), /* 4359 0x1107 Handle has been closed or is NULL */
|
ERR_TBL_IT(ESP_ERR_NVS_INVALID_HANDLE), /* 4359 0x1107 Handle has been closed or is NULL */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_REMOVE_FAILED
|
# ifdef ESP_ERR_NVS_REMOVE_FAILED
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_REMOVE_FAILED), /* 4360 0x1108 The value wasn’t updated because flash write
|
ERR_TBL_IT(ESP_ERR_NVS_REMOVE_FAILED), /* 4360 0x1108 The value wasn’t updated because flash
|
||||||
operation has failed. The value was written
|
write operation has failed. The value
|
||||||
however, and update will be finished after
|
was written however, and update will be
|
||||||
re-initialization of nvs, provided that
|
finished after re-initialization of nvs,
|
||||||
flash operation doesn’t fail again. */
|
provided that flash operation doesn’t
|
||||||
|
fail again. */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_KEY_TOO_LONG
|
# ifdef ESP_ERR_NVS_KEY_TOO_LONG
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_KEY_TOO_LONG), /* 4361 0x1109 Key name is too long */
|
ERR_TBL_IT(ESP_ERR_NVS_KEY_TOO_LONG), /* 4361 0x1109 Key name is too long */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_PAGE_FULL
|
# ifdef ESP_ERR_NVS_PAGE_FULL
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_PAGE_FULL), /* 4362 0x110a Internal error; never returned by nvs API
|
ERR_TBL_IT(ESP_ERR_NVS_PAGE_FULL), /* 4362 0x110a Internal error; never returned by nvs
|
||||||
functions */
|
API functions */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_INVALID_STATE
|
# ifdef ESP_ERR_NVS_INVALID_STATE
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_INVALID_STATE), /* 4363 0x110b NVS is in an inconsistent state due to a
|
ERR_TBL_IT(ESP_ERR_NVS_INVALID_STATE), /* 4363 0x110b NVS is in an inconsistent state due to a
|
||||||
|
@ -145,27 +155,27 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
nvs_open again, then retry. */
|
nvs_open again, then retry. */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_INVALID_LENGTH
|
# ifdef ESP_ERR_NVS_INVALID_LENGTH
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_INVALID_LENGTH), /* 4364 0x110c String or blob length is not sufficient to
|
ERR_TBL_IT(ESP_ERR_NVS_INVALID_LENGTH), /* 4364 0x110c String or blob length is not sufficient
|
||||||
store data */
|
to store data */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_NO_FREE_PAGES
|
# ifdef ESP_ERR_NVS_NO_FREE_PAGES
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_NO_FREE_PAGES), /* 4365 0x110d NVS partition doesn't contain any empty
|
ERR_TBL_IT(ESP_ERR_NVS_NO_FREE_PAGES), /* 4365 0x110d NVS partition doesn't contain any empty
|
||||||
pages. This may happen if NVS partition was
|
pages. This may happen if NVS partition
|
||||||
truncated. Erase the whole partition and
|
was truncated. Erase the whole partition
|
||||||
call nvs_flash_init again. */
|
and call nvs_flash_init again. */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_VALUE_TOO_LONG
|
# ifdef ESP_ERR_NVS_VALUE_TOO_LONG
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_VALUE_TOO_LONG), /* 4366 0x110e String or blob length is longer than
|
ERR_TBL_IT(ESP_ERR_NVS_VALUE_TOO_LONG), /* 4366 0x110e String or blob length is longer than
|
||||||
supported by the implementation */
|
supported by the implementation */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_PART_NOT_FOUND
|
# ifdef ESP_ERR_NVS_PART_NOT_FOUND
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_PART_NOT_FOUND), /* 4367 0x110f Partition with specified name is not found
|
ERR_TBL_IT(ESP_ERR_NVS_PART_NOT_FOUND), /* 4367 0x110f Partition with specified name is not
|
||||||
in the partition table */
|
found in the partition table */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_NEW_VERSION_FOUND
|
# ifdef ESP_ERR_NVS_NEW_VERSION_FOUND
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_NEW_VERSION_FOUND), /* 4368 0x1110 NVS partition contains data in new format
|
ERR_TBL_IT(ESP_ERR_NVS_NEW_VERSION_FOUND), /* 4368 0x1110 NVS partition contains data in new
|
||||||
and cannot be recognized by this version of
|
format and cannot be recognized by this
|
||||||
code */
|
version of code */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_XTS_ENCR_FAILED
|
# ifdef ESP_ERR_NVS_XTS_ENCR_FAILED
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_XTS_ENCR_FAILED), /* 4369 0x1111 XTS encryption failed while writing NVS entry */
|
ERR_TBL_IT(ESP_ERR_NVS_XTS_ENCR_FAILED), /* 4369 0x1111 XTS encryption failed while writing NVS entry */
|
||||||
|
@ -187,22 +197,27 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_NVS_CORRUPT_KEY_PART
|
# ifdef ESP_ERR_NVS_CORRUPT_KEY_PART
|
||||||
ERR_TBL_IT(ESP_ERR_NVS_CORRUPT_KEY_PART), /* 4375 0x1117 NVS key partition is corrupt */
|
ERR_TBL_IT(ESP_ERR_NVS_CORRUPT_KEY_PART), /* 4375 0x1117 NVS key partition is corrupt */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_NVS_CONTENT_DIFFERS
|
||||||
|
ERR_TBL_IT(ESP_ERR_NVS_CONTENT_DIFFERS), /* 4376 0x1118 Internal error; never returned by nvs
|
||||||
|
API functions. NVS key is different in
|
||||||
|
comparison */
|
||||||
# endif
|
# endif
|
||||||
// components/ulp/include/esp32/ulp.h
|
// components/ulp/include/esp32/ulp.h
|
||||||
# ifdef ESP_ERR_ULP_BASE
|
# ifdef ESP_ERR_ULP_BASE
|
||||||
ERR_TBL_IT(ESP_ERR_ULP_BASE), /* 4608 0x1200 Offset for ULP-related error codes */
|
ERR_TBL_IT(ESP_ERR_ULP_BASE), /* 4608 0x1200 Offset for ULP-related error codes */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_ULP_SIZE_TOO_BIG
|
# ifdef ESP_ERR_ULP_SIZE_TOO_BIG
|
||||||
ERR_TBL_IT(ESP_ERR_ULP_SIZE_TOO_BIG), /* 4609 0x1201 Program doesn't fit into RTC memory reserved
|
ERR_TBL_IT(ESP_ERR_ULP_SIZE_TOO_BIG), /* 4609 0x1201 Program doesn't fit into RTC memory
|
||||||
for the ULP */
|
reserved for the ULP */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_ULP_INVALID_LOAD_ADDR
|
# ifdef ESP_ERR_ULP_INVALID_LOAD_ADDR
|
||||||
ERR_TBL_IT(ESP_ERR_ULP_INVALID_LOAD_ADDR), /* 4610 0x1202 Load address is outside of RTC memory
|
ERR_TBL_IT(ESP_ERR_ULP_INVALID_LOAD_ADDR), /* 4610 0x1202 Load address is outside of RTC memory
|
||||||
reserved for the ULP */
|
reserved for the ULP */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_ULP_DUPLICATE_LABEL
|
# ifdef ESP_ERR_ULP_DUPLICATE_LABEL
|
||||||
ERR_TBL_IT(ESP_ERR_ULP_DUPLICATE_LABEL), /* 4611 0x1203 More than one label with the same number was
|
ERR_TBL_IT(ESP_ERR_ULP_DUPLICATE_LABEL), /* 4611 0x1203 More than one label with the same number
|
||||||
defined */
|
was defined */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_ULP_UNDEFINED_LABEL
|
# ifdef ESP_ERR_ULP_UNDEFINED_LABEL
|
||||||
ERR_TBL_IT(ESP_ERR_ULP_UNDEFINED_LABEL), /* 4612 0x1204 Branch instructions references an undefined label */
|
ERR_TBL_IT(ESP_ERR_ULP_UNDEFINED_LABEL), /* 4612 0x1204 Branch instructions references an undefined label */
|
||||||
|
@ -216,31 +231,32 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_BASE), /* 5376 0x1500 Base error code for ota_ops api */
|
ERR_TBL_IT(ESP_ERR_OTA_BASE), /* 5376 0x1500 Base error code for ota_ops api */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_PARTITION_CONFLICT
|
# ifdef ESP_ERR_OTA_PARTITION_CONFLICT
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_PARTITION_CONFLICT), /* 5377 0x1501 Error if request was to write or erase the
|
ERR_TBL_IT(ESP_ERR_OTA_PARTITION_CONFLICT), /* 5377 0x1501 Error if request was to write or erase
|
||||||
current running partition */
|
the current running partition */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_SELECT_INFO_INVALID
|
# ifdef ESP_ERR_OTA_SELECT_INFO_INVALID
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_SELECT_INFO_INVALID), /* 5378 0x1502 Error if OTA data partition contains invalid
|
ERR_TBL_IT(ESP_ERR_OTA_SELECT_INFO_INVALID), /* 5378 0x1502 Error if OTA data partition contains
|
||||||
content */
|
invalid content */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_VALIDATE_FAILED
|
# ifdef ESP_ERR_OTA_VALIDATE_FAILED
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_VALIDATE_FAILED), /* 5379 0x1503 Error if OTA app image is invalid */
|
ERR_TBL_IT(ESP_ERR_OTA_VALIDATE_FAILED), /* 5379 0x1503 Error if OTA app image is invalid */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_SMALL_SEC_VER
|
# ifdef ESP_ERR_OTA_SMALL_SEC_VER
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_SMALL_SEC_VER), /* 5380 0x1504 Error if the firmware has a secure version
|
ERR_TBL_IT(ESP_ERR_OTA_SMALL_SEC_VER), /* 5380 0x1504 Error if the firmware has a secure
|
||||||
less than the running firmware. */
|
version less than the running firmware. */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_ROLLBACK_FAILED
|
# ifdef ESP_ERR_OTA_ROLLBACK_FAILED
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_ROLLBACK_FAILED), /* 5381 0x1505 Error if flash does not have valid firmware
|
ERR_TBL_IT(ESP_ERR_OTA_ROLLBACK_FAILED), /* 5381 0x1505 Error if flash does not have valid
|
||||||
in passive partition and hence rollback is
|
firmware in passive partition and hence
|
||||||
not possible */
|
rollback is not possible */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_OTA_ROLLBACK_INVALID_STATE
|
# ifdef ESP_ERR_OTA_ROLLBACK_INVALID_STATE
|
||||||
ERR_TBL_IT(ESP_ERR_OTA_ROLLBACK_INVALID_STATE), /* 5382 0x1506 Error if current active firmware is still
|
ERR_TBL_IT(ESP_ERR_OTA_ROLLBACK_INVALID_STATE), /* 5382 0x1506 Error if current active firmware is
|
||||||
marked in pending validation state
|
still marked in pending validation state
|
||||||
(ESP_OTA_IMG_PENDING_VERIFY), essentially
|
(ESP_OTA_IMG_PENDING_VERIFY),
|
||||||
first boot of firmware image post upgrade
|
essentially first boot of firmware image
|
||||||
and hence firmware upgrade is not possible */
|
post upgrade and hence firmware upgrade
|
||||||
|
is not possible */
|
||||||
# endif
|
# endif
|
||||||
// components/efuse/include/esp_efuse.h
|
// components/efuse/include/esp_efuse.h
|
||||||
# ifdef ESP_ERR_EFUSE
|
# ifdef ESP_ERR_EFUSE
|
||||||
|
@ -293,8 +309,8 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_WIFI_STATE), /* 12294 0x3006 WiFi internal state error */
|
ERR_TBL_IT(ESP_ERR_WIFI_STATE), /* 12294 0x3006 WiFi internal state error */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_WIFI_CONN
|
# ifdef ESP_ERR_WIFI_CONN
|
||||||
ERR_TBL_IT(ESP_ERR_WIFI_CONN), /* 12295 0x3007 WiFi internal control block of station or
|
ERR_TBL_IT(ESP_ERR_WIFI_CONN), /* 12295 0x3007 WiFi internal control block of station
|
||||||
soft-AP error */
|
or soft-AP error */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_WIFI_NVS
|
# ifdef ESP_ERR_WIFI_NVS
|
||||||
ERR_TBL_IT(ESP_ERR_WIFI_NVS), /* 12296 0x3008 WiFi internal NVS module error */
|
ERR_TBL_IT(ESP_ERR_WIFI_NVS), /* 12296 0x3008 WiFi internal NVS module error */
|
||||||
|
@ -320,7 +336,16 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
# ifdef ESP_ERR_WIFI_NOT_CONNECT
|
# ifdef ESP_ERR_WIFI_NOT_CONNECT
|
||||||
ERR_TBL_IT(ESP_ERR_WIFI_NOT_CONNECT), /* 12303 0x300f Station still in disconnect status */
|
ERR_TBL_IT(ESP_ERR_WIFI_NOT_CONNECT), /* 12303 0x300f Station still in disconnect status */
|
||||||
# endif
|
# endif
|
||||||
// components/esp_wifi/include/esp_wps.h
|
# ifdef ESP_ERR_WIFI_POST
|
||||||
|
ERR_TBL_IT(ESP_ERR_WIFI_POST), /* 12306 0x3012 Failed to post the event to WiFi task */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_WIFI_INIT_STATE
|
||||||
|
ERR_TBL_IT(ESP_ERR_WIFI_INIT_STATE), /* 12307 0x3013 Invalod WiFi state when init/deinit is called */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_WIFI_STOP_STATE
|
||||||
|
ERR_TBL_IT(ESP_ERR_WIFI_STOP_STATE), /* 12308 0x3014 Returned when WiFi is stopping */
|
||||||
|
# endif
|
||||||
|
// components/wpa_supplicant/include/esp_supplicant/esp_wps.h
|
||||||
# ifdef ESP_ERR_WIFI_REGISTRAR
|
# ifdef ESP_ERR_WIFI_REGISTRAR
|
||||||
ERR_TBL_IT(ESP_ERR_WIFI_REGISTRAR), /* 12339 0x3033 WPS registrar is not supported */
|
ERR_TBL_IT(ESP_ERR_WIFI_REGISTRAR), /* 12339 0x3033 WPS registrar is not supported */
|
||||||
# endif
|
# endif
|
||||||
|
@ -454,15 +479,29 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
# ifdef ESP_ERR_TCPIP_ADAPTER_DHCP_NOT_STOPPED
|
# ifdef ESP_ERR_TCPIP_ADAPTER_DHCP_NOT_STOPPED
|
||||||
ERR_TBL_IT(ESP_ERR_TCPIP_ADAPTER_DHCP_NOT_STOPPED), /* 20487 0x5007 */
|
ERR_TBL_IT(ESP_ERR_TCPIP_ADAPTER_DHCP_NOT_STOPPED), /* 20487 0x5007 */
|
||||||
# endif
|
# endif
|
||||||
// components/lwip/include/apps/esp_ping.h
|
// components/esp_common/include/esp_err.h
|
||||||
# ifdef ESP_ERR_PING_BASE
|
# ifdef ESP_ERR_FLASH_BASE
|
||||||
ERR_TBL_IT(ESP_ERR_PING_BASE), /* 24576 0x6000 */
|
ERR_TBL_IT(ESP_ERR_FLASH_BASE), /* 24576 0x6000 Starting number of flash error codes */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_PING_INVALID_PARAMS
|
// components/spi_flash/include/esp_spi_flash.h
|
||||||
ERR_TBL_IT(ESP_ERR_PING_INVALID_PARAMS), /* 24577 0x6001 */
|
# ifdef ESP_ERR_FLASH_OP_FAIL
|
||||||
|
ERR_TBL_IT(ESP_ERR_FLASH_OP_FAIL), /* 24577 0x6001 */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_PING_NO_MEM
|
# ifdef ESP_ERR_FLASH_OP_TIMEOUT
|
||||||
ERR_TBL_IT(ESP_ERR_PING_NO_MEM), /* 24578 0x6002 */
|
ERR_TBL_IT(ESP_ERR_FLASH_OP_TIMEOUT), /* 24578 0x6002 */
|
||||||
|
# endif
|
||||||
|
// components/soc/include/hal/esp_flash_err.h
|
||||||
|
# ifdef ESP_ERR_FLASH_NOT_INITIALISED
|
||||||
|
ERR_TBL_IT(ESP_ERR_FLASH_NOT_INITIALISED), /* 24579 0x6003 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_FLASH_UNSUPPORTED_HOST
|
||||||
|
ERR_TBL_IT(ESP_ERR_FLASH_UNSUPPORTED_HOST), /* 24580 0x6004 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_FLASH_UNSUPPORTED_CHIP
|
||||||
|
ERR_TBL_IT(ESP_ERR_FLASH_UNSUPPORTED_CHIP), /* 24581 0x6005 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_FLASH_PROTECTED
|
||||||
|
ERR_TBL_IT(ESP_ERR_FLASH_PROTECTED), /* 24582 0x6006 */
|
||||||
# endif
|
# endif
|
||||||
// components/esp_http_client/include/esp_http_client.h
|
// components/esp_http_client/include/esp_http_client.h
|
||||||
# ifdef ESP_ERR_HTTP_BASE
|
# ifdef ESP_ERR_HTTP_BASE
|
||||||
|
@ -481,55 +520,115 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
||||||
ERR_TBL_IT(ESP_ERR_HTTP_FETCH_HEADER), /* 28676 0x7004 Error read HTTP header from server */
|
ERR_TBL_IT(ESP_ERR_HTTP_FETCH_HEADER), /* 28676 0x7004 Error read HTTP header from server */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTP_INVALID_TRANSPORT
|
# ifdef ESP_ERR_HTTP_INVALID_TRANSPORT
|
||||||
ERR_TBL_IT(ESP_ERR_HTTP_INVALID_TRANSPORT), /* 28677 0x7005 There are no transport support for the input
|
ERR_TBL_IT(ESP_ERR_HTTP_INVALID_TRANSPORT), /* 28677 0x7005 There are no transport support for the
|
||||||
scheme */
|
input scheme */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTP_CONNECTING
|
# ifdef ESP_ERR_HTTP_CONNECTING
|
||||||
ERR_TBL_IT(ESP_ERR_HTTP_CONNECTING), /* 28678 0x7006 HTTP connection hasn't been established yet */
|
ERR_TBL_IT(ESP_ERR_HTTP_CONNECTING), /* 28678 0x7006 HTTP connection hasn't been established yet */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTP_EAGAIN
|
# ifdef ESP_ERR_HTTP_EAGAIN
|
||||||
ERR_TBL_IT(ESP_ERR_HTTP_EAGAIN), /* 28679 0x7007 Mapping of errno EAGAIN to esp_err_t */
|
ERR_TBL_IT(ESP_ERR_HTTP_EAGAIN), /* 28679 0x7007 Mapping of errno EAGAIN to esp_err_t */
|
||||||
|
# endif
|
||||||
|
// components/esp-tls/esp_tls.h
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_BASE
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_BASE), /* 32768 0x8000 Starting number of ESP-TLS error codes */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_CANNOT_RESOLVE_HOSTNAME
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_CANNOT_RESOLVE_HOSTNAME), /* 32769 0x8001 Error if hostname couldn't be resolved
|
||||||
|
upon tls connection */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_CANNOT_CREATE_SOCKET
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_CANNOT_CREATE_SOCKET), /* 32770 0x8002 Failed to create socket */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_UNSUPPORTED_PROTOCOL_FAMILY
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_UNSUPPORTED_PROTOCOL_FAMILY), /* 32771 0x8003 Unsupported protocol family */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_FAILED_CONNECT_TO_HOST
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_FAILED_CONNECT_TO_HOST), /* 32772 0x8004 Failed to connect to host */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED), /* 32773 0x8005 failed to set socket option */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_CERT_PARTLY_OK
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_CERT_PARTLY_OK), /* 32774 0x8006 mbedtls parse certificates was partly successful */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_CTR_DRBG_SEED_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_CTR_DRBG_SEED_FAILED), /* 32775 0x8007 mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_SET_HOSTNAME_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_SET_HOSTNAME_FAILED), /* 32776 0x8008 mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_CONFIG_DEFAULTS_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_CONFIG_DEFAULTS_FAILED), /* 32777 0x8009 mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_CONF_ALPN_PROTOCOLS_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_CONF_ALPN_PROTOCOLS_FAILED), /* 32778 0x800a mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_X509_CRT_PARSE_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_X509_CRT_PARSE_FAILED), /* 32779 0x800b mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_CONF_OWN_CERT_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_CONF_OWN_CERT_FAILED), /* 32780 0x800c mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_SETUP_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_SETUP_FAILED), /* 32781 0x800d mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_WRITE_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_WRITE_FAILED), /* 32782 0x800e mbedtls api returned error */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_PK_PARSE_KEY_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_PK_PARSE_KEY_FAILED), /* 32783 0x800f mbedtls api returned failed */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_MBEDTLS_SSL_HANDSHAKE_FAILED
|
||||||
|
ERR_TBL_IT(ESP_ERR_MBEDTLS_SSL_HANDSHAKE_FAILED), /* 32784 0x8010 mbedtls api returned failed */
|
||||||
|
# endif
|
||||||
|
// components/esp_https_ota/include/esp_https_ota.h
|
||||||
|
# ifdef ESP_ERR_HTTPS_OTA_BASE
|
||||||
|
ERR_TBL_IT(ESP_ERR_HTTPS_OTA_BASE), /* 36864 0x9000 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_HTTPS_OTA_IN_PROGRESS
|
||||||
|
ERR_TBL_IT(ESP_ERR_HTTPS_OTA_IN_PROGRESS), /* 36865 0x9001 */
|
||||||
|
# endif
|
||||||
|
// components/lwip/include/apps/esp_ping.h
|
||||||
|
# ifdef ESP_ERR_PING_BASE
|
||||||
|
ERR_TBL_IT(ESP_ERR_PING_BASE), /* 40960 0xa000 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_PING_INVALID_PARAMS
|
||||||
|
ERR_TBL_IT(ESP_ERR_PING_INVALID_PARAMS), /* 40961 0xa001 */
|
||||||
|
# endif
|
||||||
|
# ifdef ESP_ERR_PING_NO_MEM
|
||||||
|
ERR_TBL_IT(ESP_ERR_PING_NO_MEM), /* 40962 0xa002 */
|
||||||
# endif
|
# endif
|
||||||
// components/esp_http_server/include/esp_http_server.h
|
// components/esp_http_server/include/esp_http_server.h
|
||||||
# ifdef ESP_ERR_HTTPD_BASE
|
# ifdef ESP_ERR_HTTPD_BASE
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_BASE), /* 32768 0x8000 Starting number of HTTPD error codes */
|
ERR_TBL_IT(ESP_ERR_HTTPD_BASE), /* 45056 0xb000 Starting number of HTTPD error codes */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_HANDLERS_FULL
|
# ifdef ESP_ERR_HTTPD_HANDLERS_FULL
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_HANDLERS_FULL), /* 32769 0x8001 All slots for registering URI handlers have
|
ERR_TBL_IT(ESP_ERR_HTTPD_HANDLERS_FULL), /* 45057 0xb001 All slots for registering URI handlers
|
||||||
been consumed */
|
have been consumed */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_HANDLER_EXISTS
|
# ifdef ESP_ERR_HTTPD_HANDLER_EXISTS
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_HANDLER_EXISTS), /* 32770 0x8002 URI handler with same method and target URI
|
ERR_TBL_IT(ESP_ERR_HTTPD_HANDLER_EXISTS), /* 45058 0xb002 URI handler with same method and target
|
||||||
already registered */
|
URI already registered */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_INVALID_REQ
|
# ifdef ESP_ERR_HTTPD_INVALID_REQ
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_INVALID_REQ), /* 32771 0x8003 Invalid request pointer */
|
ERR_TBL_IT(ESP_ERR_HTTPD_INVALID_REQ), /* 45059 0xb003 Invalid request pointer */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_RESULT_TRUNC
|
# ifdef ESP_ERR_HTTPD_RESULT_TRUNC
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_RESULT_TRUNC), /* 32772 0x8004 Result string truncated */
|
ERR_TBL_IT(ESP_ERR_HTTPD_RESULT_TRUNC), /* 45060 0xb004 Result string truncated */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_RESP_HDR
|
# ifdef ESP_ERR_HTTPD_RESP_HDR
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_RESP_HDR), /* 32773 0x8005 Response header field larger than supported */
|
ERR_TBL_IT(ESP_ERR_HTTPD_RESP_HDR), /* 45061 0xb005 Response header field larger than supported */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_RESP_SEND
|
# ifdef ESP_ERR_HTTPD_RESP_SEND
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_RESP_SEND), /* 32774 0x8006 Error occured while sending response packet */
|
ERR_TBL_IT(ESP_ERR_HTTPD_RESP_SEND), /* 45062 0xb006 Error occured while sending response packet */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_ALLOC_MEM
|
# ifdef ESP_ERR_HTTPD_ALLOC_MEM
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_ALLOC_MEM), /* 32775 0x8007 Failed to dynamically allocate memory for
|
ERR_TBL_IT(ESP_ERR_HTTPD_ALLOC_MEM), /* 45063 0xb007 Failed to dynamically allocate memory
|
||||||
resource */
|
for resource */
|
||||||
# endif
|
# endif
|
||||||
# ifdef ESP_ERR_HTTPD_TASK
|
# ifdef ESP_ERR_HTTPD_TASK
|
||||||
ERR_TBL_IT(ESP_ERR_HTTPD_TASK), /* 32776 0x8008 Failed to launch server task/thread */
|
ERR_TBL_IT(ESP_ERR_HTTPD_TASK), /* 45064 0xb008 Failed to launch server task/thread */
|
||||||
# endif
|
|
||||||
// components/spi_flash/include/esp_spi_flash.h
|
|
||||||
# ifdef ESP_ERR_FLASH_BASE
|
|
||||||
ERR_TBL_IT(ESP_ERR_FLASH_BASE), /* 65552 0x10010 */
|
|
||||||
# endif
|
|
||||||
# ifdef ESP_ERR_FLASH_OP_FAIL
|
|
||||||
ERR_TBL_IT(ESP_ERR_FLASH_OP_FAIL), /* 65553 0x10011 */
|
|
||||||
# endif
|
|
||||||
# ifdef ESP_ERR_FLASH_OP_TIMEOUT
|
|
||||||
ERR_TBL_IT(ESP_ERR_FLASH_OP_TIMEOUT), /* 65554 0x10012 */
|
|
||||||
# endif
|
# endif
|
||||||
};
|
};
|
||||||
#endif //CONFIG_ESP_ERR_TO_NAME_LOOKUP
|
#endif //CONFIG_ESP_ERR_TO_NAME_LOOKUP
|
||||||
|
|
|
@ -53,7 +53,7 @@ initializer that should be kept in sync
|
||||||
.uri_match_fn = NULL \
|
.uri_match_fn = NULL \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ESP_ERR_HTTPD_BASE (0x8000) /*!< Starting number of HTTPD error codes */
|
#define ESP_ERR_HTTPD_BASE (0xb000) /*!< Starting number of HTTPD error codes */
|
||||||
#define ESP_ERR_HTTPD_HANDLERS_FULL (ESP_ERR_HTTPD_BASE + 1) /*!< All slots for registering URI handlers have been consumed */
|
#define ESP_ERR_HTTPD_HANDLERS_FULL (ESP_ERR_HTTPD_BASE + 1) /*!< All slots for registering URI handlers have been consumed */
|
||||||
#define ESP_ERR_HTTPD_HANDLER_EXISTS (ESP_ERR_HTTPD_BASE + 2) /*!< URI handler with same method and target URI already registered */
|
#define ESP_ERR_HTTPD_HANDLER_EXISTS (ESP_ERR_HTTPD_BASE + 2) /*!< URI handler with same method and target URI already registered */
|
||||||
#define ESP_ERR_HTTPD_INVALID_REQ (ESP_ERR_HTTPD_BASE + 3) /*!< Invalid request pointer */
|
#define ESP_ERR_HTTPD_INVALID_REQ (ESP_ERR_HTTPD_BASE + 3) /*!< Invalid request pointer */
|
||||||
|
|
|
@ -24,7 +24,7 @@ extern "C" {
|
||||||
// gen_esp_err_to_name.py: include this as "esp_ping.h" because "components/lwip/include/apps/" is in the compiler path
|
// gen_esp_err_to_name.py: include this as "esp_ping.h" because "components/lwip/include/apps/" is in the compiler path
|
||||||
// and not "components/lwip/include"
|
// and not "components/lwip/include"
|
||||||
|
|
||||||
#define ESP_ERR_PING_BASE 0x6000
|
#define ESP_ERR_PING_BASE 0xa000
|
||||||
|
|
||||||
#define ESP_ERR_PING_INVALID_PARAMS ESP_ERR_PING_BASE + 0x01
|
#define ESP_ERR_PING_INVALID_PARAMS ESP_ERR_PING_BASE + 0x01
|
||||||
#define ESP_ERR_PING_NO_MEM ESP_ERR_PING_BASE + 0x02
|
#define ESP_ERR_PING_NO_MEM ESP_ERR_PING_BASE + 0x02
|
||||||
|
|
|
@ -28,17 +28,20 @@ extern "C" {
|
||||||
* replacable header. This header should ensure the consistency to esp_err_t.
|
* replacable header. This header should ensure the consistency to esp_err_t.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* These should be consistent with esp_err_t errors */
|
enum {
|
||||||
#define ESP_ERR_FLASH_SIZE_NOT_MATCH ESP_ERR_INVALID_SIZE ///< The chip doesn't have enough space for the current partition table
|
/* These codes should be consistent with esp_err_t errors. However, error codes with the same values are not
|
||||||
#define ESP_ERR_FLASH_NO_RESPONSE ESP_ERR_INVALID_RESPONSE ///< Chip did not respond to the command, or timed out.
|
* allowed in ESP-IDF. This is a workaround in order to not introduce a dependency between the "soc" and
|
||||||
|
* "esp_common" components. The disadvantage is that the output of esp_err_to_name(ESP_ERR_FLASH_SIZE_NOT_MATCH)
|
||||||
|
* will be ESP_ERR_INVALID_SIZE. */
|
||||||
|
ESP_ERR_FLASH_SIZE_NOT_MATCH = ESP_ERR_INVALID_SIZE, ///< The chip doesn't have enough space for the current partition table
|
||||||
|
ESP_ERR_FLASH_NO_RESPONSE = ESP_ERR_INVALID_RESPONSE, ///< Chip did not respond to the command, or timed out.
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
#define ESP_ERR_FLASH_ERR_BASE 0x6000 ///< Starting number of Flash error codes */
|
|
||||||
//The ROM code has already taken 1 and 2, to avoid possible conflicts, start from 3.
|
//The ROM code has already taken 1 and 2, to avoid possible conflicts, start from 3.
|
||||||
#define ESP_ERR_FLASH_NOT_INITIALISED (ESP_ERR_FLASH_ERR_BASE+3) ///< esp_flash_chip_t structure not correctly initialised by esp_flash_init().
|
#define ESP_ERR_FLASH_NOT_INITIALISED (ESP_ERR_FLASH_BASE+3) ///< esp_flash_chip_t structure not correctly initialised by esp_flash_init().
|
||||||
#define ESP_ERR_FLASH_UNSUPPORTED_HOST (ESP_ERR_FLASH_ERR_BASE+4) ///< Requested operation isn't supported via this host SPI bus (chip->spi field).
|
#define ESP_ERR_FLASH_UNSUPPORTED_HOST (ESP_ERR_FLASH_BASE+4) ///< Requested operation isn't supported via this host SPI bus (chip->spi field).
|
||||||
#define ESP_ERR_FLASH_UNSUPPORTED_CHIP (ESP_ERR_FLASH_ERR_BASE+5) ///< Requested operation isn't supported by this model of SPI flash chip.
|
#define ESP_ERR_FLASH_UNSUPPORTED_CHIP (ESP_ERR_FLASH_BASE+5) ///< Requested operation isn't supported by this model of SPI flash chip.
|
||||||
#define ESP_ERR_FLASH_PROTECTED (ESP_ERR_FLASH_ERR_BASE+6) ///< Write operation failed due to chip's write protection being enabled.
|
#define ESP_ERR_FLASH_PROTECTED (ESP_ERR_FLASH_BASE+6) ///< Write operation failed due to chip's write protection being enabled.
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -205,9 +205,9 @@ test_esp_err_to_name_on_host:
|
||||||
script:
|
script:
|
||||||
- cd ${IDF_PATH}/tools/
|
- cd ${IDF_PATH}/tools/
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
||||||
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
|
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
||||||
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
|
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
|
||||||
|
|
||||||
test_esp_efuse_table_on_host:
|
test_esp_efuse_table_on_host:
|
||||||
extends: .host_test_template
|
extends: .host_test_template
|
||||||
|
|
Loading…
Reference in a new issue