diff --git a/.gitignore b/.gitignore index c027e556..626c8004 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,13 @@ Module.symvers Mkfile.old dkms.conf +#esp idf +sdkconfig +sdkconfig.old +managed_components/ +dependencies.lock +**/build/ + # Eclipse .metadata/ RemoteSystemsTempFiles/.project @@ -60,9 +67,7 @@ RemoteSystemsTempFiles/.project *.d wifi_manager/.cproject wifi_manager/.project -sdkconfig -sdkconfig.old -**/build/ + #doxygen Doxyfile wifi_manager/doc/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 74ea43d5..8d06d57f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ if(IDF_VERSION_MAJOR GREATER_EQUAL 4) idf_component_register(SRC_DIRS src - REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server + REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server esp_wifi INCLUDE_DIRS src EMBED_FILES src/style.css src/code.js src/index.html) else() set(COMPONENT_SRCDIRS src) set(COMPONENT_ADD_INCLUDEDIRS src) - set(COMPONENT_REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server) + set(COMPONENT_REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server esp_wifi) set(COMPONENT_EMBED_FILES src/style.css src/code.js src/index.html) register_component() endif() diff --git a/examples/default_demo/main/idf_component.yml b/examples/default_demo/main/idf_component.yml new file mode 100644 index 00000000..dd31aa43 --- /dev/null +++ b/examples/default_demo/main/idf_component.yml @@ -0,0 +1,6 @@ +## IDF Component Manager Manifest File +dependencies: + espressif/mdns: + version: "^1.0.3" + rules: + - if: "idf_version >=5.0" diff --git a/examples/default_demo/main/user_main.c b/examples/default_demo/main/user_main.c index 4c11767f..c866ed1e 100644 --- a/examples/default_demo/main/user_main.c +++ b/examples/default_demo/main/user_main.c @@ -30,10 +30,11 @@ SOFTWARE. #include #include #include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "esp_system.h" -#include "esp_log.h" +#include +#include +#include +#include +#include #include "wifi_manager.h" @@ -47,7 +48,7 @@ static const char TAG[] = "main"; void monitoring_task(void *pvParameter) { for(;;){ - ESP_LOGI(TAG, "free heap: %d",esp_get_free_heap_size()); + ESP_LOGI(TAG, "free heap: %"PRIu32, esp_get_free_heap_size()); vTaskDelay( pdMS_TO_TICKS(10000) ); } } diff --git a/examples/http_hook/main/idf_component.yml b/examples/http_hook/main/idf_component.yml new file mode 100644 index 00000000..9d822689 --- /dev/null +++ b/examples/http_hook/main/idf_component.yml @@ -0,0 +1,6 @@ +## IDF Component Manager Manifest File +dependencies: + espressif/mdns: + version: "^1.0.3" + rules: + - if: "idf_version >=5.0" \ No newline at end of file diff --git a/src/wifi_manager.c b/src/wifi_manager.c index 3d11a940..f03c1d2a 100644 --- a/src/wifi_manager.c +++ b/src/wifi_manager.c @@ -34,25 +34,25 @@ Contains the freeRTOS task and all necessary support #include #include #include -#include "esp_system.h" +#include #include #include #include #include #include #include -#include "esp_wifi.h" -#include "esp_event.h" -#include "esp_netif.h" -#include "esp_wifi_types.h" -#include "esp_log.h" -#include "nvs.h" -#include "nvs_flash.h" -#include "mdns.h" -#include "lwip/api.h" -#include "lwip/err.h" -#include "lwip/netdb.h" -#include "lwip/ip4_addr.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "json.h"