29 lines
1.1 KiB
CMake
29 lines
1.1 KiB
CMake
<<<<<<< HEAD
|
|
idf_component_register(SRCS "system.c.LOCAL.c" "bt_app.c" "system.c" "bubble.c" "keypad.c" "main.c"
|
|
|
|
"gui.c"
|
|
"lsm6dsv.c"
|
|
INCLUDE_DIRS "."
|
|
REQUIRES "driver"
|
|
"esp_lcd"
|
|
"lvgl"
|
|
"esp_lvgl_port"
|
|
"esp_timer"
|
|
"nvs_flash"
|
|
"bt")
|
|
=======
|
|
idf_component_register(SRCS "bt_app.c" "system.c" "bubble.c" "keypad.c" "main.c"
|
|
|
|
"gui.c"
|
|
"lsm6dsv.c"
|
|
INCLUDE_DIRS "."
|
|
REQUIRES "driver"
|
|
"esp_lcd"
|
|
"lvgl"
|
|
"esp_lvgl_port"
|
|
"esp_timer"
|
|
"nvs_flash"
|
|
"bt")
|
|
>>>>>>> 4feb4c0a98bddb1f2a172ea4b195ce31ba18d442
|
|
|