diff --git a/lv_conf_templ.h b/lv_conf_templ.h index c3c3d3dbbc..e2417f6aa9 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -68,6 +68,7 @@ /*Color settings*/ #define LV_COLOR_DEPTH 16 /*Color depth: 1/8/16/24*/ +#define LV_COLOR_16_SWAP 1 /*Swap the 2 bytes of RGB565 color. Useful if the display has a 8 bit interface (e.g. SPI)*/ #define LV_COLOR_TRANSP LV_COLOR_LIME /*Images pixels with this color will not be drawn (with chroma keying)*/ /*Text settings*/ diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c index d6bf902997..d9897647c6 100644 --- a/lv_core/lv_refr.c +++ b/lv_core/lv_refr.c @@ -292,7 +292,6 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p) /*Round down the lines of VDB if rounding is added*/ if(round_cb) { - /**/ lv_area_t tmp; tmp.x1 = 0; tmp.x2 = 0; @@ -303,14 +302,14 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p) do { tmp.y2 = y_tmp; round_cb(&tmp); - y_tmp --; /*Decrement the number of line until it is rounded to a smaller value the original. */ - } while(tmp.y2 > max_row && y_tmp != 0); + y_tmp --; /*Decrement the number of line until it is rounded to a smaller (or equal) value then the original. */ + } while(lv_area_get_height(&tmp) > max_row && y_tmp != 0); if(y_tmp == 0) { LV_LOG_WARN("Can't set VDB height using the round function. (Wrong round_cb or to small VDB)"); return; } else { - max_row = tmp.y2; + max_row = tmp.y2 + 1; } } diff --git a/lv_draw/lv_draw_rect.c b/lv_draw/lv_draw_rect.c index 269999dcc9..241a148c7b 100644 --- a/lv_draw/lv_draw_rect.c +++ b/lv_draw/lv_draw_rect.c @@ -471,7 +471,7 @@ static void lv_draw_rect_border_straight(const lv_area_t * coords, const lv_area lv_coord_t width = lv_area_get_width(coords); lv_coord_t height = lv_area_get_height(coords); uint16_t bwidth = style->body.border.width; - lv_opa_t opa = (uint16_t)((uint16_t) style->body.border.opa * opa_scale) >> 8; + lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->body.border.opa : (uint16_t)((uint16_t) style->body.border.opa * opa_scale) >> 8; lv_border_part_t part = style->body.border.part; lv_color_t color = style->body.border.color; lv_area_t work_area; diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index 2ba1d90e30..fad8a21e5a 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -62,6 +62,8 @@ static void sw_color_fill(lv_area_t * mem_area, lv_color_t * mem, const lv_area_ */ void lv_vpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa) { + if(opa == LV_OPA_TRANSP) return; + lv_vdb_t * vdb_p = lv_vdb_get(); /*Pixel out of the mask*/ @@ -100,6 +102,8 @@ void lv_vpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t col void lv_vfill(const lv_area_t * cords_p, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa) { + if(opa == LV_OPA_TRANSP) return; + lv_area_t res_a; bool union_ok; lv_vdb_t * vdb_p = lv_vdb_get(); @@ -220,6 +224,9 @@ void lv_vletter(const lv_point_t * pos_p, const lv_area_t * mask_p, 204, 221, 238, 255 }; + + if(opa == LV_OPA_TRANSP) return; + if(font_p == NULL) { LV_LOG_WARN("Font: character's bitmap not found"); return; @@ -357,6 +364,8 @@ void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p, lv_color_t recolor, lv_opa_t recolor_opa) { + if(opa == LV_OPA_TRANSP) return; + lv_area_t masked_a; bool union_ok; lv_vdb_t * vdb_p = lv_vdb_get(); diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h index 5d1bd51cc5..c343f4f272 100644 --- a/lv_misc/lv_color.h +++ b/lv_misc/lv_color.h @@ -96,9 +96,21 @@ typedef union { struct { +#if LV_COLOR_16_SWAP == 0 uint16_t blue :5; uint16_t green :6; uint16_t red :5; +#else +// uint16_t blue :5; +// uint16_t green_h :3; +// uint16_t green_l :3; +// uint16_t red :5; + + uint16_t green_h :3; + uint16_t red :5; + uint16_t blue :5; + uint16_t green_l :3; +#endif }; uint16_t full; } lv_color16_t; @@ -171,10 +183,17 @@ static inline uint8_t lv_color_to1(lv_color_t color) return 0; } #elif LV_COLOR_DEPTH == 16 +# if LV_COLOR_16_SWAP == 0 if((color.red & 0x10) || (color.green & 0x20) || (color.blue & 0x10)) { return 1; +# else + if((color.red & 0x10) || + (color.green_h & 0x20) || + (color.blue & 0x10)) { + return 1; +# endif } else { return 0; } @@ -197,11 +216,20 @@ static inline uint8_t lv_color_to8(lv_color_t color) #elif LV_COLOR_DEPTH == 8 return color.full; #elif LV_COLOR_DEPTH == 16 + +# if LV_COLOR_16_SWAP == 0 lv_color8_t ret; ret.red = color.red >> 2; /* 5 - 3 = 2*/ ret.green = color.green >> 3; /* 6 - 3 = 3*/ ret.blue = color.blue >> 3; /* 5 - 2 = 3*/ return ret.full; +# else + lv_color8_t ret; + ret.red = color.red >> 2; /* 5 - 3 = 2*/ + ret.green = color.green_h; /* 6 - 3 = 3*/ + ret.blue = color.blue >> 3; /* 5 - 2 = 3*/ + return ret.full; +# endif #elif LV_COLOR_DEPTH == 24 lv_color8_t ret; ret.red = color.red >> 5; /* 8 - 3 = 5*/ @@ -246,12 +274,21 @@ static inline uint32_t lv_color_to24(lv_color_t color) ret.alpha = 0xFF; return ret.full; #elif LV_COLOR_DEPTH == 16 +# if LV_COLOR_16_SWAP == 0 lv_color24_t ret; ret.red = color.red * 8; /*(2^8 - 1)/(2^5 - 1) = 255/31 = 8*/ ret.green = color.green * 4; /*(2^8 - 1)/(2^6 - 1) = 255/63 = 4*/ ret.blue = color.blue * 8; /*(2^8 - 1)/(2^5 - 1) = 255/31 = 8*/ ret.alpha = 0xFF; return ret.full; +# else + lv_color24_t ret; + ret.red = color.red * 8; /*(2^8 - 1)/(2^5 - 1) = 255/31 = 8*/ + ret.green = ((color.green_h << 3) + color.green_l) * 4; /*(2^8 - 1)/(2^6 - 1) = 255/63 = 4*/ + ret.blue = color.blue * 8; /*(2^8 - 1)/(2^5 - 1) = 255/31 = 8*/ + ret.alpha = 0xFF; + return ret.full; +# endif #elif LV_COLOR_DEPTH == 24 return color.full; #endif @@ -262,7 +299,15 @@ static inline lv_color_t lv_color_mix(lv_color_t c1, lv_color_t c2, uint8_t mix) lv_color_t ret; #if LV_COLOR_DEPTH != 1 ret.red = (uint16_t)((uint16_t) c1.red * mix + (c2.red * (255 - mix))) >> 8; +# if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP + uint16_t g_1 = (c1.green_h << 3) + c1.green_l; + uint16_t g_2 = (c2.green_h << 3) + c2.green_l; + uint16_t g_out = (uint16_t)((uint16_t) g_1 * mix + (g_2 * (255 - mix))) >> 8; + ret.green_h = g_out >> 3; + ret.green_l = g_out & 0x7; +# else ret.green = (uint16_t)((uint16_t) c1.green * mix + (c2.green * (255 - mix))) >> 8; +# endif ret.blue = (uint16_t)((uint16_t) c1.blue * mix + (c2.blue * (255 - mix))) >> 8; # if LV_COLOR_DEPTH == 24 ret.alpha = 0xFF; @@ -295,7 +340,11 @@ static inline uint8_t lv_color_brightness(lv_color_t color) #elif LV_COLOR_DEPTH == 8 #define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){{b8 >> 6, g8 >> 5, r8 >> 5}}) #elif LV_COLOR_DEPTH == 16 -#define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){{b8 >> 3, g8 >> 2, r8 >> 3}}) +# if LV_COLOR_16_SWAP == 0 +# define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){{b8 >> 3, g8 >> 2, r8 >> 3}}) +# else +# define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){{g8 >> 5, r8 >> 3, b8 >> 3, (g8 >> 2) & 0x7}}) +# endif #elif LV_COLOR_DEPTH == 24 #define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){{b8, g8, r8, 0xff}}) /*Fix 0xff alpha*/ #endif diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c index 409d2c1235..2e400937ce 100644 --- a/lv_objx/lv_btn.c +++ b/lv_objx/lv_btn.c @@ -389,14 +389,12 @@ static bool lv_btn_design(lv_obj_t * btn, const lv_area_t * mask, lv_design_mode } else if(mode == LV_DESIGN_DRAW_MAIN) { - ancestor_design(btn, mask, mode); #if USE_LV_ANIMATION if(btn != ink_obj) { - lv_style_t * style = lv_obj_get_style(btn); - lv_draw_rect(&btn->coords, mask, style, LV_OPA_COVER); + ancestor_design(btn, mask, mode); } else { - lv_btn_ext_t * ext = lv_obj_get_ext_attr(btn); lv_opa_t opa_scale = lv_obj_get_opa_scale(btn); + lv_btn_ext_t * ext = lv_obj_get_ext_attr(btn); /*Draw the normal button*/ lv_draw_rect(&btn->coords, mask, ext->styles[ink_bg_state], opa_scale); @@ -436,6 +434,8 @@ static bool lv_btn_design(lv_obj_t * btn, const lv_area_t * mask, lv_design_mode /*Draw the circle*/ lv_draw_rect(&cir_area, mask, &cir_style, opa_scale); } +#else + ancestor_design(btn, mask, mode); #endif } else if(mode == LV_DESIGN_DRAW_POST) {