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] Fix meter rotation (#10342)

Browse Source
This commit is contained in:
Clyde Stubbs
2025-08-25 06:52:37 +10:00
committed by GitHub
parent 8fe582309e
commit a58c3950bc
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/lvgl/widgets/canvas.py
View File

@@ -24,7 +24,7 @@ from ..defines import (
literal, literal,
) )
from ..lv_validation import ( from ..lv_validation import (
lv_angle, lv_angle_degrees,
lv_bool, lv_bool,
lv_color, lv_color,
lv_image, lv_image,
@@ -395,15 +395,15 @@ ARC_PROPS = {
DRAW_OPA_SCHEMA.extend( DRAW_OPA_SCHEMA.extend(
{ {
cv.Required(CONF_RADIUS): pixels, cv.Required(CONF_RADIUS): pixels,
cv.Required(CONF_START_ANGLE): lv_angle, cv.Required(CONF_START_ANGLE): lv_angle_degrees,
cv.Required(CONF_END_ANGLE): lv_angle, cv.Required(CONF_END_ANGLE): lv_angle_degrees,
} }
).extend({cv.Optional(prop): validator for prop, validator in ARC_PROPS.items()}), ).extend({cv.Optional(prop): validator for prop, validator in ARC_PROPS.items()}),
) )
async def canvas_draw_arc(config, action_id, template_arg, args): async def canvas_draw_arc(config, action_id, template_arg, args):
radius = await size.process(config[CONF_RADIUS]) radius = await size.process(config[CONF_RADIUS])
start_angle = await lv_angle.process(config[CONF_START_ANGLE]) start_angle = await lv_angle_degrees.process(config[CONF_START_ANGLE])
end_angle = await lv_angle.process(config[CONF_END_ANGLE]) end_angle = await lv_angle_degrees.process(config[CONF_END_ANGLE])
async def do_draw_arc(w: Widget, x, y, dsc_addr): async def do_draw_arc(w: Widget, x, y, dsc_addr):
lv.canvas_draw_arc(w.obj, x, y, radius, start_angle, end_angle, dsc_addr) lv.canvas_draw_arc(w.obj, x, y, radius, start_angle, end_angle, dsc_addr)

9
esphome/components/lvgl/widgets/meter.py
View File

@@ -14,7 +14,6 @@ from esphome.const import (
CONF_VALUE, CONF_VALUE,
CONF_WIDTH, CONF_WIDTH,
) )
from esphome.cpp_generator import IntLiteral
from ..automation import action_to_code from ..automation import action_to_code
from ..defines import ( from ..defines import (
@@ -32,7 +31,7 @@ from ..helpers import add_lv_use, lvgl_components_required
from ..lv_validation import ( from ..lv_validation import (
get_end_value, get_end_value,
get_start_value, get_start_value,
lv_angle, lv_angle_degrees,
lv_bool, lv_bool,
lv_color, lv_color,
lv_float, lv_float,
@@ -163,7 +162,7 @@ SCALE_SCHEMA = cv.Schema(
cv.Optional(CONF_RANGE_FROM, default=0.0): cv.float_, cv.Optional(CONF_RANGE_FROM, default=0.0): cv.float_,
cv.Optional(CONF_RANGE_TO, default=100.0): cv.float_, cv.Optional(CONF_RANGE_TO, default=100.0): cv.float_,
cv.Optional(CONF_ANGLE_RANGE, default=270): cv.int_range(0, 360), cv.Optional(CONF_ANGLE_RANGE, default=270): cv.int_range(0, 360),
cv.Optional(CONF_ROTATION): lv_angle, cv.Optional(CONF_ROTATION): lv_angle_degrees,
cv.Optional(CONF_INDICATORS): cv.ensure_list(INDICATOR_SCHEMA), cv.Optional(CONF_INDICATORS): cv.ensure_list(INDICATOR_SCHEMA),
} }
) )
@@ -188,9 +187,7 @@ class MeterType(WidgetType):
for scale_conf in config.get(CONF_SCALES, ()): for scale_conf in config.get(CONF_SCALES, ()):
rotation = 90 + (360 - scale_conf[CONF_ANGLE_RANGE]) / 2 rotation = 90 + (360 - scale_conf[CONF_ANGLE_RANGE]) / 2
if CONF_ROTATION in scale_conf: if CONF_ROTATION in scale_conf:
rotation = await lv_angle.process(scale_conf[CONF_ROTATION]) rotation = await lv_angle_degrees.process(scale_conf[CONF_ROTATION])
if isinstance(rotation, IntLiteral):
rotation = int(str(rotation)) // 10
with LocalVariable( with LocalVariable(
"meter_var", "lv_meter_scale_t", lv_expr.meter_add_scale(var) "meter_var", "lv_meter_scale_t", lv_expr.meter_add_scale(var)
) as meter_var: ) as meter_var: