Merge branch 'bugfix/ESP_ERR_PING_BASE_collision' into 'master'

Change ESP_ERR_PING_BASE because of collision with ESP_ERR_TCPIP_ADAPTER_BASE

See merge request idf/esp-idf!1918
This commit is contained in:
Angus Gratton 2018-02-07 16:27:09 +08:00
commit 75f564d7b5

View file

@ -21,7 +21,7 @@
extern "C" {
#endif
#define ESP_ERR_PING_BASE 0x5000
#define ESP_ERR_PING_BASE 0x6000
#define ESP_ERR_PING_INVALID_PARAMS ESP_ERR_PING_BASE + 0x00
#define ESP_ERR_PING_NO_MEM ESP_ERR_PING_BASE + 0x01