Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-22 15:24:16 +08:00
Code Issues Actions 49 Packages Projects Releases Wiki Activity

docs(overview): remove conflict marker (#9733)

Browse Source
This commit is contained in:
André Costa
2026-02-12 21:18:31 +01:00
committed by GitHub
parent d7aeb4a04e
commit bfe3844711
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/src/integration/overview.rst
-6
View File
@@ -292,7 +292,6 @@ LVGL run again later:
- wait for an event that you will trigger when LVGL needs to run again, or
- sleep the CPU (not just the thread)
<<<<<<< HEAD
Also check the :ref:`lvgl_and_threads` section of the documentation to learn more
about the considerations when using LVGL in an operating system.
@@ -302,11 +301,6 @@ Sleep Management
The MCU can go to sleep when no user input has been received for a certain period.
In this case, the main ``while(1)`` could look like this:
=======
:cpp:func:`lv_display_get_inactive_time` can also be used to go to sleep when
no user input has been received for a certain period. In this case, the main
``while(1)`` could look like this:
>>>>>>> d74b4efe2 (integration reord ready, compiles well)
.. code-block:: c