Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

examples: removed ip4addr_ntoa and used prefered IP2STR for displaying IP addresses

Browse source
This commit is contained in:
David Cermak 2019-08-20 14:40:34 +02:00
parent d57890cdff
commit ec9f245dd3
15 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/driver/test/esp32/test_adc2.c
View file

@ -46,7 +46,7 @@ static void ip_event_handler(void* arg, esp_event_base_t event_base,
case IP_EVENT_STA_GOT_IP: case IP_EVENT_STA_GOT_IP:
event = (ip_event_got_ip_t*)event_data; event = (ip_event_got_ip_t*)event_data;
ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP");
ESP_LOGI(TAG, "got ip:%s\n", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip));
break; break;
default: default:
break; break;

3
components/esp_wifi/test/esp32/test_wifi.c
View file

@ -64,8 +64,7 @@ static void ip_event_handler(void* arg, esp_event_base_t event_base,
case IP_EVENT_STA_GOT_IP: case IP_EVENT_STA_GOT_IP:
event = (ip_event_got_ip_t*)event_data; event = (ip_event_got_ip_t*)event_data;
ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP");
ESP_LOGI(TAG, "got ip:%s\n", ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
if (wifi_events) { if (wifi_events) {
xEventGroupSetBits(wifi_events, GOT_IP_EVENT); xEventGroupSetBits(wifi_events, GOT_IP_EVENT);
} }

4
components/mdns/test/test_mdns.c
View file

@ -73,8 +73,8 @@ TEST_CASE("mdns api return expected err-code and do not leak memory", "[mdns][le
TEST_CASE("mdns query api return expected err-code and do not leak memory", "[leaks=64]") TEST_CASE("mdns query api return expected err-code and do not leak memory", "[leaks=64]")
{ {
mdns_result_t * results = NULL; mdns_result_t * results = NULL;
ip6_addr_t addr6; esp_ip6_addr_t addr6;
ip4_addr_t addr4; esp_ip4_addr_t addr4;
test_case_uses_tcpip(); test_case_uses_tcpip();
TEST_ASSERT_EQUAL(ESP_OK, esp_event_loop_create_default()); TEST_ASSERT_EQUAL(ESP_OK, esp_event_loop_create_default());

3
examples/mesh/internal_communication/main/mesh_main.c
View file

@ -367,7 +367,8 @@ void ip_event_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data) int32_t event_id, void *event_data)
{ {
ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data; ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:%s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
} }
void app_main(void) void app_main(void)

2
examples/mesh/manual_networking/main/mesh_main.c
View file

@ -292,7 +292,7 @@ void ip_event_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data) int32_t event_id, void *event_data)
{ {
ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data; ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:%s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
} }
void app_main(void) void app_main(void)

3
examples/protocols/esp_local_ctrl/main/app_main.c
View file

@ -55,8 +55,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG,"connect to the AP fail"); ESP_LOGI(TAG,"connect to the AP fail");
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num = 0; s_retry_num = 0;
xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
} }

3
examples/provisioning/ble_prov/main/app_main.c
View file

@ -69,8 +69,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
} }
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num_ap_not_found = 0; s_retry_num_ap_not_found = 0;
s_retry_num_ap_auth_fail = 0; s_retry_num_ap_auth_fail = 0;
} }

3
examples/provisioning/console_prov/main/app_main.c
View file

@ -41,8 +41,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG,"connect to the AP fail"); ESP_LOGI(TAG,"connect to the AP fail");
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num = 0; s_retry_num = 0;
} }
} }

3
examples/provisioning/custom_config/main/app_main.c
View file

@ -41,8 +41,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG,"connect to the AP fail"); ESP_LOGI(TAG,"connect to the AP fail");
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip: " IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num = 0; s_retry_num = 0;
} }
} }

2
examples/provisioning/manager/main/app_main.c
View file

@ -68,7 +68,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
esp_wifi_connect(); esp_wifi_connect();
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "Connected with IP Address:%s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(TAG, "Connected with IP Address:" IPSTR, IP2STR(&event->ip_info.ip));
/* Signal main application to continue execution */ /* Signal main application to continue execution */
xEventGroupSetBits(wifi_event_group, WIFI_CONNECTED_EVENT); xEventGroupSetBits(wifi_event_group, WIFI_CONNECTED_EVENT);
} else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) { } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {

3
examples/provisioning/softap_prov/main/app_main.c
View file

@ -41,8 +41,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG,"connect to the AP fail"); ESP_LOGI(TAG,"connect to the AP fail");
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num = 0; s_retry_num = 0;
} }
} }

2
examples/wifi/fast_scan/main/fast_scan.c
View file

@ -77,7 +77,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
esp_wifi_connect(); esp_wifi_connect();
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip: %s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
} }
} }

3
examples/wifi/getting_started/station/main/station_example_main.c
View file

@ -54,8 +54,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG,"connect to the AP fail"); ESP_LOGI(TAG,"connect to the AP fail");
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip:%s", ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
ip4addr_ntoa(&event->ip_info.ip));
s_retry_num = 0; s_retry_num = 0;
xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
} }

2
examples/wifi/power_save/main/power_save.c
View file

@ -48,7 +48,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
esp_wifi_connect(); esp_wifi_connect();
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip: %s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(TAG, "got ip: " IPSTR, IP2STR(&event->ip_info.ip));
} }
} }

2
examples/wifi/wps/main/wps.c
View file

@ -91,7 +91,7 @@ static void got_ip_event_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data) int32_t event_id, void* event_data)
{ {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data; ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "got ip: %s", ip4addr_ntoa(&event->ip_info.ip)); ESP_LOGI(TAG, "got ip: " IPSTR, IP2STR(&event->ip_info.ip));
} }
/*init wifi as sta and start wps*/ /*init wifi as sta and start wps*/