mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 10:46:31 +00:00
LVGL HASPmora fix regression introduced with LVGL 9.3.0 (#23547)
This commit is contained in:
s-hadinger
GitHub
parent
390927c190
commit
d4d6a2c779
@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
|
||||
### Fixed
|
||||
- LVGL regression missing `lv.ANIM_OFF` and `lv.ANIM_ON`
|
||||
- Berry fix `realline`
|
||||
- LVGL HASPmora fix regression introduced with LVGL 9.3.0
|
||||
|
||||
### Removed
|
||||
|
||||
|
||||
@ -24,6 +24,8 @@ lv.ALIGN_TOP_LEFT = 1
|
||||
lv.ALIGN_TOP_MID = 2
|
||||
lv.ALIGN_TOP_RIGHT = 3
|
||||
lv.ANIM_IMAGE_PART_MAIN = 0
|
||||
lv.ANIM_OFF = 0
|
||||
lv.ANIM_ON = 1
|
||||
lv.ANIM_PLAYTIME_INFINITE = -1
|
||||
lv.ANIM_REPEAT_INFINITE = -1
|
||||
lv.ARC_MODE_NORMAL = 0
|
||||
@ -428,11 +430,16 @@ lv.KEY_PREV = 11
|
||||
lv.KEY_RIGHT = 19
|
||||
lv.KEY_UP = 17
|
||||
lv.LABEL_DOT_NUM = 3
|
||||
lv.LABEL_LONG_CLIP = 4
|
||||
lv.LABEL_LONG_DOT = 1
|
||||
lv.LABEL_LONG_MODE_CLIP = 4
|
||||
lv.LABEL_LONG_MODE_DOTS = 1
|
||||
lv.LABEL_LONG_MODE_SCROLL = 2
|
||||
lv.LABEL_LONG_MODE_SCROLL_CIRCULAR = 3
|
||||
lv.LABEL_LONG_MODE_WRAP = 0
|
||||
lv.LABEL_LONG_SCROLL = 2
|
||||
lv.LABEL_LONG_SCROLL_CIRCULAR = 3
|
||||
lv.LABEL_LONG_WRAP = 0
|
||||
lv.LABEL_POS_LAST = 65535
|
||||
lv.LABEL_TEXT_SELECTION_OFF = 65535
|
||||
lv.LAYER_TYPE_NONE = 0
|
||||
|
||||
@ -2153,12 +2153,12 @@ class lvh_spangroup : lvh_obj
|
||||
# label do not need a sub-label
|
||||
def post_init(jline)
|
||||
self._lv_obj.set_mode(lv.SPAN_MODE_BREAK) # use lv.SPAN_MODE_BREAK by default
|
||||
self._lv_obj.refr_mode()
|
||||
self._lv_obj.refresh()
|
||||
super(self).post_init(jline) # call super -- not needed
|
||||
end
|
||||
# refresh mode
|
||||
def refr_mode()
|
||||
self._lv_obj.refr_mode()
|
||||
def refresh()
|
||||
self._lv_obj.refresh()
|
||||
end
|
||||
end
|
||||
|
||||
@ -2176,7 +2176,7 @@ class lvh_span : lvh_root
|
||||
# check if it is the parent is a spangroup
|
||||
if isinstance(self._parent_lvh, self._page._hm.lvh_spangroup)
|
||||
# print(">>> GOOD")
|
||||
self._lv_obj = self._parent_lvh._lv_obj.new_span()
|
||||
self._lv_obj = self._parent_lvh._lv_obj.add_span()
|
||||
self._style = self._lv_obj.get_style()
|
||||
else
|
||||
print("HSP: 'span' should have a parent of type 'spangroup'")
|
||||
@ -2194,7 +2194,7 @@ class lvh_span : lvh_root
|
||||
var font = self.parse_font(t)
|
||||
if font != nil
|
||||
self._style.set_text_font(font)
|
||||
self._parent_lvh.refr_mode()
|
||||
self._parent_lvh.refresh()
|
||||
end
|
||||
end
|
||||
|
||||
@ -2271,7 +2271,7 @@ class lvh_span : lvh_root
|
||||
# invoke
|
||||
try
|
||||
f(self._style, v)
|
||||
self._parent_lvh.refr_mode()
|
||||
self._parent_lvh.refresh()
|
||||
except .. as e, m
|
||||
raise e, m + " for " + k
|
||||
end
|
||||
@ -2522,19 +2522,19 @@ class lvh_chart : lvh_obj
|
||||
end
|
||||
def set_y_min(_y_min)
|
||||
self._y_min = _y_min
|
||||
self._lv_obj.set_range(lv.CHART_AXIS_PRIMARY_Y, self._y_min, self._y_max)
|
||||
self._lv_obj.set_axis_range(lv.CHART_AXIS_PRIMARY_Y, self._y_min, self._y_max)
|
||||
end
|
||||
def set_y_max(_y_max)
|
||||
self._y_max = _y_max
|
||||
self._lv_obj.set_range(lv.CHART_AXIS_PRIMARY_Y, self._y_min, self._y_max)
|
||||
self._lv_obj.set_axis_range(lv.CHART_AXIS_PRIMARY_Y, self._y_min, self._y_max)
|
||||
end
|
||||
def set_y2_min(_y2_min)
|
||||
self._y2_min = _y2_min
|
||||
self._lv_obj.set_range(lv.CHART_AXIS_SECONDARY_Y, self._y2_min, self._y2_max)
|
||||
self._lv_obj.set_axis_range(lv.CHART_AXIS_SECONDARY_Y, self._y2_min, self._y2_max)
|
||||
end
|
||||
def set_y2_max(_y2_max)
|
||||
self._y2_max = _y2_max
|
||||
self._lv_obj.set_range(lv.CHART_AXIS_SECONDARY_Y, self._y2_min, self._y2_max)
|
||||
self._lv_obj.set_axis_range(lv.CHART_AXIS_SECONDARY_Y, self._y2_min, self._y2_max)
|
||||
end
|
||||
|
||||
def set_series1_color(color)
|
||||
|
||||
@ -9520,7 +9520,7 @@ static const bvalue be_ktab_class_lvh_spangroup[6] = {
|
||||
/* K1 */ be_nested_str_weak(set_mode),
|
||||
/* K2 */ be_nested_str_weak(lv),
|
||||
/* K3 */ be_nested_str_weak(SPAN_MODE_BREAK),
|
||||
/* K4 */ be_nested_str_weak(refr_mode),
|
||||
/* K4 */ be_nested_str_weak(refresh),
|
||||
/* K5 */ be_nested_str_weak(post_init),
|
||||
};
|
||||
|
||||
@ -9566,9 +9566,9 @@ be_local_closure(class_lvh_spangroup_post_init, /* name */
|
||||
|
||||
|
||||
/********************************************************************
|
||||
** Solidified function: refr_mode
|
||||
** Solidified function: refresh
|
||||
********************************************************************/
|
||||
be_local_closure(class_lvh_spangroup_refr_mode, /* name */
|
||||
be_local_closure(class_lvh_spangroup_refresh, /* name */
|
||||
be_nested_proto(
|
||||
3, /* nstack */
|
||||
1, /* argc */
|
||||
@ -9579,7 +9579,7 @@ be_local_closure(class_lvh_spangroup_refr_mode, /* name */
|
||||
NULL, /* no sub protos */
|
||||
1, /* has constants */
|
||||
&be_ktab_class_lvh_spangroup, /* shared constants */
|
||||
be_str_weak(refr_mode),
|
||||
be_str_weak(refresh),
|
||||
&be_const_str_solidified,
|
||||
( &(const binstruction[ 4]) { /* code */
|
||||
0x88040100, // 0000 GETMBR R1 R0 K0
|
||||
@ -9601,7 +9601,7 @@ be_local_class(lvh_spangroup,
|
||||
&be_class_lvh_obj,
|
||||
be_nested_map(3,
|
||||
( (struct bmapnode*) &(const bmapnode[]) {
|
||||
{ be_const_key_weak(refr_mode, -1), be_const_closure(class_lvh_spangroup_refr_mode_closure) },
|
||||
{ be_const_key_weak(refresh, -1), be_const_closure(class_lvh_spangroup_refresh_closure) },
|
||||
{ be_const_key_weak(_lv_class, -1), be_const_class(be_class_lv_spangroup) },
|
||||
{ be_const_key_weak(post_init, 0), be_const_closure(class_lvh_spangroup_post_init_closure) },
|
||||
})),
|
||||
@ -9627,14 +9627,14 @@ static const bvalue be_ktab_class_lvh_span[31] = {
|
||||
/* K15 */ be_nested_str_weak(is_color_attribute),
|
||||
/* K16 */ be_nested_str_weak(parse_color),
|
||||
/* K17 */ be_nested_str_weak(_parent_lvh),
|
||||
/* K18 */ be_nested_str_weak(refr_mode),
|
||||
/* K18 */ be_nested_str_weak(refresh),
|
||||
/* K19 */ be_nested_str_weak(_X20for_X20),
|
||||
/* K20 */ be_nested_str_weak(HSP_X3A_X20Could_X20not_X20find_X20function_X20set_),
|
||||
/* K21 */ be_nested_str_weak(_lv_obj),
|
||||
/* K22 */ be_nested_str_weak(_page),
|
||||
/* K23 */ be_nested_str_weak(_hm),
|
||||
/* K24 */ be_nested_str_weak(lvh_spangroup),
|
||||
/* K25 */ be_nested_str_weak(new_span),
|
||||
/* K25 */ be_nested_str_weak(add_span),
|
||||
/* K26 */ be_nested_str_weak(get_style),
|
||||
/* K27 */ be_nested_str_weak(HSP_X3A_X20_X27span_X27_X20should_X20have_X20a_X20parent_X20of_X20type_X20_X27spangroup_X27),
|
||||
/* K28 */ be_nested_str_weak(parse_font),
|
||||
@ -10632,7 +10632,7 @@ be_local_class(lvh_tab,
|
||||
static const bvalue be_ktab_class_lvh_chart[29] = {
|
||||
/* K0 */ be_nested_str_weak(_y_min),
|
||||
/* K1 */ be_nested_str_weak(_lv_obj),
|
||||
/* K2 */ be_nested_str_weak(set_range),
|
||||
/* K2 */ be_nested_str_weak(set_axis_range),
|
||||
/* K3 */ be_nested_str_weak(lv),
|
||||
/* K4 */ be_nested_str_weak(CHART_AXIS_PRIMARY_Y),
|
||||
/* K5 */ be_nested_str_weak(_y_max),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user