From 1cd5a36bdf82c96fad7d76a4d79a030b92cd270d Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Thu, 24 May 2018 20:59:16 +0800 Subject: [PATCH] feat: Don't use esp_common.h in SDK --- components/esp8266/include/esp_wifi.h | 2 ++ components/lwip/apps/dhcpserver/dhcpserver.c | 3 ++- examples/get-started/project_template/main/user_main.c | 5 ++++- examples/protocols/mqtt/main/user_main.c | 5 ++++- examples/protocols/openssl_demo/main/user_main.c | 6 +++++- examples/storage/spiffs_test/main/test_main.c | 4 ++-- examples/storage/spiffs_test/main/testrunner.c | 1 - examples/wifi/smart_config/main/user_main.c | 4 +--- examples/wifi/wifi_station_machine/main/user_main.c | 7 ++++++- .../wifi/wifi_station_machine/main/wifi_state_machine.c | 1 - 10 files changed, 26 insertions(+), 12 deletions(-) diff --git a/components/esp8266/include/esp_wifi.h b/components/esp8266/include/esp_wifi.h index 2a3485cf..2fb01e66 100644 --- a/components/esp8266/include/esp_wifi.h +++ b/components/esp8266/include/esp_wifi.h @@ -27,6 +27,8 @@ #include +#include "lwip/ip_addr.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index cce9531c..c2082b69 100644 --- a/components/lwip/apps/dhcpserver/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -16,7 +16,8 @@ #include #include -#include "esp_common.h" +#include "esp_misc.h" + #include "sdkconfig.h" #include "lwip/inet.h" #include "lwip/err.h" diff --git a/examples/get-started/project_template/main/user_main.c b/examples/get-started/project_template/main/user_main.c index 781c33a6..034f71f5 100644 --- a/examples/get-started/project_template/main/user_main.c +++ b/examples/get-started/project_template/main/user_main.c @@ -6,7 +6,10 @@ CONDITIONS OF ANY KIND, either express or implied. */ -#include "esp_common.h" +#include +#include + +#include /****************************************************************************** * FunctionName : user_rf_cal_sector_set diff --git a/examples/protocols/mqtt/main/user_main.c b/examples/protocols/mqtt/main/user_main.c index e1639ce2..6a904673 100644 --- a/examples/protocols/mqtt/main/user_main.c +++ b/examples/protocols/mqtt/main/user_main.c @@ -7,10 +7,13 @@ CONDITIONS OF ANY KIND, either express or implied. */ +#include #include #include -#include "esp_common.h" +#include "esp_sta.h" +#include "esp_system.h" + #include "user_config.h" /****************************************************************************** diff --git a/examples/protocols/openssl_demo/main/user_main.c b/examples/protocols/openssl_demo/main/user_main.c index 8794af7f..d5a3adec 100644 --- a/examples/protocols/openssl_demo/main/user_main.c +++ b/examples/protocols/openssl_demo/main/user_main.c @@ -7,10 +7,14 @@ CONDITIONS OF ANY KIND, either express or implied. */ +#include #include #include -#include "esp_common.h" +#include "esp_sta.h" +#include "esp_system.h" +#include "esp_wifi.h" + #include "user_config.h" /****************************************************************************** diff --git a/examples/storage/spiffs_test/main/test_main.c b/examples/storage/spiffs_test/main/test_main.c index c6e31f72..80c5ebd4 100644 --- a/examples/storage/spiffs_test/main/test_main.c +++ b/examples/storage/spiffs_test/main/test_main.c @@ -72,10 +72,10 @@ void spiffs_fs1_init(void) * Parameters : none * Returns : rf cal sector *******************************************************************************/ -uint32 user_rf_cal_sector_set(void) +uint32_t user_rf_cal_sector_set(void) { flash_size_map size_map = system_get_flash_size_map(); - uint32 rf_cal_sec = 0; + uint32_t rf_cal_sec = 0; switch (size_map) { case FLASH_SIZE_4M_MAP_256_256: diff --git a/examples/storage/spiffs_test/main/testrunner.c b/examples/storage/spiffs_test/main/testrunner.c index 3b7915ae..8906c6e5 100644 --- a/examples/storage/spiffs_test/main/testrunner.c +++ b/examples/storage/spiffs_test/main/testrunner.c @@ -16,7 +16,6 @@ //#include #include -#include "esp_common.h" #include "testrunner.h" static struct { diff --git a/examples/wifi/smart_config/main/user_main.c b/examples/wifi/smart_config/main/user_main.c index eade5248..f6dc2e6a 100644 --- a/examples/wifi/smart_config/main/user_main.c +++ b/examples/wifi/smart_config/main/user_main.c @@ -7,15 +7,13 @@ CONDITIONS OF ANY KIND, either express or implied. */ -#include "esp_common.h" - #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "lwip/sockets.h" #include "lwip/dns.h" #include "lwip/netdb.h" -#include "espconn.h" + #include "airkiss.h" #define server_ip "192.168.101.142" diff --git a/examples/wifi/wifi_station_machine/main/user_main.c b/examples/wifi/wifi_station_machine/main/user_main.c index dc7dbf48..bc89c326 100644 --- a/examples/wifi/wifi_station_machine/main/user_main.c +++ b/examples/wifi/wifi_station_machine/main/user_main.c @@ -7,7 +7,12 @@ CONDITIONS OF ANY KIND, either express or implied. */ -#include "esp_common.h" +#include +#include + +#include "esp_system.h" +#include "esp_timer.h" + #include "user_config.h" static os_timer_t timer; diff --git a/examples/wifi/wifi_station_machine/main/wifi_state_machine.c b/examples/wifi/wifi_station_machine/main/wifi_state_machine.c index 5bfeff30..23ea2490 100644 --- a/examples/wifi/wifi_station_machine/main/wifi_state_machine.c +++ b/examples/wifi/wifi_station_machine/main/wifi_state_machine.c @@ -12,7 +12,6 @@ #include "lwip/ip_addr.h" #include "esp_libc.h" #include "esp_misc.h" -#include "esp_common.h" #include "esp_wifi.h" #include "esp_sta.h" #include "esp_softap.h"