mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-23 08:55:04 +00:00
Compare commits
No commits in common. "261796068e7ef19214d7956759e09967b6a61486" and "6c4a9975a44cceae02f26d582bb5565944b978ab" have entirely different histories.
261796068e
...
6c4a9975a4
@ -16,8 +16,6 @@ CONFIG_LV_USE_MSGBOX=n
|
|||||||
CONFIG_LV_USE_SPINNER=n
|
CONFIG_LV_USE_SPINNER=n
|
||||||
CONFIG_LV_USE_WIN=n
|
CONFIG_LV_USE_WIN=n
|
||||||
CONFIG_LV_USE_SNAPSHOT=y
|
CONFIG_LV_USE_SNAPSHOT=y
|
||||||
CONFIG_LV_BUILD_EXAMPLES=n
|
|
||||||
CONFIG_LV_BUILD_DEMOS=n
|
|
||||||
CONFIG_FREERTOS_HZ=1000
|
CONFIG_FREERTOS_HZ=1000
|
||||||
CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
|
CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
|
||||||
CONFIG_FREERTOS_SMP=n
|
CONFIG_FREERTOS_SMP=n
|
||||||
|
|||||||
@ -104,8 +104,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
add_subdirectory(Libraries/SDL) # Added as idf component for ESP and as library for other targets
|
add_subdirectory(Libraries/SDL) # Added as idf component for ESP and as library for other targets
|
||||||
|
|
||||||
# LVGL
|
# LVGL
|
||||||
set(CONFIG_LV_BUILD_DEMOS OFF CACHE BOOL "" FORCE)
|
add_compile_definitions($<$<BOOL:${LV_USE_DRAW_SDL}>:LV_USE_DRAW_SDL=1>)
|
||||||
set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
|
||||||
add_subdirectory(Libraries/lvgl) # Added as idf component for ESP and as library for other targets
|
add_subdirectory(Libraries/lvgl) # Added as idf component for ESP and as library for other targets
|
||||||
target_link_libraries(lvgl PRIVATE SDL2-static)
|
target_link_libraries(lvgl PRIVATE SDL2-static)
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
#include <tt_init.h>
|
#include <tt_init.h>
|
||||||
#else
|
|
||||||
#include <Simulator.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Each board project declares this variable
|
// Each board project declares this variable
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
|
file(GLOB SOURCES "cJSON/*.c")
|
||||||
|
|
||||||
add_library(cJSON STATIC)
|
add_library(cJSON STATIC)
|
||||||
target_sources(cJSON PRIVATE cJSON/cJSON.c cJSON/cJSON_Utils.c)
|
target_sources(cJSON PRIVATE ${SOURCES})
|
||||||
include_directories(cJSON "cJSON/")
|
include_directories(cJSON "cJSON/")
|
||||||
target_include_directories(cJSON PUBLIC "cJSON/")
|
target_include_directories(cJSON PUBLIC "cJSON/")
|
||||||
|
|||||||
@ -902,14 +902,12 @@
|
|||||||
*==================*/
|
*==================*/
|
||||||
|
|
||||||
/*Enable the examples to be built with the library*/
|
/*Enable the examples to be built with the library*/
|
||||||
#define LV_BUILD_EXAMPLES 0
|
#define LV_BUILD_EXAMPLES 1
|
||||||
|
|
||||||
/*===================
|
/*===================
|
||||||
* DEMO USAGE
|
* DEMO USAGE
|
||||||
====================*/
|
====================*/
|
||||||
|
|
||||||
#define LV_BUILD_DEMOS 0
|
|
||||||
|
|
||||||
/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
|
/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
|
||||||
#define LV_USE_DEMO_WIDGETS 0
|
#define LV_USE_DEMO_WIDGETS 0
|
||||||
#if LV_USE_DEMO_WIDGETS
|
#if LV_USE_DEMO_WIDGETS
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user