esp32: follow idf meddlings

warmcat · Sep 12, 2018 · ee250c0 · ee250c0
1 parent d8cf6e7
commit ee250c0
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 68 deletions.
diff --git a/lib/plat/esp32/esp32-fds.c b/lib/plat/esp32/esp32-fds.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-#include <esp_task_wdt.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
 
 void
 lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)

diff --git a/lib/plat/esp32/esp32-file.c b/lib/plat/esp32/esp32-file.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
 
 int lws_plat_apply_FD_CLOEXEC(int n)
 {

diff --git a/lib/plat/esp32/esp32-helpers.c b/lib/plat/esp32/esp32-helpers.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
 
 #include "misc/romfs.h"
 #include <esp_ota_ops.h>

diff --git a/lib/plat/esp32/esp32-init.c b/lib/plat/esp32/esp32-init.c
@@ -20,15 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
-
 
 int
 lws_plat_context_early_init(void)

diff --git a/lib/plat/esp32/esp32-misc.c b/lib/plat/esp32/esp32-misc.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
 
 unsigned long long time_in_microseconds(void)
 {

diff --git a/lib/plat/esp32/esp32-pipe.c b/lib/plat/esp32/esp32-pipe.c
@@ -20,15 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
-
 
 int
 lws_plat_pipe_create(struct lws *wsi)

diff --git a/lib/plat/esp32/esp32-service.c b/lib/plat/esp32/esp32-service.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
 
 int
 lws_plat_service(struct lws_context *context, int timeout_ms)

diff --git a/lib/plat/esp32/esp32-sockets.c b/lib/plat/esp32/esp32-sockets.c
@@ -20,14 +20,6 @@
  */
 
 #include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
 
 int
 lws_send_pipe_choked(struct lws *wsi)

diff --git a/lib/plat/esp32/private.h b/lib/plat/esp32/private.h
@@ -39,6 +39,15 @@
  #include <signal.h>
  #include <sys/socket.h>
 
+#include "freertos/timers.h"
+#include <esp_attr.h>
+#include <esp_system.h>
+#include <esp_task_wdt.h>
+
+#include "lwip/apps/sntp.h"
+
+#include <lwip/sockets.h>
+
  #if defined(LWS_BUILTIN_GETIFADDRS)
   #include "./misc/getifaddrs.h"
  #endif

diff --git a/scripts/esp32.mk b/scripts/esp32.mk
@@ -98,14 +98,14 @@ lws_flash_ota: $(LWS_BUILD_PATH)/pack.img
 		--chip esp32 \
 		--port $(ESPPORT) \
 		--baud $(CONFIG_ESPTOOLPY_BAUD) \
-		write_flash 0x110000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin
+		write_flash 0x120000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin
 
 lws_erase_ota:
 	$(IDF_PATH)/components/esptool_py/esptool/esptool.py \
 	        --chip esp32 \
 	        --port $(ESPPORT) \
 	        --baud $(CONFIG_ESPTOOLPY_BAUD) \
-	        erase_region 0x110000 0x2f0000
+	        erase_region 0x120000 0x2e0000
 
 
 export A