Merge branch 'feature/separate_eventloop_from_esp32' into 'master'

separate legacy esp_event from esp32 component to esp_event

See merge request idf/esp-idf!4539
pull/3216/head
Ivan Grokhotkov 2019-03-20 09:59:17 +08:00
commit fe92829971
6 zmienionych plików z 7 dodań i 7 usunięć

Wyświetl plik

@ -25,8 +25,6 @@ else()
"esp_timer_esp32.c" "esp_timer_esp32.c"
"esp_himem.c" "esp_himem.c"
"ets_timer_legacy.c" "ets_timer_legacy.c"
"event_default_handlers.c"
"event_loop.c"
"fast_crypto_ops.c" "fast_crypto_ops.c"
"freertos_hooks.c" "freertos_hooks.c"
"gdbstub.c" "gdbstub.c"
@ -53,12 +51,11 @@ else()
"hwcrypto/sha.c") "hwcrypto/sha.c")
set(COMPONENT_ADD_INCLUDEDIRS "include") set(COMPONENT_ADD_INCLUDEDIRS "include")
set(COMPONENT_REQUIRES driver tcpip_adapter esp_event efuse) set(COMPONENT_REQUIRES driver esp_event efuse)
# driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
# tcpip_adapter is a public requirement because esp_event.h uses tcpip_adapter types
# app_update is added here because cpu_start.c uses esp_ota_get_app_description() function. # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
set(COMPONENT_PRIV_REQUIRES set(COMPONENT_PRIV_REQUIRES
app_trace app_update bootloader_support ethernet log mbedtls nvs_flash app_trace app_update bootloader_support log mbedtls nvs_flash
pthread smartconfig_ack spi_flash vfs wpa_supplicant xtensa-debug-module espcoredump) pthread smartconfig_ack spi_flash vfs wpa_supplicant xtensa-debug-module espcoredump)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32_fragments.lf) set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32_fragments.lf)

Wyświetl plik

@ -1,9 +1,12 @@
set(COMPONENT_SRCS "default_event_loop.c" set(COMPONENT_SRCS "default_event_loop.c"
"esp_event.c" "esp_event.c"
"esp_event_private.c") "esp_event_private.c"
"event_loop.c"
"event_default_handlers.c")
set(COMPONENT_ADD_INCLUDEDIRS "include") set(COMPONENT_ADD_INCLUDEDIRS "include")
set(COMPONENT_PRIV_INCLUDEDIRS "private_include") set(COMPONENT_PRIV_INCLUDEDIRS "private_include")
set(COMPONENT_REQUIRES log) set(COMPONENT_REQUIRES log tcpip_adapter)
set(COMPONENT_PRIV_REQUIRES ethernet)
register_component() register_component()