mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LVGL split lv_clock and lv_clock_icon

This commit is contained in:
Stephan Hadinger 2022-03-27 16:57:54 +02:00
parent 61004953e6
commit 355d0ab6e1
8 changed files with 1588 additions and 1502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/berry/default/be_modtab.c
View File

@ -187,6 +187,7 @@ be_extern_native_class(lv_wifi_bars_icon);
be_extern_native_class(lv_signal_arcs); be_extern_native_class(lv_signal_arcs);
be_extern_native_class(lv_wifi_arcs); be_extern_native_class(lv_wifi_arcs);
be_extern_native_class(lv_wifi_arcs_icon); be_extern_native_class(lv_wifi_arcs_icon);
be_extern_native_class(lv_clock);
be_extern_native_class(lv_clock_icon); be_extern_native_class(lv_clock_icon);
be_extern_native_class(int64); be_extern_native_class(int64);
@ -233,6 +234,7 @@ BERRY_LOCAL bclass_array be_class_table = {
&be_native_class(lv_signal_arcs), &be_native_class(lv_signal_arcs),
&be_native_class(lv_wifi_arcs), &be_native_class(lv_wifi_arcs),
&be_native_class(lv_wifi_arcs_icon), &be_native_class(lv_wifi_arcs_icon),
&be_native_class(lv_clock),
&be_native_class(lv_clock_icon), &be_native_class(lv_clock_icon),
#endif // USE_LVGL #endif // USE_LVGL

2
lib/libesp32/berry/generate/be_const_strtab.h
View File

@ -322,6 +322,7 @@ extern const bcstring be_const_str_classof;
extern const bcstring be_const_str_clear; extern const bcstring be_const_str_clear;
extern const bcstring be_const_str_clear_first_time; extern const bcstring be_const_str_clear_first_time;
extern const bcstring be_const_str_clear_to; extern const bcstring be_const_str_clear_to;
extern const bcstring be_const_str_clock;
extern const bcstring be_const_str_clock_icon; extern const bcstring be_const_str_clock_icon;
extern const bcstring be_const_str_close; extern const bcstring be_const_str_close;
extern const bcstring be_const_str_closure; extern const bcstring be_const_str_closure;
@ -582,6 +583,7 @@ extern const bcstring be_const_str_loop;
extern const bcstring be_const_str_lower; extern const bcstring be_const_str_lower;
extern const bcstring be_const_str_lv; extern const bcstring be_const_str_lv;
extern const bcstring be_const_str_lv_; extern const bcstring be_const_str_lv_;
extern const bcstring be_const_str_lv_clock;
extern const bcstring be_const_str_lv_clock_icon; extern const bcstring be_const_str_lv_clock_icon;
extern const bcstring be_const_str_lv_coord_arr; extern const bcstring be_const_str_lv_coord_arr;
extern const bcstring be_const_str_lv_event; extern const bcstring be_const_str_lv_event;

2343
lib/libesp32/berry/generate/be_const_strtab_def.h
View File

File diff suppressed because it is too large Load Diff

62
lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c
View File

@ -430,7 +430,7 @@ be_local_closure(lv_tasmota_init, /* name */
0, /* has sup protos */ 0, /* has sup protos */
NULL, /* no sub protos */ NULL, /* no sub protos */
1, /* has constants */ 1, /* has constants */
( &(const bvalue[31]) { /* constants */ ( &(const bvalue[33]) { /* constants */
/* K0 */ be_nested_str(lv), /* K0 */ be_nested_str(lv),
/* K1 */ be_nested_str(start), /* K1 */ be_nested_str(start),
/* K2 */ be_nested_str(splash_init), /* K2 */ be_nested_str(splash_init),
@ -445,27 +445,29 @@ be_local_closure(lv_tasmota_init, /* name */
/* K11 */ be_nested_str(load_freetype_font), /* K11 */ be_nested_str(load_freetype_font),
/* K12 */ be_nested_str(register_button_encoder), /* K12 */ be_nested_str(register_button_encoder),
/* K13 */ be_nested_str(screenshot), /* K13 */ be_nested_str(screenshot),
/* K14 */ be_nested_str(clock_icon), /* K14 */ be_nested_str(clock),
/* K15 */ be_nested_str(lv_clock_icon), /* K15 */ be_nested_str(lv_clock),
/* K16 */ be_nested_str(signal_arcs), /* K16 */ be_nested_str(clock_icon),
/* K17 */ be_nested_str(lv_signal_arcs), /* K17 */ be_nested_str(lv_clock_icon),
/* K18 */ be_nested_str(signal_bars), /* K18 */ be_nested_str(signal_arcs),
/* K19 */ be_nested_str(lv_signal_bars), /* K19 */ be_nested_str(lv_signal_arcs),
/* K20 */ be_nested_str(wifi_arcs_icon), /* K20 */ be_nested_str(signal_bars),
/* K21 */ be_nested_str(lv_wifi_arcs_icon), /* K21 */ be_nested_str(lv_signal_bars),
/* K22 */ be_nested_str(wifi_arcs), /* K22 */ be_nested_str(wifi_arcs_icon),
/* K23 */ be_nested_str(lv_wifi_arcs), /* K23 */ be_nested_str(lv_wifi_arcs_icon),
/* K24 */ be_nested_str(wifi_bars_icon), /* K24 */ be_nested_str(wifi_arcs),
/* K25 */ be_nested_str(lv_wifi_bars_icon), /* K25 */ be_nested_str(lv_wifi_arcs),
/* K26 */ be_nested_str(wifi_bars), /* K26 */ be_nested_str(wifi_bars_icon),
/* K27 */ be_nested_str(lv_wifi_bars), /* K27 */ be_nested_str(lv_wifi_bars_icon),
/* K28 */ be_nested_str(tasmota), /* K28 */ be_nested_str(wifi_bars),
/* K29 */ be_nested_str(get_option), /* K29 */ be_nested_str(lv_wifi_bars),
/* K30 */ be_const_int(0), /* K30 */ be_nested_str(tasmota),
/* K31 */ be_nested_str(get_option),
/* K32 */ be_const_int(0),
}), }),
&be_const_str_init, &be_const_str_init,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[51]) { /* code */ ( &(const binstruction[53]) { /* code */
0xA4060000, // 0000 IMPORT R1 K0 0xA4060000, // 0000 IMPORT R1 K0
0x88080101, // 0001 GETMBR R2 R0 K1 0x88080101, // 0001 GETMBR R2 R0 K1
0x90060202, // 0002 SETMBR R1 K1 R2 0x90060202, // 0002 SETMBR R1 K1 R2
@ -507,16 +509,18 @@ be_local_closure(lv_tasmota_init, /* name */
0x90063002, // 0026 SETMBR R1 K24 R2 0x90063002, // 0026 SETMBR R1 K24 R2
0xB80A3600, // 0027 GETNGBL R2 K27 0xB80A3600, // 0027 GETNGBL R2 K27
0x90063402, // 0028 SETMBR R1 K26 R2 0x90063402, // 0028 SETMBR R1 K26 R2
0xB80A3800, // 0029 GETNGBL R2 K28 0xB80A3A00, // 0029 GETNGBL R2 K29
0x8C08051D, // 002A GETMET R2 R2 K29 0x90063802, // 002A SETMBR R1 K28 R2
0x54120086, // 002B LDINT R4 135 0xB80A3C00, // 002B GETNGBL R2 K30
0x7C080400, // 002C CALL R2 2 0x8C08051F, // 002C GETMET R2 R2 K31
0x1C08051E, // 002D EQ R2 R2 K30 0x54120086, // 002D LDINT R4 135
0x780A0001, // 002E JMPF R2 #0031 0x7C080400, // 002E CALL R2 2
0x8C080302, // 002F GETMET R2 R1 K2 0x1C080520, // 002F EQ R2 R2 K32
0x7C080200, // 0030 CALL R2 1 0x780A0001, // 0030 JMPF R2 #0033
0x4C080000, // 0031 LDNIL R2 0x8C080302, // 0031 GETMET R2 R1 K2
0x80040400, // 0032 RET 1 R2 0x7C080200, // 0032 CALL R2 1
0x4C080000, // 0033 LDNIL R2
0x80040400, // 0034 RET 1 R2
}) })
) )
); );

364
lib/libesp32/berry_tasmota/src/be_lvgl_clock_icon_lib.c
View File

@ -7,304 +7,100 @@
#include "lvgl.h" #include "lvgl.h"
/********************************************************************
** Solidified function: set_time
********************************************************************/
be_local_closure(lv_clock_icon_set_time, /* name */
be_nested_proto(
11, /* nstack */
4, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[10]) { /* constants */
/* K0 */ be_nested_str(string),
/* K1 */ be_nested_str(hour),
/* K2 */ be_nested_str(minute),
/* K3 */ be_nested_str(sec),
/* K4 */ be_nested_str(format),
/* K5 */ be_nested_str(_X2502d_X25s_X2502d),
/* K6 */ be_const_int(2),
/* K7 */ be_nested_str(_X3A),
/* K8 */ be_nested_str(_X20),
/* K9 */ be_nested_str(set_text),
}),
&be_const_str_set_time,
&be_const_str_solidified,
( &(const binstruction[27]) { /* code */
0xA4120000, // 0000 IMPORT R4 K0
0x88140101, // 0001 GETMBR R5 R0 K1
0x20140205, // 0002 NE R5 R1 R5
0x74160005, // 0003 JMPT R5 #000A
0x88140102, // 0004 GETMBR R5 R0 K2
0x20140405, // 0005 NE R5 R2 R5
0x74160002, // 0006 JMPT R5 #000A
0x88140103, // 0007 GETMBR R5 R0 K3
0x20140605, // 0008 NE R5 R3 R5
0x7816000F, // 0009 JMPF R5 #001A
0x8C140904, // 000A GETMET R5 R4 K4
0x581C0005, // 000B LDCONST R7 K5
0x5C200200, // 000C MOVE R8 R1
0x10240706, // 000D MOD R9 R3 K6
0x78260001, // 000E JMPF R9 #0011
0x58240007, // 000F LDCONST R9 K7
0x70020000, // 0010 JMP #0012
0x58240008, // 0011 LDCONST R9 K8
0x5C280400, // 0012 MOVE R10 R2
0x7C140A00, // 0013 CALL R5 5
0x90020201, // 0014 SETMBR R0 K1 R1
0x90020402, // 0015 SETMBR R0 K2 R2
0x90020603, // 0016 SETMBR R0 K3 R3
0x8C180109, // 0017 GETMET R6 R0 K9
0x5C200A00, // 0018 MOVE R8 R5
0x7C180400, // 0019 CALL R6 2
0x80000000, // 001A RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: every_second
********************************************************************/
be_local_closure(lv_clock_icon_every_second, /* name */
be_nested_proto(
7, /* nstack */
1, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 9]) { /* constants */
/* K0 */ be_nested_str(tasmota),
/* K1 */ be_nested_str(time_dump),
/* K2 */ be_nested_str(rtc),
/* K3 */ be_nested_str(local),
/* K4 */ be_nested_str(year),
/* K5 */ be_nested_str(set_time),
/* K6 */ be_nested_str(hour),
/* K7 */ be_nested_str(min),
/* K8 */ be_nested_str(sec),
}),
&be_const_str_every_second,
&be_const_str_solidified,
( &(const binstruction[17]) { /* code */
0xB8060000, // 0000 GETNGBL R1 K0
0x8C040301, // 0001 GETMET R1 R1 K1
0xB80E0000, // 0002 GETNGBL R3 K0
0x8C0C0702, // 0003 GETMET R3 R3 K2
0x7C0C0200, // 0004 CALL R3 1
0x940C0703, // 0005 GETIDX R3 R3 K3
0x7C040400, // 0006 CALL R1 2
0x94080304, // 0007 GETIDX R2 R1 K4
0x540E07B1, // 0008 LDINT R3 1970
0x20080403, // 0009 NE R2 R2 R3
0x780A0004, // 000A JMPF R2 #0010
0x8C080105, // 000B GETMET R2 R0 K5
0x94100306, // 000C GETIDX R4 R1 K6
0x94140307, // 000D GETIDX R5 R1 K7
0x94180308, // 000E GETIDX R6 R1 K8
0x7C080800, // 000F CALL R2 4
0x80000000, // 0010 RET 0
})
)
);
/*******************************************************************/
/******************************************************************** /********************************************************************
** Solidified function: init ** Solidified function: init
********************************************************************/ ********************************************************************/
be_local_closure(lv_clock_icon_init, /* name */ be_local_closure(lv_clock_icon_init, /* name */
be_nested_proto( be_nested_proto(
11, /* nstack */ 10, /* nstack */
2, /* argc */ 2, /* argc */
2, /* varg */ 2, /* varg */
0, /* has upvals */ 0, /* has upvals */
NULL, /* no upvals */ NULL, /* no upvals */
1, /* has sup protos */ 0, /* has sup protos */
( &(const struct bproto*[ 1]) { NULL, /* no sub protos */
be_nested_proto(
2, /* nstack */
0, /* argc */
0, /* varg */
1, /* has upvals */
( &(const bupvaldesc[ 1]) { /* upvals */
be_local_const_upval(1, 0),
}),
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 1]) { /* constants */
/* K0 */ be_nested_str(before_del),
}),
&be_const_str__X3Clambda_X3E,
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x68000000, // 0000 GETUPV R0 U0
0x8C000100, // 0001 GETMET R0 R0 K0
0x7C000200, // 0002 CALL R0 1
0x80040000, // 0003 RET 1 R0
})
),
}),
1, /* has constants */ 1, /* has constants */
( &(const bvalue[25]) { /* constants */ ( &(const bvalue[16]) { /* constants */
/* K0 */ be_nested_str(init), /* K0 */ be_nested_str(init),
/* K1 */ be_nested_str(lv), /* K1 */ be_nested_str(get_height),
/* K2 */ be_nested_str(seg7_font), /* K2 */ be_nested_str(refr_size),
/* K3 */ be_nested_str(set_style_text_font), /* K3 */ be_nested_str(get_width),
/* K4 */ be_nested_str(PART_MAIN), /* K4 */ be_nested_str(set_y),
/* K5 */ be_nested_str(STATE_DEFAULT), /* K5 */ be_const_int(2),
/* K6 */ be_nested_str(get_height), /* K6 */ be_nested_str(get_style_pad_right),
/* K7 */ be_nested_str(set_text), /* K7 */ be_nested_str(lv),
/* K8 */ be_nested_str(_X2D_X2D_X3A_X2D_X2D), /* K8 */ be_nested_str(PART_MAIN),
/* K9 */ be_nested_str(refr_size), /* K9 */ be_nested_str(STATE_DEFAULT),
/* K10 */ be_nested_str(get_width), /* K10 */ be_nested_str(set_x),
/* K11 */ be_nested_str(set_y), /* K11 */ be_const_int(3),
/* K12 */ be_const_int(2), /* K12 */ be_nested_str(set_style_pad_right),
/* K13 */ be_nested_str(get_style_pad_right), /* K13 */ be_nested_str(set_style_bg_color),
/* K14 */ be_nested_str(set_x), /* K14 */ be_nested_str(color),
/* K15 */ be_const_int(3), /* K15 */ be_nested_str(COLOR_BLACK),
/* K16 */ be_nested_str(set_style_pad_right),
/* K17 */ be_nested_str(set_style_bg_color),
/* K18 */ be_nested_str(color),
/* K19 */ be_nested_str(COLOR_BLACK),
/* K20 */ be_nested_str(add_event_cb),
/* K21 */ be_nested_str(EVENT_DELETE),
/* K22 */ be_const_int(0),
/* K23 */ be_nested_str(tasmota),
/* K24 */ be_nested_str(add_driver),
}), }),
&be_const_str_init, &be_const_str_init,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[89]) { /* code */ ( &(const binstruction[60]) { /* code */
0x60080003, // 0000 GETGBL R2 G3 0x60080003, // 0000 GETGBL R2 G3
0x5C0C0000, // 0001 MOVE R3 R0 0x5C0C0000, // 0001 MOVE R3 R0
0x7C080200, // 0002 CALL R2 1 0x7C080200, // 0002 CALL R2 1
0x8C080500, // 0003 GETMET R2 R2 K0 0x8C080500, // 0003 GETMET R2 R2 K0
0x5C100200, // 0004 MOVE R4 R1 0x5C100200, // 0004 MOVE R4 R1
0x7C080400, // 0005 CALL R2 2 0x7C080400, // 0005 CALL R2 2
0xB80A0200, // 0006 GETNGBL R2 K1 0x4C080000, // 0006 LDNIL R2
0x8C080502, // 0007 GETMET R2 R2 K2 0x20080202, // 0007 NE R2 R1 R2
0x5412000F, // 0008 LDINT R4 16 0x780A0031, // 0008 JMPF R2 #003B
0x7C080400, // 0009 CALL R2 2 0x8C080301, // 0009 GETMET R2 R1 K1
0x4C0C0000, // 000A LDNIL R3 0x7C080200, // 000A CALL R2 1
0x200C0403, // 000B NE R3 R2 R3 0x8C0C0102, // 000B GETMET R3 R0 K2
0x780E0007, // 000C JMPF R3 #0015 0x7C0C0200, // 000C CALL R3 1
0x8C0C0103, // 000D GETMET R3 R0 K3 0x8C0C0103, // 000D GETMET R3 R0 K3
0x5C140400, // 000E MOVE R5 R2 0x7C0C0200, // 000E CALL R3 1
0xB81A0200, // 000F GETNGBL R6 K1 0x8C100104, // 000F GETMET R4 R0 K4
0x88180D04, // 0010 GETMBR R6 R6 K4 0x8C180301, // 0010 GETMET R6 R1 K1
0xB81E0200, // 0011 GETNGBL R7 K1 0x7C180200, // 0011 CALL R6 1
0x881C0F05, // 0012 GETMBR R7 R7 K5 0x8C1C0101, // 0012 GETMET R7 R0 K1
0x30180C07, // 0013 OR R6 R6 R7 0x7C1C0200, // 0013 CALL R7 1
0x7C0C0600, // 0014 CALL R3 3 0x04180C07, // 0014 SUB R6 R6 R7
0x4C0C0000, // 0015 LDNIL R3 0x0C180D05, // 0015 DIV R6 R6 K5
0x200C0203, // 0016 NE R3 R1 R3 0x7C100400, // 0016 CALL R4 2
0x780E0034, // 0017 JMPF R3 #004D 0x8C100306, // 0017 GETMET R4 R1 K6
0x8C0C0306, // 0018 GETMET R3 R1 K6 0xB81A0E00, // 0018 GETNGBL R6 K7
0x7C0C0200, // 0019 CALL R3 1 0x88180D08, // 0019 GETMBR R6 R6 K8
0x8C100107, // 001A GETMET R4 R0 K7 0xB81E0E00, // 001A GETNGBL R7 K7
0x58180008, // 001B LDCONST R6 K8 0x881C0F09, // 001B GETMBR R7 R7 K9
0x7C100400, // 001C CALL R4 2 0x30180C07, // 001C OR R6 R6 R7
0x8C100109, // 001D GETMET R4 R0 K9 0x7C100400, // 001D CALL R4 2
0x7C100200, // 001E CALL R4 1 0x8C14010A, // 001E GETMET R5 R0 K10
0x8C10010A, // 001F GETMET R4 R0 K10 0x8C1C0303, // 001F GETMET R7 R1 K3
0x7C100200, // 0020 CALL R4 1 0x7C1C0200, // 0020 CALL R7 1
0x8C14010B, // 0021 GETMET R5 R0 K11 0x041C0E03, // 0021 SUB R7 R7 R3
0x8C1C0306, // 0022 GETMET R7 R1 K6 0x041C0E04, // 0022 SUB R7 R7 R4
0x7C1C0200, // 0023 CALL R7 1 0x041C0F0B, // 0023 SUB R7 R7 K11
0x8C200106, // 0024 GETMET R8 R0 K6 0x7C140400, // 0024 CALL R5 2
0x7C200200, // 0025 CALL R8 1 0x8C14030C, // 0025 GETMET R5 R1 K12
0x041C0E08, // 0026 SUB R7 R7 R8 0x001C0803, // 0026 ADD R7 R4 R3
0x0C1C0F0C, // 0027 DIV R7 R7 K12 0x54220005, // 0027 LDINT R8 6
0x7C140400, // 0028 CALL R5 2 0x001C0E08, // 0028 ADD R7 R7 R8
0x8C14030D, // 0029 GETMET R5 R1 K13 0xB8220E00, // 0029 GETNGBL R8 K7
0xB81E0200, // 002A GETNGBL R7 K1 0x88201108, // 002A GETMBR R8 R8 K8
0x881C0F04, // 002B GETMBR R7 R7 K4 0xB8260E00, // 002B GETNGBL R9 K7
0xB8220200, // 002C GETNGBL R8 K1 0x88241309, // 002C GETMBR R9 R9 K9
0x88201105, // 002D GETMBR R8 R8 K5 0x30201009, // 002D OR R8 R8 R9
0x301C0E08, // 002E OR R7 R7 R8 0x7C140600, // 002E CALL R5 3
0x7C140400, // 002F CALL R5 2 0x8C14010D, // 002F GETMET R5 R0 K13
0x8C18010E, // 0030 GETMET R6 R0 K14 0xB81E0E00, // 0030 GETNGBL R7 K7
0x8C20030A, // 0031 GETMET R8 R1 K10 0x8C1C0F0E, // 0031 GETMET R7 R7 K14
0x7C200200, // 0032 CALL R8 1 0xB8260E00, // 0032 GETNGBL R9 K7
0x04201004, // 0033 SUB R8 R8 R4 0x8824130F, // 0033 GETMBR R9 R9 K15
0x04201005, // 0034 SUB R8 R8 R5 0x7C1C0400, // 0034 CALL R7 2
0x0420110F, // 0035 SUB R8 R8 K15 0xB8220E00, // 0035 GETNGBL R8 K7
0x7C180400, // 0036 CALL R6 2 0x88201108, // 0036 GETMBR R8 R8 K8
0x8C180310, // 0037 GETMET R6 R1 K16 0xB8260E00, // 0037 GETNGBL R9 K7
0x00200A04, // 0038 ADD R8 R5 R4 0x88241309, // 0038 GETMBR R9 R9 K9
0x54260005, // 0039 LDINT R9 6 0x30201009, // 0039 OR R8 R8 R9
0x00201009, // 003A ADD R8 R8 R9 0x7C140600, // 003A CALL R5 3
0xB8260200, // 003B GETNGBL R9 K1 0x80000000, // 003B RET 0
0x88241304, // 003C GETMBR R9 R9 K4
0xB82A0200, // 003D GETNGBL R10 K1
0x88281505, // 003E GETMBR R10 R10 K5
0x3024120A, // 003F OR R9 R9 R10
0x7C180600, // 0040 CALL R6 3
0x8C180111, // 0041 GETMET R6 R0 K17
0xB8220200, // 0042 GETNGBL R8 K1
0x8C201112, // 0043 GETMET R8 R8 K18
0xB82A0200, // 0044 GETNGBL R10 K1
0x88281513, // 0045 GETMBR R10 R10 K19
0x7C200400, // 0046 CALL R8 2
0xB8260200, // 0047 GETNGBL R9 K1
0x88241304, // 0048 GETMBR R9 R9 K4
0xB82A0200, // 0049 GETNGBL R10 K1
0x88281505, // 004A GETMBR R10 R10 K5
0x3024120A, // 004B OR R9 R9 R10
0x7C180600, // 004C CALL R6 3
0x8C0C0114, // 004D GETMET R3 R0 K20
0x84140000, // 004E CLOSURE R5 P0
0xB81A0200, // 004F GETNGBL R6 K1
0x88180D15, // 0050 GETMBR R6 R6 K21
0x581C0016, // 0051 LDCONST R7 K22
0x7C0C0800, // 0052 CALL R3 4
0xB80E2E00, // 0053 GETNGBL R3 K23
0x8C0C0718, // 0054 GETMET R3 R3 K24
0x5C140000, // 0055 MOVE R5 R0
0x7C0C0400, // 0056 CALL R3 2
0xA0000000, // 0057 CLOSE R0
0x80000000, // 0058 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: before_del
********************************************************************/
be_local_closure(lv_clock_icon_before_del, /* name */
be_nested_proto(
4, /* nstack */
1, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 2]) { /* constants */
/* K0 */ be_nested_str(tasmota),
/* K1 */ be_nested_str(remove_driver),
}),
&be_const_str_before_del,
&be_const_str_solidified,
( &(const binstruction[ 5]) { /* code */
0xB8060000, // 0000 GETNGBL R1 K0
0x8C040301, // 0001 GETMET R1 R1 K1
0x5C0C0000, // 0002 MOVE R3 R0
0x7C040400, // 0003 CALL R1 2
0x80000000, // 0004 RET 0
}) })
) )
); );
@ -314,18 +110,12 @@ be_local_closure(lv_clock_icon_before_del, /* name */
/******************************************************************** /********************************************************************
** Solidified class: lv_clock_icon ** Solidified class: lv_clock_icon
********************************************************************/ ********************************************************************/
extern const bclass be_class_lv_label; extern const bclass be_class_lv_clock;
be_local_class(lv_clock_icon, be_local_class(lv_clock_icon,
3, 0,
&be_class_lv_label, &be_class_lv_clock,
be_nested_map(7, be_nested_map(1,
( (struct bmapnode*) &(const bmapnode[]) { ( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key(sec, -1), be_const_var(2) },
{ be_const_key(hour, -1), be_const_var(0) },
{ be_const_key(before_del, 6), be_const_closure(lv_clock_icon_before_del_closure) },
{ be_const_key(every_second, -1), be_const_closure(lv_clock_icon_every_second_closure) },
{ be_const_key(minute, -1), be_const_var(1) },
{ be_const_key(set_time, 2), be_const_closure(lv_clock_icon_set_time_closure) },
{ be_const_key(init, -1), be_const_closure(lv_clock_icon_init_closure) }, { be_const_key(init, -1), be_const_closure(lv_clock_icon_init_closure) },
})), })),
be_str_literal("lv_clock_icon") be_str_literal("lv_clock_icon")

276
lib/libesp32/berry_tasmota/src/be_lvgl_clock_lib.c Normal file
View File

@ -0,0 +1,276 @@
/********************************************************************
* Tasmota LVGL lv_signal_bars widget
*******************************************************************/
#include "be_constobj.h"
#ifdef USE_LVGL
#include "lvgl.h"
/********************************************************************
** Solidified function: set_time
********************************************************************/
be_local_closure(lv_clock_set_time, /* name */
be_nested_proto(
11, /* nstack */
4, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[10]) { /* constants */
/* K0 */ be_nested_str(string),
/* K1 */ be_nested_str(hour),
/* K2 */ be_nested_str(minute),
/* K3 */ be_nested_str(sec),
/* K4 */ be_nested_str(format),
/* K5 */ be_nested_str(_X2502d_X25s_X2502d),
/* K6 */ be_const_int(2),
/* K7 */ be_nested_str(_X3A),
/* K8 */ be_nested_str(_X20),
/* K9 */ be_nested_str(set_text),
}),
&be_const_str_set_time,
&be_const_str_solidified,
( &(const binstruction[27]) { /* code */
0xA4120000, // 0000 IMPORT R4 K0
0x88140101, // 0001 GETMBR R5 R0 K1
0x20140205, // 0002 NE R5 R1 R5
0x74160005, // 0003 JMPT R5 #000A
0x88140102, // 0004 GETMBR R5 R0 K2
0x20140405, // 0005 NE R5 R2 R5
0x74160002, // 0006 JMPT R5 #000A
0x88140103, // 0007 GETMBR R5 R0 K3
0x20140605, // 0008 NE R5 R3 R5
0x7816000F, // 0009 JMPF R5 #001A
0x8C140904, // 000A GETMET R5 R4 K4
0x581C0005, // 000B LDCONST R7 K5
0x5C200200, // 000C MOVE R8 R1
0x10240706, // 000D MOD R9 R3 K6
0x78260001, // 000E JMPF R9 #0011
0x58240007, // 000F LDCONST R9 K7
0x70020000, // 0010 JMP #0012
0x58240008, // 0011 LDCONST R9 K8
0x5C280400, // 0012 MOVE R10 R2
0x7C140A00, // 0013 CALL R5 5
0x90020201, // 0014 SETMBR R0 K1 R1
0x90020402, // 0015 SETMBR R0 K2 R2
0x90020603, // 0016 SETMBR R0 K3 R3
0x8C180109, // 0017 GETMET R6 R0 K9
0x5C200A00, // 0018 MOVE R8 R5
0x7C180400, // 0019 CALL R6 2
0x80000000, // 001A RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: every_second
********************************************************************/
be_local_closure(lv_clock_every_second, /* name */
be_nested_proto(
7, /* nstack */
1, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 9]) { /* constants */
/* K0 */ be_nested_str(tasmota),
/* K1 */ be_nested_str(time_dump),
/* K2 */ be_nested_str(rtc),
/* K3 */ be_nested_str(local),
/* K4 */ be_nested_str(year),
/* K5 */ be_nested_str(set_time),
/* K6 */ be_nested_str(hour),
/* K7 */ be_nested_str(min),
/* K8 */ be_nested_str(sec),
}),
&be_const_str_every_second,
&be_const_str_solidified,
( &(const binstruction[17]) { /* code */
0xB8060000, // 0000 GETNGBL R1 K0
0x8C040301, // 0001 GETMET R1 R1 K1
0xB80E0000, // 0002 GETNGBL R3 K0
0x8C0C0702, // 0003 GETMET R3 R3 K2
0x7C0C0200, // 0004 CALL R3 1
0x940C0703, // 0005 GETIDX R3 R3 K3
0x7C040400, // 0006 CALL R1 2
0x94080304, // 0007 GETIDX R2 R1 K4
0x540E07B1, // 0008 LDINT R3 1970
0x20080403, // 0009 NE R2 R2 R3
0x780A0004, // 000A JMPF R2 #0010
0x8C080105, // 000B GETMET R2 R0 K5
0x94100306, // 000C GETIDX R4 R1 K6
0x94140307, // 000D GETIDX R5 R1 K7
0x94180308, // 000E GETIDX R6 R1 K8
0x7C080800, // 000F CALL R2 4
0x80000000, // 0010 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: init
********************************************************************/
be_local_closure(lv_clock_init, /* name */
be_nested_proto(
8, /* nstack */
2, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
1, /* has sup protos */
( &(const struct bproto*[ 1]) {
be_nested_proto(
2, /* nstack */
0, /* argc */
0, /* varg */
1, /* has upvals */
( &(const bupvaldesc[ 1]) { /* upvals */
be_local_const_upval(1, 0),
}),
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 1]) { /* constants */
/* K0 */ be_nested_str(before_del),
}),
&be_const_str__X3Clambda_X3E,
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x68000000, // 0000 GETUPV R0 U0
0x8C000100, // 0001 GETMET R0 R0 K0
0x7C000200, // 0002 CALL R0 1
0x80040000, // 0003 RET 1 R0
})
),
}),
1, /* has constants */
( &(const bvalue[13]) { /* constants */
/* K0 */ be_nested_str(init),
/* K1 */ be_nested_str(lv),
/* K2 */ be_nested_str(seg7_font),
/* K3 */ be_nested_str(set_style_text_font),
/* K4 */ be_nested_str(PART_MAIN),
/* K5 */ be_nested_str(STATE_DEFAULT),
/* K6 */ be_nested_str(set_text),
/* K7 */ be_nested_str(_X2D_X2D_X3A_X2D_X2D),
/* K8 */ be_nested_str(add_event_cb),
/* K9 */ be_nested_str(EVENT_DELETE),
/* K10 */ be_const_int(0),
/* K11 */ be_nested_str(tasmota),
/* K12 */ be_nested_str(add_driver),
}),
&be_const_str_init,
&be_const_str_solidified,
( &(const binstruction[36]) { /* code */
0x60080003, // 0000 GETGBL R2 G3
0x5C0C0000, // 0001 MOVE R3 R0
0x7C080200, // 0002 CALL R2 1
0x8C080500, // 0003 GETMET R2 R2 K0
0x5C100200, // 0004 MOVE R4 R1
0x7C080400, // 0005 CALL R2 2
0xB80A0200, // 0006 GETNGBL R2 K1
0x8C080502, // 0007 GETMET R2 R2 K2
0x5412000F, // 0008 LDINT R4 16
0x7C080400, // 0009 CALL R2 2
0x4C0C0000, // 000A LDNIL R3
0x200C0403, // 000B NE R3 R2 R3
0x780E0007, // 000C JMPF R3 #0015
0x8C0C0103, // 000D GETMET R3 R0 K3
0x5C140400, // 000E MOVE R5 R2
0xB81A0200, // 000F GETNGBL R6 K1
0x88180D04, // 0010 GETMBR R6 R6 K4
0xB81E0200, // 0011 GETNGBL R7 K1
0x881C0F05, // 0012 GETMBR R7 R7 K5
0x30180C07, // 0013 OR R6 R6 R7
0x7C0C0600, // 0014 CALL R3 3
0x8C0C0106, // 0015 GETMET R3 R0 K6
0x58140007, // 0016 LDCONST R5 K7
0x7C0C0400, // 0017 CALL R3 2
0x8C0C0108, // 0018 GETMET R3 R0 K8
0x84140000, // 0019 CLOSURE R5 P0
0xB81A0200, // 001A GETNGBL R6 K1
0x88180D09, // 001B GETMBR R6 R6 K9
0x581C000A, // 001C LDCONST R7 K10
0x7C0C0800, // 001D CALL R3 4
0xB80E1600, // 001E GETNGBL R3 K11
0x8C0C070C, // 001F GETMET R3 R3 K12
0x5C140000, // 0020 MOVE R5 R0
0x7C0C0400, // 0021 CALL R3 2
0xA0000000, // 0022 CLOSE R0
0x80000000, // 0023 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: before_del
********************************************************************/
be_local_closure(lv_clock_before_del, /* name */
be_nested_proto(
4, /* nstack */
1, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 2]) { /* constants */
/* K0 */ be_nested_str(tasmota),
/* K1 */ be_nested_str(remove_driver),
}),
&be_const_str_before_del,
&be_const_str_solidified,
( &(const binstruction[ 5]) { /* code */
0xB8060000, // 0000 GETNGBL R1 K0
0x8C040301, // 0001 GETMET R1 R1 K1
0x5C0C0000, // 0002 MOVE R3 R0
0x7C040400, // 0003 CALL R1 2
0x80000000, // 0004 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified class: lv_clock
********************************************************************/
extern const bclass be_class_lv_label;
be_local_class(lv_clock,
3,
&be_class_lv_label,
be_nested_map(7,
( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key(sec, -1), be_const_var(2) },
{ be_const_key(hour, -1), be_const_var(0) },
{ be_const_key(before_del, 6), be_const_closure(lv_clock_before_del_closure) },
{ be_const_key(every_second, -1), be_const_closure(lv_clock_every_second_closure) },
{ be_const_key(minute, -1), be_const_var(1) },
{ be_const_key(set_time, 2), be_const_closure(lv_clock_set_time_closure) },
{ be_const_key(init, -1), be_const_closure(lv_clock_init_closure) },
})),
be_str_literal("lv_clock")
);
/*******************************************************************/
void be_load_lv_clock_class(bvm *vm) {
be_pushntvclass(vm, &be_class_lv_clock);
be_setglobal(vm, "lv_clock");
be_pop(vm, 1);
}
#endif // USE_LVGL

40
lib/libesp32/berry_tasmota/src/embedded/lv_clock_icon.be
View File

@ -2,7 +2,7 @@
- -
--# --#
class lv_clock_icon: lv.label class lv_clock: lv.label
var hour, minute, sec var hour, minute, sec
def init(parent) def init(parent)
@ -10,23 +10,9 @@ class lv_clock_icon: lv.label
var f_s7_16 = lv.seg7_font(16) var f_s7_16 = lv.seg7_font(16)
if f_s7_16 != nil self.set_style_text_font(f_s7_16, lv.PART_MAIN | lv.STATE_DEFAULT) end if f_s7_16 != nil self.set_style_text_font(f_s7_16, lv.PART_MAIN | lv.STATE_DEFAULT) end
if parent != nil self.set_text("--:--")
var parent_height = parent.get_height()
self.set_text("--:--")
self.refr_size()
var w = self.get_width()
self.set_y((parent.get_height() - self.get_height()) / 2) # center vertically
var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT)
self.set_x(parent.get_width() - w - pad_right - 3)
parent.set_style_pad_right(pad_right + w + 6, lv.PART_MAIN | lv.STATE_DEFAULT)
self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT)
end
self.add_event_cb(/->self.before_del(), lv.EVENT_DELETE, 0) # register `before_del` to be called when object is deleted self.add_event_cb(/->self.before_del(), lv.EVENT_DELETE, 0) # register `before_del` to be called when object is deleted
tasmota.add_driver(self) tasmota.add_driver(self)
end end
@ -52,4 +38,26 @@ class lv_clock_icon: lv.label
def before_del() def before_del()
tasmota.remove_driver(self) tasmota.remove_driver(self)
end end
end
class lv_clock_icon: lv_clock
def init(parent)
super(self).init(parent)
if parent != nil
var parent_height = parent.get_height()
self.refr_size()
var w = self.get_width()
self.set_y((parent.get_height() - self.get_height()) / 2) # center vertically
var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT)
self.set_x(parent.get_width() - w - pad_right - 3)
parent.set_style_pad_right(pad_right + w + 6, lv.PART_MAIN | lv.STATE_DEFAULT)
self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT)
end
end
end end

1
lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be
View File

@ -25,6 +25,7 @@ def init(lv_tasmota)
lv.screenshot = lv_tasmota.screenshot lv.screenshot = lv_tasmota.screenshot
# add widgets # add widgets
lv.clock = lv_clock
lv.clock_icon = lv_clock_icon lv.clock_icon = lv_clock_icon
lv.signal_arcs = lv_signal_arcs lv.signal_arcs = lv_signal_arcs
lv.signal_bars = lv_signal_bars lv.signal_bars = lv_signal_bars