Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

Revert "fix(comment) remove https:// from lv_conf_template.h comments beacsue they caused nested comment warning"

Browse Source 
The issue wasn't beacause of https:// but with  /*some/url/*/

This reverts commit bc081f6ef3989af14f73e97cd3df3538671dd80b.
This commit is contained in:
Gabor Kiss-Vamosi 2021-04-02 09:46:06 +02:00
parent 28257ff9fa
commit b22aa1497b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lv_conf_template.h
View File

@ -264,7 +264,7 @@ typedef void * lv_user_data_t;
*===================*/ *===================*/
/*Montserrat fonts with ASCII range and some symbols using bpp = 4 /*Montserrat fonts with ASCII range and some symbols using bpp = 4
*fonts.google.com/specimen/Montserrat*/ *https://fonts.google.com/specimen/Montserrat*/
#define LV_FONT_MONTSERRAT_8 0 #define LV_FONT_MONTSERRAT_8 0
#define LV_FONT_MONTSERRAT_10 0 #define LV_FONT_MONTSERRAT_10 0
#define LV_FONT_MONTSERRAT_12 0 #define LV_FONT_MONTSERRAT_12 0
@ -294,7 +294,7 @@ typedef void * lv_user_data_t;
#define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ #define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/
/*Pixel perfect monospace fonts /*Pixel perfect monospace fonts
*pelulamu.net/unscii/*/ *http://pelulamu.net/unscii/*/
#define LV_FONT_UNSCII_8 0 #define LV_FONT_UNSCII_8 0
#define LV_FONT_UNSCII_16 0 #define LV_FONT_UNSCII_16 0
@ -353,7 +353,7 @@ typedef void * lv_user_data_t;
/*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts. /*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts.
*The direction will be processed according to the Unicode Bidirectioanl Algorithm: *The direction will be processed according to the Unicode Bidirectioanl Algorithm:
*www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
#define LV_USE_BIDI 0 #define LV_USE_BIDI 0
#if LV_USE_BIDI #if LV_USE_BIDI
/*Set the default direction. Supported values: /*Set the default direction. Supported values:
@ -371,7 +371,7 @@ typedef void * lv_user_data_t;
* WIDGET USAGE * WIDGET USAGE
*================*/ *================*/
/*Documentation of the widgets: docs.lvgl.io/latest/en/html/widgets/index.html*/ /*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/
#define LV_USE_ARC 1 #define LV_USE_ARC 1

8
src/lv_conf_internal.h
View File

@ -702,7 +702,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
*===================*/ *===================*/
/*Montserrat fonts with ASCII range and some symbols using bpp = 4 /*Montserrat fonts with ASCII range and some symbols using bpp = 4
*fonts.google.com/specimen/Montserrat*/ *https://fonts.google.com/specimen/Montserrat*/
#ifndef LV_FONT_MONTSERRAT_8 #ifndef LV_FONT_MONTSERRAT_8
# ifdef CONFIG_LV_FONT_MONTSERRAT_8 # ifdef CONFIG_LV_FONT_MONTSERRAT_8
# define LV_FONT_MONTSERRAT_8 CONFIG_LV_FONT_MONTSERRAT_8 # define LV_FONT_MONTSERRAT_8 CONFIG_LV_FONT_MONTSERRAT_8
@ -882,7 +882,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
#endif #endif
/*Pixel perfect monospace fonts /*Pixel perfect monospace fonts
*pelulamu.net/unscii/*/ *http://pelulamu.net/unscii/*/
#ifndef LV_FONT_UNSCII_8 #ifndef LV_FONT_UNSCII_8
# ifdef CONFIG_LV_FONT_UNSCII_8 # ifdef CONFIG_LV_FONT_UNSCII_8
# define LV_FONT_UNSCII_8 CONFIG_LV_FONT_UNSCII_8 # define LV_FONT_UNSCII_8 CONFIG_LV_FONT_UNSCII_8
@ -1025,7 +1025,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
/*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts. /*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts.
*The direction will be processed according to the Unicode Bidirectioanl Algorithm: *The direction will be processed according to the Unicode Bidirectioanl Algorithm:
*www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
#ifndef LV_USE_BIDI #ifndef LV_USE_BIDI
# ifdef CONFIG_LV_USE_BIDI # ifdef CONFIG_LV_USE_BIDI
# define LV_USE_BIDI CONFIG_LV_USE_BIDI # define LV_USE_BIDI CONFIG_LV_USE_BIDI
@ -1061,7 +1061,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
* WIDGET USAGE * WIDGET USAGE
*================*/ *================*/
/*Documentation of the widgets: docs.lvgl.io/latest/en/html/widgets/index.html*/ /*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/
#ifndef LV_USE_ARC #ifndef LV_USE_ARC
# ifdef CONFIG_LV_USE_ARC # ifdef CONFIG_LV_USE_ARC