From febc8f7f36458dc06d50d1cd7026f890746ce829 Mon Sep 17 00:00:00 2001 From: Johny Mattsson Date: Wed, 28 Sep 2016 17:57:00 +1000 Subject: [PATCH] Updated to latest IDF. --- components/base_nodemcu/include/nodemcu_esp_event.h | 3 --- components/base_nodemcu/user_main.c | 8 +------- sdk/esp32-esp-idf | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/components/base_nodemcu/include/nodemcu_esp_event.h b/components/base_nodemcu/include/nodemcu_esp_event.h index 8411f72e..d860e597 100644 --- a/components/base_nodemcu/include/nodemcu_esp_event.h +++ b/components/base_nodemcu/include/nodemcu_esp_event.h @@ -57,9 +57,6 @@ // Event callback prototype typedef void (*nodemcu_esp_event_cb) (const system_event_t *event); -// System event queue getter (matching esp_event_loop.h's declaration) -QueueHandle_t esp_event_loop_get_queue (void); - // Internal definitions typedef struct { system_event_id_t event_id; diff --git a/components/base_nodemcu/user_main.c b/components/base_nodemcu/user_main.c index c2b07c2c..0549ba32 100644 --- a/components/base_nodemcu/user_main.c +++ b/components/base_nodemcu/user_main.c @@ -60,12 +60,6 @@ esp_err_t esp_event_send (system_event_t *event) } -QueueHandle_t esp_event_loop_get_queue (void) -{ - return esp_event_queue; -} - - static void handle_esp_event (task_param_t param, task_prio_t prio) { (void)param; @@ -172,7 +166,7 @@ void app_main (void) nodemcu_init (); - nvs_flash_init (6, 3); + nvs_flash_init (); system_init (); tcpip_adapter_init (); diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf index e3ffcd22..e78da309 160000 --- a/sdk/esp32-esp-idf +++ b/sdk/esp32-esp-idf @@ -1 +1 @@ -Subproject commit e3ffcd22d533f30550c53023c2c680a1f234f014 +Subproject commit e78da3093dbd90bc03cd61aefd3e38e556025a29