From 56a684d9eb9fe51642734bdbe7ea6363476c3294 Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Wed, 31 Aug 2016 19:38:43 +0800
Subject: [PATCH 1/9] task priority: modify lwip/wifi/event task priority

1. Modify lwip core task priority to configMAX_PRIORITIES-7
2. Modify wifi startup task priority to configMAX_PRIORITIES-7
3. Modify event task priority to configMAX_PRIORITIES-4
---
 components/esp32/event.c                     | 2 +-
 components/esp32/wifi.c                      | 2 +-
 components/lwip/include/lwip/port/lwipopts.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/esp32/event.c b/components/esp32/event.c
index 53ffd642eb..366d0371f2 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -359,7 +359,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
 
     g_event_handler = xQueueCreate(CONFIG_WIFI_ENENT_QUEUE_SIZE, sizeof(system_event_t));
 
-    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", CONFIG_WIFI_EVENT_TASK_STACK_SIZE, NULL, 5, NULL, 0); // TODO: rearrange task priority
+    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", CONFIG_WIFI_EVENT_TASK_STACK_SIZE, NULL, configMAX_PRIORITIES-4, NULL, 0);
     return ESP_OK;
 }
 
diff --git a/components/esp32/wifi.c b/components/esp32/wifi.c
index 9900069759..a9d8981012 100644
--- a/components/esp32/wifi.c
+++ b/components/esp32/wifi.c
@@ -107,7 +107,7 @@ esp_err_t esp_wifi_startup(wifi_startup_cb_t cb, void *ctx)
     startup_cb = cb;
     startup_ctx = ctx;
 
-    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", 4096, NULL, 5, NULL, 0);// TODO: rearrange task priority
+    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", 4096, NULL, configMAX_PRIORITIES-7, NULL, 0);
 
     return ESP_OK;
 }
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 26d3c8dcbd..9fe047faba 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -330,7 +330,7 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
  * The priority value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES-5)
+#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES-7)
 
 /**
  * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages

From 9cf997a6fcddd959b26e0113b781e2d38504fa4f Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Thu, 1 Sep 2016 14:09:21 +0800
Subject: [PATCH 2/9] components: esp32/lwip

Add esp_task.h for placing all task priority/stack size macro definition
---
 components/esp32/event.c                     | 3 ++-
 components/esp32/wifi.c                      | 3 ++-
 components/lwip/include/lwip/port/lwipopts.h | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/esp32/event.c b/components/esp32/event.c
index 366d0371f2..213d7f3613 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -19,6 +19,7 @@
 #include "esp_err.h"
 #include "esp_wifi.h"
 #include "esp_event.h"
+#include "esp_task.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -359,7 +360,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
 
     g_event_handler = xQueueCreate(CONFIG_WIFI_ENENT_QUEUE_SIZE, sizeof(system_event_t));
 
-    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", CONFIG_WIFI_EVENT_TASK_STACK_SIZE, NULL, configMAX_PRIORITIES-4, NULL, 0);
+    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", ESP_TASKD_EVENT_STACK, NULL, ESP_TASKD_EVENT_PRIO, NULL, 0);
     return ESP_OK;
 }
 
diff --git a/components/esp32/wifi.c b/components/esp32/wifi.c
index a9d8981012..fd44d30d00 100644
--- a/components/esp32/wifi.c
+++ b/components/esp32/wifi.c
@@ -19,6 +19,7 @@
 #include "esp_err.h"
 #include "esp_wifi.h"
 #include "esp_event.h"
+#include "esp_task.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -107,7 +108,7 @@ esp_err_t esp_wifi_startup(wifi_startup_cb_t cb, void *ctx)
     startup_cb = cb;
     startup_ctx = ctx;
 
-    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", 4096, NULL, configMAX_PRIORITIES-7, NULL, 0);
+    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", ESP_TASK_WIFI_STARTUP_STACK, NULL, ESP_TASK_WIFI_STARTUP_PRIO, NULL, 0);
 
     return ESP_OK;
 }
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 9fe047faba..2dbb1b2f38 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -33,6 +33,7 @@
 #define __LWIPOPTS_H__
 
 #include <stdlib.h>
+#include "esp_task.h"
 
 /* Enable all Espressif-only options */
 #define LWIP_ESP8266
@@ -323,14 +324,14 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
  * The stack size value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_STACKSIZE          2048			//not ok:384
+#define TCPIP_THREAD_STACKSIZE          ESP_TASKD_LWIP_STACK
 
 /**
  * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
  * The priority value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES-7)
+#define TCPIP_THREAD_PRIO               ESP_TASKD_LWIP_PRIO
 
 /**
  * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages

From 109691f9bc7013856267fc6a6ee560953bb1a5e2 Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Thu, 1 Sep 2016 14:18:16 +0800
Subject: [PATCH 3/9] components: esp32

add missing file esp_task.h
---
 components/esp32/include/esp_task.h | 60 +++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 components/esp32/include/esp_task.h

diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
new file mode 100644
index 0000000000..df6a1ed2d6
--- /dev/null
+++ b/components/esp32/include/esp_task.h
@@ -0,0 +1,60 @@
+#ifndef __ESP_TASK_H
+#define __ESP_TASK_H
+
+/* Notes:
+ * 1. Put all task priority and stack size definition in this file
+ * 2. If the task priority is less than 10, use ESP_TASK_PRIO_MIN + X style,
+ *    otherwise use ESP_TASK_PRIO_MAX + X style
+ * 3. If this is a daemon task, the macro prifix is ESP_TASKD_, otherwise
+ *    it's ESP_TASK_
+ * 4. If the configMAX_PRIORITIES is modified, please make all prority are 
+ *    greater than 0
+ * 5. Make sure esp_task.h is consistent between wifi lib and idf
+ */
+
+#define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
+#define ESP_TASK_PRIO_MIN (0)
+
+/* Wifi library task */
+#define ESP_TASKD_WATCHDOG_PRIO       (ESP_TASK_PRIO_MAX - 1)
+#define ESP_TASKD_WATCHDOG_STACK      2048
+#define ESP_TASK_WPA2_PRIO            (ESP_TASK_PRIO_MAX - 1)
+#define ESP_TASK_WPA2_STACK           2048
+#define ESP_TASKD_WIFI_PRIO           (ESP_TASK_PRIO_MAX - 2)
+#define ESP_TASKD_WIFI_STACK          8196
+#define ESP_TASKD_WIFI_TIMER_PRIO     (ESP_TASK_PRIO_MAX - 3)
+#define ESP_TASKD_WIFI_TIMER_STACK    2048
+#define ESP_TASK_WPS_PRIO             (ESP_TASK_PRIO_MIN + 2)
+#define ESP_TASK_WPS_STACK            2048
+
+/* idf task */
+#define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)
+#define ESP_TASKD_EVENT_STACK         2048
+#define ESP_TASK_WIFI_STARTUP_PRIO    (ESP_TASK_PRIO_MAX - 7)
+#define ESP_TASK_WIFI_STARTUP_STACK   4096
+#define ESP_TASKD_LWIP_PRIO           (ESP_TASK_PRIO_MAX - 7)
+#define ESP_TASKD_LWIP_STACK          2048
+#define ESP_TASKD_IDLE_PRIO           0
+#define ESP_TASKD_IDLE_STACK          configMINIMAL_STACK_SIZE
+#define ESP_TASKD_TIMER_PRIO          configTIMER_TASK_PRIORITY
+#define ESP_TASKD_TIMER_STACK         configTIMER_TASK_STACK_DEPTH
+#define ESP_TASK_NVS_PRIO             "TODO"
+#define ESP_TASK_NVS_STACK            "TODO"
+
+/* SSC tasks */
+#define ESP_TASKD_SSC_PRIO            (ESP_TASK_PRIO_MAX - 5)
+#define ESP_TASKD_SSC_STACK           2048
+#define ESP_TASKD_SSC_APP_PRIO        (ESP_TASK_PRIO_MAX - 5)
+#define ESP_TASKD_SSC_APP_STACK       8196
+#define ESP_TASK_SSC_SOCKET_PRIO      (ESP_TASK_PRIO_MAX - 6)
+#define ESP_TASK_SSC_SOCKET_STACK     2048
+#define ESP_TASK_SSC_SSL_PRIO         (ESP_TASK_PRIO_MAX - 6)
+#define ESP_TASK_SSC_SSL_STACK        2048
+
+/* smart config */
+#define ESP_TASK_KISS_PRIO           "TODO"  
+#define ESP_TASK_KISS_STACK          "TODO"
+#define ESP_TASK_TOUCH_PRIO          "TODO"  
+#define ESP_TASK_TOUCH_STACK         "TODO"
+
+#endif

From 2a15eda8bc0b170269563e11f9552627b07a41cc Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Thu, 1 Sep 2016 14:37:19 +0800
Subject: [PATCH 4/9] components: esp32

Remove priority/stack definition of task that is freertos/lwip/app
---
 components/esp32/include/esp_task.h | 46 +++++++++++------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
index df6a1ed2d6..f70af2aee0 100644
--- a/components/esp32/include/esp_task.h
+++ b/components/esp32/include/esp_task.h
@@ -1,10 +1,25 @@
-#ifndef __ESP_TASK_H
-#define __ESP_TASK_H
+#ifndef _ESP_TASK_H_
+#define _ESP_TASK_H_
+
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 
 /* Notes:
  * 1. Put all task priority and stack size definition in this file
  * 2. If the task priority is less than 10, use ESP_TASK_PRIO_MIN + X style,
- *    otherwise use ESP_TASK_PRIO_MAX + X style
+ *    otherwise use ESP_TASK_PRIO_MIN - X style
  * 3. If this is a daemon task, the macro prifix is ESP_TASKD_, otherwise
  *    it's ESP_TASK_
  * 4. If the configMAX_PRIORITIES is modified, please make all prority are 
@@ -12,7 +27,6 @@
  * 5. Make sure esp_task.h is consistent between wifi lib and idf
  */
 
-#define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
 #define ESP_TASK_PRIO_MIN (0)
 
 /* Wifi library task */
@@ -32,29 +46,5 @@
 #define ESP_TASKD_EVENT_STACK         2048
 #define ESP_TASK_WIFI_STARTUP_PRIO    (ESP_TASK_PRIO_MAX - 7)
 #define ESP_TASK_WIFI_STARTUP_STACK   4096
-#define ESP_TASKD_LWIP_PRIO           (ESP_TASK_PRIO_MAX - 7)
-#define ESP_TASKD_LWIP_STACK          2048
-#define ESP_TASKD_IDLE_PRIO           0
-#define ESP_TASKD_IDLE_STACK          configMINIMAL_STACK_SIZE
-#define ESP_TASKD_TIMER_PRIO          configTIMER_TASK_PRIORITY
-#define ESP_TASKD_TIMER_STACK         configTIMER_TASK_STACK_DEPTH
-#define ESP_TASK_NVS_PRIO             "TODO"
-#define ESP_TASK_NVS_STACK            "TODO"
-
-/* SSC tasks */
-#define ESP_TASKD_SSC_PRIO            (ESP_TASK_PRIO_MAX - 5)
-#define ESP_TASKD_SSC_STACK           2048
-#define ESP_TASKD_SSC_APP_PRIO        (ESP_TASK_PRIO_MAX - 5)
-#define ESP_TASKD_SSC_APP_STACK       8196
-#define ESP_TASK_SSC_SOCKET_PRIO      (ESP_TASK_PRIO_MAX - 6)
-#define ESP_TASK_SSC_SOCKET_STACK     2048
-#define ESP_TASK_SSC_SSL_PRIO         (ESP_TASK_PRIO_MAX - 6)
-#define ESP_TASK_SSC_SSL_STACK        2048
-
-/* smart config */
-#define ESP_TASK_KISS_PRIO           "TODO"  
-#define ESP_TASK_KISS_STACK          "TODO"
-#define ESP_TASK_TOUCH_PRIO          "TODO"  
-#define ESP_TASK_TOUCH_STACK         "TODO"
 
 #endif

From 4a980272429362501c6ceb6ab5e82caf0cd529b8 Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Thu, 1 Sep 2016 14:48:12 +0800
Subject: [PATCH 5/9] components: lwip - Modify lwip task priority and stack
 definition method

lwip task priority and stack size defintion should not depends on esp_task.h, define it
in lwipopts.h directly
---
 components/lwip/include/lwip/port/lwipopts.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 2dbb1b2f38..2ffbf071b1 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -33,7 +33,6 @@
 #define __LWIPOPTS_H__
 
 #include <stdlib.h>
-#include "esp_task.h"
 
 /* Enable all Espressif-only options */
 #define LWIP_ESP8266
@@ -324,14 +323,14 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
  * The stack size value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_STACKSIZE          ESP_TASKD_LWIP_STACK
+#define TCPIP_THREAD_STACKSIZE          2048
 
 /**
  * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
  * The priority value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_PRIO               ESP_TASKD_LWIP_PRIO
+#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES - 7)
 
 /**
  * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages

From 8ed5010356c4166d636783671b141ba62ce8fe9f Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Thu, 1 Sep 2016 15:48:59 +0800
Subject: [PATCH 6/9] components: esp32 - fix build error

---
 components/esp32/include/esp_task.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
index f70af2aee0..6f08e0ae40 100644
--- a/components/esp32/include/esp_task.h
+++ b/components/esp32/include/esp_task.h
@@ -27,6 +27,7 @@
  * 5. Make sure esp_task.h is consistent between wifi lib and idf
  */
 
+#define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
 #define ESP_TASK_PRIO_MIN (0)
 
 /* Wifi library task */

From d2d231de29d8d531e5ac5faf5fc94f576fcae47b Mon Sep 17 00:00:00 2001
From: liuzhifu <liuzhifu@espressif.com>
Date: Wed, 14 Sep 2016 09:36:54 +0800
Subject: [PATCH 7/9] define lwip task priority in esp_task.h

---
 components/esp32/include/esp_task.h          | 2 ++
 components/lwip/include/lwip/port/lwipopts.h | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
index 6f08e0ae40..944bc6f6bc 100644
--- a/components/esp32/include/esp_task.h
+++ b/components/esp32/include/esp_task.h
@@ -47,5 +47,7 @@
 #define ESP_TASKD_EVENT_STACK         2048
 #define ESP_TASK_WIFI_STARTUP_PRIO    (ESP_TASK_PRIO_MAX - 7)
 #define ESP_TASK_WIFI_STARTUP_STACK   4096
+#define ESP_TASK_TCPIP_PRIO           (ESP_TASK_PRIO_MAX - 7)
+#define ESP_TASK_TCPIP_STACK          2048
 
 #endif
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 2ffbf071b1..65b3889f0b 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -33,6 +33,7 @@
 #define __LWIPOPTS_H__
 
 #include <stdlib.h>
+#include "esp_task.h"
 
 /* Enable all Espressif-only options */
 #define LWIP_ESP8266
@@ -323,14 +324,14 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
  * The stack size value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_STACKSIZE          2048
+#define TCPIP_THREAD_STACKSIZE          ESP_TASK_TCPIP_STACK
 
 /**
  * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
  * The priority value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES - 7)
+#define TCPIP_THREAD_PRIO               ESP_TASK_TCPIP_PRIO
 
 /**
  * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages

From c1a874fb9e7a7b51f6be0fd91a8dcabe00e9fc7d Mon Sep 17 00:00:00 2001
From: Wu Jian Gang <wujiangang@espressif.com>
Date: Wed, 14 Sep 2016 12:55:41 +0800
Subject: [PATCH 8/9] esp32: fix kconfig

---
 components/esp32/Kconfig            | 12 ++++++------
 components/esp32/event.c            |  2 +-
 components/esp32/include/esp_task.h | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 154ee4150e..5e4cd26c2d 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -24,19 +24,19 @@ config WIFI_AUTO_CONNECT
         If station is enabled, and station config is set, this will enable WiFi
         station auto connect when WiFi startup.
 
-config WIFI_ENENT_QUEUE_SIZE
-    int "WiFi event queue size"
+config SYSTEM_ENENT_QUEUE_SIZE
+    int "system event queue size"
     default 32
     depends on WIFI_ENABLED
     help
-        Config WiFi event queue size in different application.
+        Config system event queue size in different application.
 
-config WIFI_EVENT_TASK_STACK_SIZE
-    int "WiFi event task stack size"
+config SYSTEM_EVENT_TASK_STACK_SIZE
+    int "system event task stack size"
     default 2048
     depends on WIFI_ENABLED
     help
-        Config WiFi event task stack size in different application.
+        Config system event task stack size in different application.
 
 
 config NEWLIB_STDOUT_ADDCR
diff --git a/components/esp32/event.c b/components/esp32/event.c
index 213d7f3613..2be1e08fb2 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -358,7 +358,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
     g_event_handler_cb = cb;
     g_event_ctx = ctx;
 
-    g_event_handler = xQueueCreate(CONFIG_WIFI_ENENT_QUEUE_SIZE, sizeof(system_event_t));
+    g_event_handler = xQueueCreate(CONFIG_SYSTEM_ENENT_QUEUE_SIZE, sizeof(system_event_t));
 
     xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", ESP_TASKD_EVENT_STACK, NULL, ESP_TASKD_EVENT_PRIO, NULL, 0);
     return ESP_OK;
diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
index 944bc6f6bc..6d98bf1983 100644
--- a/components/esp32/include/esp_task.h
+++ b/components/esp32/include/esp_task.h
@@ -1,6 +1,3 @@
-#ifndef _ESP_TASK_H_
-#define _ESP_TASK_H_
-
 // Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 /* Notes:
  * 1. Put all task priority and stack size definition in this file
  * 2. If the task priority is less than 10, use ESP_TASK_PRIO_MIN + X style,
@@ -27,6 +23,11 @@
  * 5. Make sure esp_task.h is consistent between wifi lib and idf
  */
 
+#ifndef _ESP_TASK_H_
+#define _ESP_TASK_H_
+
+#include "sdkconfig.h"
+
 #define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
 #define ESP_TASK_PRIO_MIN (0)
 
@@ -44,7 +45,7 @@
 
 /* idf task */
 #define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)
-#define ESP_TASKD_EVENT_STACK         2048
+#define ESP_TASKD_EVENT_STACK         CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE
 #define ESP_TASK_WIFI_STARTUP_PRIO    (ESP_TASK_PRIO_MAX - 7)
 #define ESP_TASK_WIFI_STARTUP_STACK   4096
 #define ESP_TASK_TCPIP_PRIO           (ESP_TASK_PRIO_MAX - 7)

From 01cc811ee00338149b45416fc6052e82da0e2502 Mon Sep 17 00:00:00 2001
From: Wu Jian Gang <wujiangang@espressif.com>
Date: Wed, 14 Sep 2016 13:26:17 +0800
Subject: [PATCH 9/9] esp32: fix typo

---
 components/esp32/Kconfig | 2 +-
 components/esp32/event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 5e4cd26c2d..36c6f7af8e 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -24,7 +24,7 @@ config WIFI_AUTO_CONNECT
         If station is enabled, and station config is set, this will enable WiFi
         station auto connect when WiFi startup.
 
-config SYSTEM_ENENT_QUEUE_SIZE
+config SYSTEM_EVENT_QUEUE_SIZE
     int "system event queue size"
     default 32
     depends on WIFI_ENABLED
diff --git a/components/esp32/event.c b/components/esp32/event.c
index 2be1e08fb2..c1d9d4e73b 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -358,7 +358,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
     g_event_handler_cb = cb;
     g_event_ctx = ctx;
 
-    g_event_handler = xQueueCreate(CONFIG_SYSTEM_ENENT_QUEUE_SIZE, sizeof(system_event_t));
+    g_event_handler = xQueueCreate(CONFIG_SYSTEM_EVENT_QUEUE_SIZE, sizeof(system_event_t));
 
     xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", ESP_TASKD_EVENT_STACK, NULL, ESP_TASKD_EVENT_PRIO, NULL, 0);
     return ESP_OK;