sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

[lvgl] Bugfixes (#7896)

Browse Source
This commit is contained in:
Clyde Stubbs
2024-12-03 17:50:11 +11:00
committed by GitHub
parent dc5942a59b
commit c95887a14a
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/lvgl/defines.py
View File

@@ -38,7 +38,7 @@ def literal(arg):
def call_lambda(lamb: LambdaExpression): def call_lambda(lamb: LambdaExpression):
expr = lamb.content.strip() expr = lamb.content.strip()
if expr.startswith("return") and expr.endswith(";"): if expr.startswith("return") and expr.endswith(";"):
return expr[7:][:-1] return expr[6:][:-1].strip()
return f"{lamb}()" return f"{lamb}()"

3
esphome/components/lvgl/lvgl_esphome.h
View File

@@ -56,6 +56,9 @@ static const display::ColorBitness LV_BITNESS = display::ColorBitness::COLOR_BIT
inline void lv_img_set_src(lv_obj_t *obj, esphome::image::Image *image) { inline void lv_img_set_src(lv_obj_t *obj, esphome::image::Image *image) {
lv_img_set_src(obj, image->get_lv_img_dsc()); lv_img_set_src(obj, image->get_lv_img_dsc());
} }
inline void lv_disp_set_bg_image(lv_disp_t *disp, esphome::image::Image *image) {
lv_disp_set_bg_image(disp, image->get_lv_img_dsc());
}
#endif // USE_LVGL_IMAGE #endif // USE_LVGL_IMAGE
#ifdef USE_LVGL_ANIMIMG #ifdef USE_LVGL_ANIMIMG
inline void lv_animimg_set_src(lv_obj_t *img, std::vector<image::Image *> images) { inline void lv_animimg_set_src(lv_obj_t *img, std::vector<image::Image *> images) {

6
esphome/components/lvgl/widgets/line.py
View File

@@ -35,6 +35,11 @@ LINE_SCHEMA = {
cv.GenerateID(CONF_POINT_LIST_ID): cv.declare_id(lv_point_t), cv.GenerateID(CONF_POINT_LIST_ID): cv.declare_id(lv_point_t),
} }
LINE_MODIFY_SCHEMA = {
cv.Optional(CONF_POINTS): cv_point_list,
cv.GenerateID(CONF_POINT_LIST_ID): cv.declare_id(lv_point_t),
}
class LineType(WidgetType): class LineType(WidgetType):
def __init__(self): def __init__(self):
@@ -43,6 +48,7 @@ class LineType(WidgetType):
LvType("lv_line_t"), LvType("lv_line_t"),
(CONF_MAIN,), (CONF_MAIN,),
LINE_SCHEMA, LINE_SCHEMA,
modify_schema=LINE_MODIFY_SCHEMA,
) )
async def to_code(self, w: Widget, config): async def to_code(self, w: Widget, config):

4
tests/components/lvgl/lvgl-package.yaml
View File

@@ -337,7 +337,7 @@ lvgl:
id: button_button id: button_button
width: 20% width: 20%
height: 10% height: 10%
transform_angle: !lambda return 180*100; transform_angle: !lambda return(180*100);
arc_width: !lambda return 4; arc_width: !lambda return 4;
border_width: !lambda return 6; border_width: !lambda return 6;
shadow_ofs_x: !lambda return 6; shadow_ofs_x: !lambda return 6;
@@ -581,7 +581,7 @@ lvgl:
- 180, 60 - 180, 60
- 240, 10 - 240, 10
on_click: on_click:
- lvgl.widget.update: - lvgl.line.update:
id: lv_line_id id: lv_line_id
line_color: 0xFFFF line_color: 0xFFFF
- lvgl.page.next: - lvgl.page.next: