github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore LV_COLOR_HEX macros and add inline functions in addition to them, not instead of them

Browse Source
This commit is contained in:
Amir Gonnen
2019-01-23 01:08:00 +02:00
parent fe479fe261
commit b58e526a0b
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lv_misc/lv_color.h
View File

@@ -392,17 +392,22 @@ static inline uint8_t lv_color_brightness(lv_color_t color)
#endif #endif
#endif #endif
static inline lv_color_t LV_COLOR_HEX(uint32_t c){
return LV_COLOR_MAKE(((uint32_t)(c >> 16) & 0xFF), #define LV_COLOR_HEX(c) LV_COLOR_MAKE(((uint32_t)((uint32_t)c >> 16) & 0xFF), \
((uint32_t)(c >> 8) & 0xFF), ((uint32_t)((uint32_t)c >> 8) & 0xFF), \
(c & 0xFF)); ((uint32_t) c & 0xFF))
}
/*Usage LV_COLOR_HEX3(0x16C) which means LV_COLOR_HEX(0x1166CC)*/ /*Usage LV_COLOR_HEX3(0x16C) which means LV_COLOR_HEX(0x1166CC)*/
static inline lv_color_t LV_COLOR_HEX3(uint32_t c){ #define LV_COLOR_HEX3(c) LV_COLOR_MAKE((((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), \
return LV_COLOR_MAKE((((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), ((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \
((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), ((uint32_t)(c & 0xF) | ((c & 0xF) << 4)))
((uint32_t)(c & 0xF) | ((c & 0xF) << 4)));
static inline lv_color_t lv_color_hex(uint32_t c){
return LV_COLOR_HEX(c);
}
static inline lv_color_t lv_color_hex3(uint32_t c){
return LV_COLOR_HEX3(c);
} }