Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

esp32: update against Dec 21 idf

Browse source 
Freertos in idf has moved around a bit.
This commit is contained in:
Andy Green 2021-12-18 06:36:33 +00:00
parent 9cd7438259
commit f2e43272a7
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -70,6 +70,10 @@ if (ESP_PLATFORM)
include_directories(
$ENV{IDF_PATH}/components/esp_hw_support/include/soc/
$ENV{IDF_PATH}/components/freertos/include/
$ENV{IDF_PATH}/components/freertos/esp_additions/include/
$ENV{IDF_PATH}/components/freertos/esp_additions/include/freertos/
$ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/include/
$ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/portable/linux/include/
$ENV{IDF_PATH}/components/xtensa/${CONFIG_IDF_TARGET}/include/
$ENV{IDF_PATH}/components/freertos/include/esp_additions
$ENV{IDF_PATH}/components/hal/include
@ -795,6 +799,14 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
set(CMAKE_C_FLAGS "-Wall -Wsign-compare ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" )
endif()
if (PICO_SDK_PATH)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wconversion -Wsign-compare -Wstrict-aliasing -Wundef -nolibc")
endif()
if (ESP_PLATFORM AND (CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3))
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlongcalls")
endif()
if ("${DISABLE_WERROR}" STREQUAL "OFF")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
endif()

4
lib/drivers/button/lws-button.c
View file

@ -471,8 +471,8 @@ lws_button_controller_destroy(struct lws_button_state *bcs)
lws_button_enable(bcs, 0, 0);
#if defined(LWS_PLAT_TIMER_DELETE)
LWS_PLAT_TIMER_DELETE(&bcs->timer);
LWS_PLAT_TIMER_DELETE(&bcs->timer_mon);
LWS_PLAT_TIMER_DELETE(bcs->timer);
LWS_PLAT_TIMER_DELETE(bcs->timer_mon);
#endif
lws_free(bcs);

2
lib/drivers/led/led-gpio.c
View file

@ -81,7 +81,7 @@ void
lws_led_gpio_destroy(struct lws_led_state *lcs)
{
#if defined(LWS_PLAT_TIMER_DELETE)
LWS_PLAT_TIMER_DELETE(&lcs->timer);
LWS_PLAT_TIMER_DELETE(lcs->timer);
#endif
lws_free(lcs);
}