From 26dddb5b7474ed1584e576588dfd85b61decf030 Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:40:35 +0100 Subject: [PATCH] Berry animate also returns value (#13744) * Berry animate also returns value * Berry Animate make closure optional --- lib/libesp32/Berry/default/be_animate_lib.c | 539 +++++++++--------- .../Berry/default/embedded/Animate.be | 27 +- 2 files changed, 275 insertions(+), 291 deletions(-) diff --git a/lib/libesp32/Berry/default/be_animate_lib.c b/lib/libesp32/Berry/default/be_animate_lib.c index 3253d25e5..db6052653 100644 --- a/lib/libesp32/Berry/default/be_animate_lib.c +++ b/lib/libesp32/Berry/default/be_animate_lib.c @@ -31,35 +31,32 @@ be_local_closure(Animate_rotate_init, /* name */ }), (be_nested_const_str("init", 380752755, 4)), ((bstring*) &be_const_str_input), - ( &(const binstruction[28]) { /* code */ + ( &(const binstruction[25]) { /* code */ 0x60140003, // 0000 GETGBL R5 G3 0x5C180000, // 0001 MOVE R6 R0 0x7C140200, // 0002 CALL R5 1 0x8C140B00, // 0003 GETMET R5 R5 K0 0x7C140200, // 0004 CALL R5 1 - 0x4C140000, // 0005 LDNIL R5 - 0x20140205, // 0006 NE R5 R1 R5 - 0x78160000, // 0007 JMPF R5 #0009 - 0x90020201, // 0008 SETMBR R0 K1 R1 - 0x88140102, // 0009 GETMBR R5 R0 K2 - 0x8C140B03, // 000A GETMET R5 R5 K3 - 0xB81E0800, // 000B GETNGBL R7 K4 - 0x8C1C0F05, // 000C GETMET R7 R7 K5 - 0x5C240400, // 000D MOVE R9 R2 - 0x5C280600, // 000E MOVE R10 R3 - 0x5C2C0800, // 000F MOVE R11 R4 - 0x7C1C0800, // 0010 CALL R7 4 - 0x7C140400, // 0011 CALL R5 2 - 0x88140102, // 0012 GETMBR R5 R0 K2 - 0x8C140B03, // 0013 GETMET R5 R5 K3 - 0xB81E0800, // 0014 GETNGBL R7 K4 - 0x8C1C0F06, // 0015 GETMET R7 R7 K6 - 0x58240007, // 0016 LDCONST R9 K7 - 0x58280007, // 0017 LDCONST R10 K7 - 0x582C0007, // 0018 LDCONST R11 K7 - 0x7C1C0800, // 0019 CALL R7 4 - 0x7C140400, // 001A CALL R5 2 - 0x80000000, // 001B RET 0 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x5C2C0800, // 000C MOVE R11 R4 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x88140102, // 000F GETMBR R5 R0 K2 + 0x8C140B03, // 0010 GETMET R5 R5 K3 + 0xB81E0800, // 0011 GETNGBL R7 K4 + 0x8C1C0F06, // 0012 GETMET R7 R7 K6 + 0x58240007, // 0013 LDCONST R9 K7 + 0x58280007, // 0014 LDCONST R10 K7 + 0x582C0007, // 0015 LDCONST R11 K7 + 0x7C1C0800, // 0016 CALL R7 4 + 0x7C140400, // 0017 CALL R5 2 + 0x80000000, // 0018 RET 0 }) ) ); @@ -103,26 +100,23 @@ be_local_closure(Animate_from_to_init, /* name */ }), (be_nested_const_str("init", 380752755, 4)), ((bstring*) &be_const_str_input), - ( &(const binstruction[19]) { /* code */ + ( &(const binstruction[16]) { /* code */ 0x60140003, // 0000 GETGBL R5 G3 0x5C180000, // 0001 MOVE R6 R0 0x7C140200, // 0002 CALL R5 1 0x8C140B00, // 0003 GETMET R5 R5 K0 0x7C140200, // 0004 CALL R5 1 - 0x4C140000, // 0005 LDNIL R5 - 0x20140205, // 0006 NE R5 R1 R5 - 0x78160000, // 0007 JMPF R5 #0009 - 0x90020201, // 0008 SETMBR R0 K1 R1 - 0x88140102, // 0009 GETMBR R5 R0 K2 - 0x8C140B03, // 000A GETMET R5 R5 K3 - 0xB81E0800, // 000B GETNGBL R7 K4 - 0x8C1C0F05, // 000C GETMET R7 R7 K5 - 0x5C240400, // 000D MOVE R9 R2 - 0x5C280600, // 000E MOVE R10 R3 - 0x5C2C0800, // 000F MOVE R11 R4 - 0x7C1C0800, // 0010 CALL R7 4 - 0x7C140400, // 0011 CALL R5 2 - 0x80000000, // 0012 RET 0 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x5C2C0800, // 000C MOVE R11 R4 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x80000000, // 000F RET 0 }) ) ); @@ -169,44 +163,41 @@ be_local_closure(Animate_back_forth_init, /* name */ }), (be_nested_const_str("init", 380752755, 4)), ((bstring*) &be_const_str_input), - ( &(const binstruction[37]) { /* code */ + ( &(const binstruction[34]) { /* code */ 0x60140003, // 0000 GETGBL R5 G3 0x5C180000, // 0001 MOVE R6 R0 0x7C140200, // 0002 CALL R5 1 0x8C140B00, // 0003 GETMET R5 R5 K0 0x7C140200, // 0004 CALL R5 1 - 0x4C140000, // 0005 LDNIL R5 - 0x20140205, // 0006 NE R5 R1 R5 - 0x78160000, // 0007 JMPF R5 #0009 - 0x90020201, // 0008 SETMBR R0 K1 R1 - 0x88140102, // 0009 GETMBR R5 R0 K2 - 0x8C140B03, // 000A GETMET R5 R5 K3 - 0xB81E0800, // 000B GETNGBL R7 K4 - 0x8C1C0F05, // 000C GETMET R7 R7 K5 - 0x5C240400, // 000D MOVE R9 R2 - 0x5C280600, // 000E MOVE R10 R3 - 0x0C2C0906, // 000F DIV R11 R4 K6 - 0x7C1C0800, // 0010 CALL R7 4 - 0x7C140400, // 0011 CALL R5 2 - 0x88140102, // 0012 GETMBR R5 R0 K2 - 0x8C140B03, // 0013 GETMET R5 R5 K3 - 0xB81E0800, // 0014 GETNGBL R7 K4 - 0x8C1C0F05, // 0015 GETMET R7 R7 K5 - 0x5C240600, // 0016 MOVE R9 R3 - 0x5C280400, // 0017 MOVE R10 R2 - 0x0C2C0906, // 0018 DIV R11 R4 K6 - 0x7C1C0800, // 0019 CALL R7 4 - 0x7C140400, // 001A CALL R5 2 - 0x88140102, // 001B GETMBR R5 R0 K2 - 0x8C140B03, // 001C GETMET R5 R5 K3 - 0xB81E0800, // 001D GETNGBL R7 K4 - 0x8C1C0F07, // 001E GETMET R7 R7 K7 - 0x58240008, // 001F LDCONST R9 K8 - 0x58280008, // 0020 LDCONST R10 K8 - 0x582C0008, // 0021 LDCONST R11 K8 - 0x7C1C0800, // 0022 CALL R7 4 - 0x7C140400, // 0023 CALL R5 2 - 0x80000000, // 0024 RET 0 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x0C2C0906, // 000C DIV R11 R4 K6 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x88140102, // 000F GETMBR R5 R0 K2 + 0x8C140B03, // 0010 GETMET R5 R5 K3 + 0xB81E0800, // 0011 GETNGBL R7 K4 + 0x8C1C0F05, // 0012 GETMET R7 R7 K5 + 0x5C240600, // 0013 MOVE R9 R3 + 0x5C280400, // 0014 MOVE R10 R2 + 0x0C2C0906, // 0015 DIV R11 R4 K6 + 0x7C1C0800, // 0016 CALL R7 4 + 0x7C140400, // 0017 CALL R5 2 + 0x88140102, // 0018 GETMBR R5 R0 K2 + 0x8C140B03, // 0019 GETMET R5 R5 K3 + 0xB81E0800, // 001A GETNGBL R7 K4 + 0x8C1C0F07, // 001B GETMET R7 R7 K7 + 0x58240008, // 001C LDCONST R9 K8 + 0x58280008, // 001D LDCONST R10 K8 + 0x582C0008, // 001E LDCONST R11 K8 + 0x7C1C0800, // 001F CALL R7 4 + 0x7C140400, // 0020 CALL R5 2 + 0x80000000, // 0021 RET 0 }) ) ); @@ -321,71 +312,49 @@ be_local_class(Animate_ins_ramp, (be_nested_const_str("Animate_ins_ramp", 785058280, 16)) ); -/******************************************************************** -** Solidified function: is_running -********************************************************************/ -be_local_closure(Animate_engine_is_running, /* name */ - be_nested_proto( - 2, /* nstack */ - 1, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - ( &(const bvalue[ 1]) { /* constants */ - /* K0 */ be_nested_string("running", 343848780, 7), - }), - (be_nested_const_str("is_running", -2068120035, 10)), - ((bstring*) &be_const_str_input), - ( &(const binstruction[ 2]) { /* code */ - 0x88040100, // 0000 GETMBR R1 R0 K0 - 0x80040200, // 0001 RET 1 R1 - }) - ) -); -/*******************************************************************/ - - /******************************************************************** ** Solidified function: run ********************************************************************/ be_local_closure(Animate_engine_run, /* name */ be_nested_proto( - 5, /* nstack */ - 2, /* argc */ + 6, /* nstack */ + 3, /* argc */ 0, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[ 5]) { /* constants */ + ( &(const bvalue[ 6]) { /* constants */ /* K0 */ be_nested_string("tasmota", 424643812, 7), /* K1 */ be_nested_string("millis", 1214679063, 6), - /* K2 */ be_nested_string("ins_time", -1314721743, 8), - /* K3 */ be_nested_string("running", 343848780, 7), - /* K4 */ be_nested_string("add_driver", 1654458371, 10), + /* K2 */ be_nested_string("value", 1113510858, 5), + /* K3 */ be_nested_string("ins_time", -1314721743, 8), + /* K4 */ be_nested_string("running", 343848780, 7), + /* K5 */ be_nested_string("add_driver", 1654458371, 10), }), (be_nested_const_str("run", 718098122, 3)), ((bstring*) &be_const_str_input), - ( &(const binstruction[15]) { /* code */ - 0x4C080000, // 0000 LDNIL R2 - 0x1C080202, // 0001 EQ R2 R1 R2 - 0x780A0003, // 0002 JMPF R2 #0007 - 0xB80A0000, // 0003 GETNGBL R2 K0 - 0x8C080501, // 0004 GETMET R2 R2 K1 - 0x7C080200, // 0005 CALL R2 1 - 0x5C040400, // 0006 MOVE R1 R2 - 0x90020401, // 0007 SETMBR R0 K2 R1 - 0x50080200, // 0008 LDBOOL R2 1 0 - 0x90020602, // 0009 SETMBR R0 K3 R2 - 0xB80A0000, // 000A GETNGBL R2 K0 - 0x8C080504, // 000B GETMET R2 R2 K4 - 0x5C100000, // 000C MOVE R4 R0 - 0x7C080400, // 000D CALL R2 2 - 0x80000000, // 000E RET 0 + ( &(const binstruction[19]) { /* code */ + 0x4C0C0000, // 0000 LDNIL R3 + 0x1C0C0203, // 0001 EQ R3 R1 R3 + 0x780E0003, // 0002 JMPF R3 #0007 + 0xB80E0000, // 0003 GETNGBL R3 K0 + 0x8C0C0701, // 0004 GETMET R3 R3 K1 + 0x7C0C0200, // 0005 CALL R3 1 + 0x5C040600, // 0006 MOVE R1 R3 + 0x4C0C0000, // 0007 LDNIL R3 + 0x200C0403, // 0008 NE R3 R2 R3 + 0x780E0000, // 0009 JMPF R3 #000B + 0x90020402, // 000A SETMBR R0 K2 R2 + 0x90020601, // 000B SETMBR R0 K3 R1 + 0x500C0200, // 000C LDBOOL R3 1 0 + 0x90020803, // 000D SETMBR R0 K4 R3 + 0xB80E0000, // 000E GETNGBL R3 K0 + 0x8C0C0705, // 000F GETMET R3 R3 K5 + 0x5C140000, // 0010 MOVE R5 R0 + 0x7C0C0400, // 0011 CALL R3 2 + 0x80000000, // 0012 RET 0 }) ) ); @@ -402,53 +371,27 @@ be_local_closure(Animate_engine_init, /* name */ 0, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ - 1, /* has sup protos */ - ( &(const struct bproto*[ 1]) { - be_nested_proto( - 4, /* nstack */ - 1, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - ( &(const bvalue[ 1]) { /* constants */ - /* K0 */ be_nested_string("Animate next value:", 443143038, 19), - }), - (be_nested_const_str("_anonymous_", 1957281476, 11)), - ((bstring*) &be_const_str_input), - ( &(const binstruction[ 5]) { /* code */ - 0x60040001, // 0000 GETGBL R1 G1 - 0x58080000, // 0001 LDCONST R2 K0 - 0x5C0C0000, // 0002 MOVE R3 R0 - 0x7C040400, // 0003 CALL R1 2 - 0x80000000, // 0004 RET 0 - }) - ), - }), + 0, /* has sup protos */ + NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[ 6]) { /* constants */ + ( &(const bvalue[ 5]) { /* constants */ /* K0 */ be_nested_string("code", -114201356, 4), - /* K1 */ be_nested_string("closure", 1548407746, 7), - /* K2 */ be_nested_string("pc", 1313756516, 2), - /* K3 */ be_const_int(0), - /* K4 */ be_nested_string("ins_time", -1314721743, 8), - /* K5 */ be_nested_string("running", 343848780, 7), + /* K1 */ be_nested_string("pc", 1313756516, 2), + /* K2 */ be_const_int(0), + /* K3 */ be_nested_string("ins_time", -1314721743, 8), + /* K4 */ be_nested_string("running", 343848780, 7), }), (be_nested_const_str("init", 380752755, 4)), ((bstring*) &be_const_str_input), - ( &(const binstruction[10]) { /* code */ + ( &(const binstruction[ 8]) { /* code */ 0x60040012, // 0000 GETGBL R1 G18 0x7C040000, // 0001 CALL R1 0 0x90020001, // 0002 SETMBR R0 K0 R1 - 0x84040000, // 0003 CLOSURE R1 P0 - 0x90020201, // 0004 SETMBR R0 K1 R1 - 0x90020503, // 0005 SETMBR R0 K2 K3 - 0x90020903, // 0006 SETMBR R0 K4 K3 - 0x50040000, // 0007 LDBOOL R1 0 0 - 0x90020A01, // 0008 SETMBR R0 K5 R1 - 0x80000000, // 0009 RET 0 + 0x90020302, // 0003 SETMBR R0 K1 K2 + 0x90020702, // 0004 SETMBR R0 K3 K2 + 0x50040000, // 0005 LDBOOL R1 0 0 + 0x90020801, // 0006 SETMBR R0 K4 R1 + 0x80000000, // 0007 RET 0 }) ) ); @@ -456,27 +399,35 @@ be_local_closure(Animate_engine_init, /* name */ /******************************************************************** -** Solidified function: every_50ms +** Solidified function: autorun ********************************************************************/ -be_local_closure(Animate_engine_every_50ms, /* name */ +be_local_closure(Animate_engine_autorun, /* name */ be_nested_proto( - 3, /* nstack */ - 1, /* argc */ + 7, /* nstack */ + 3, /* argc */ 0, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[ 1]) { /* constants */ - /* K0 */ be_nested_string("animate", -409180496, 7), + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_string("run", 718098122, 3), + /* K1 */ be_nested_string("tasmota", 424643812, 7), + /* K2 */ be_nested_string("add_driver", 1654458371, 10), }), - (be_nested_const_str("every_50ms", -1911083288, 10)), + (be_nested_const_str("autorun", 1447527407, 7)), ((bstring*) &be_const_str_input), - ( &(const binstruction[ 3]) { /* code */ - 0x8C040100, // 0000 GETMET R1 R0 K0 - 0x7C040200, // 0001 CALL R1 1 - 0x80000000, // 0002 RET 0 + ( &(const binstruction[ 9]) { /* code */ + 0x8C0C0100, // 0000 GETMET R3 R0 K0 + 0x5C140200, // 0001 MOVE R5 R1 + 0x5C180400, // 0002 MOVE R6 R2 + 0x7C0C0600, // 0003 CALL R3 3 + 0xB80E0200, // 0004 GETNGBL R3 K1 + 0x8C0C0702, // 0005 GETMET R3 R3 K2 + 0x5C140000, // 0006 MOVE R5 R0 + 0x7C0C0400, // 0007 CALL R3 2 + 0x80000000, // 0008 RET 0 }) ) ); @@ -517,6 +468,61 @@ be_local_closure(Animate_engine_stop, /* name */ /*******************************************************************/ +/******************************************************************** +** Solidified function: is_running +********************************************************************/ +be_local_closure(Animate_engine_is_running, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_string("running", 343848780, 7), + }), + (be_nested_const_str("is_running", -2068120035, 10)), + ((bstring*) &be_const_str_input), + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: every_50ms +********************************************************************/ +be_local_closure(Animate_engine_every_50ms, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_string("animate", -409180496, 7), + }), + (be_nested_const_str("every_50ms", -1911083288, 10)), + ((bstring*) &be_const_str_input), + ( &(const binstruction[ 3]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x7C040200, // 0001 CALL R1 1 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + /******************************************************************** ** Solidified function: animate ********************************************************************/ @@ -530,7 +536,7 @@ be_local_closure(Animate_engine_animate, /* name */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[21]) { /* constants */ + ( &(const bvalue[22]) { /* constants */ /* K0 */ be_nested_string("running", 343848780, 7), /* K1 */ be_nested_string("tasmota", 424643812, 7), /* K2 */ be_nested_string("millis", 1214679063, 6), @@ -544,18 +550,19 @@ be_local_closure(Animate_engine_animate, /* name */ /* K10 */ be_nested_string("ins_ramp", 1068049360, 8), /* K11 */ be_nested_string("closure", 1548407746, 7), /* K12 */ be_nested_string("duration", 799079693, 8), - /* K13 */ be_nested_string("scale_uint", -1204156202, 10), - /* K14 */ be_nested_string("a", -468965076, 1), - /* K15 */ be_nested_string("b", -418632219, 1), - /* K16 */ be_const_int(1), - /* K17 */ be_nested_string("ins_goto", 1342843963, 8), - /* K18 */ be_nested_string("pc_rel", 991921176, 6), - /* K19 */ be_nested_string("pc_abs", 920256495, 6), - /* K20 */ be_nested_string("unknown instruction", 1093911841, 19), + /* K13 */ be_nested_string("value", 1113510858, 5), + /* K14 */ be_nested_string("scale_uint", -1204156202, 10), + /* K15 */ be_nested_string("a", -468965076, 1), + /* K16 */ be_nested_string("b", -418632219, 1), + /* K17 */ be_const_int(1), + /* K18 */ be_nested_string("ins_goto", 1342843963, 8), + /* K19 */ be_nested_string("pc_rel", 991921176, 6), + /* K20 */ be_nested_string("pc_abs", 920256495, 6), + /* K21 */ be_nested_string("unknown instruction", 1093911841, 19), }), (be_nested_const_str("animate", -409180496, 7)), ((bstring*) &be_const_str_input), - ( &(const binstruction[93]) { /* code */ + ( &(const binstruction[99]) { /* code */ 0x88080100, // 0000 GETMBR R2 R0 K0 0x740A0000, // 0001 JMPT R2 #0003 0x80000400, // 0002 RET 0 @@ -567,7 +574,7 @@ be_local_closure(Animate_engine_animate, /* name */ 0x7C080200, // 0008 CALL R2 1 0x5C040400, // 0009 MOVE R1 R2 0x50080200, // 000A LDBOOL R2 1 0 - 0x780A004F, // 000B JMPF R2 #005C + 0x780A0054, // 000B JMPF R2 #0061 0x88080103, // 000C GETMBR R2 R0 K3 0x04080202, // 000D SUB R2 R1 R2 0x880C0104, // 000E GETMBR R3 R0 K4 @@ -578,7 +585,7 @@ be_local_closure(Animate_engine_animate, /* name */ 0x780E0002, // 0013 JMPF R3 #0017 0x500C0000, // 0014 LDBOOL R3 0 0 0x90020003, // 0015 SETMBR R0 K0 R3 - 0x70020044, // 0016 JMP #005C + 0x70020049, // 0016 JMP #0061 0x880C0104, // 0017 GETMBR R3 R0 K4 0x140C0706, // 0018 LT R3 R3 K6 0x780E0000, // 0019 JMPF R3 #001B @@ -591,99 +598,70 @@ be_local_closure(Animate_engine_animate, /* name */ 0xB81E1200, // 0020 GETNGBL R7 K9 0x881C0F0A, // 0021 GETMBR R7 R7 K10 0x7C140400, // 0022 CALL R5 2 - 0x7816001B, // 0023 JMPF R5 #0040 + 0x78160020, // 0023 JMPF R5 #0045 0x8810010B, // 0024 GETMBR R4 R0 K11 0x8814070C, // 0025 GETMBR R5 R3 K12 0x14140405, // 0026 LT R5 R2 R5 - 0x7816000C, // 0027 JMPF R5 #0035 + 0x7816000E, // 0027 JMPF R5 #0037 0xB8160200, // 0028 GETNGBL R5 K1 - 0x8C140B0D, // 0029 GETMET R5 R5 K13 + 0x8C140B0E, // 0029 GETMET R5 R5 K14 0x5C1C0400, // 002A MOVE R7 R2 0x58200006, // 002B LDCONST R8 K6 0x8824070C, // 002C GETMBR R9 R3 K12 - 0x8828070E, // 002D GETMBR R10 R3 K14 - 0x882C070F, // 002E GETMBR R11 R3 K15 + 0x8828070F, // 002D GETMBR R10 R3 K15 + 0x882C0710, // 002E GETMBR R11 R3 K16 0x7C140C00, // 002F CALL R5 6 - 0x5C180800, // 0030 MOVE R6 R4 - 0x5C1C0A00, // 0031 MOVE R7 R5 - 0x7C180200, // 0032 CALL R6 1 - 0x70020027, // 0033 JMP #005C - 0x70020009, // 0034 JMP #003F - 0x5C140800, // 0035 MOVE R5 R4 - 0x8818070F, // 0036 GETMBR R6 R3 K15 - 0x7C140200, // 0037 CALL R5 1 - 0x88140104, // 0038 GETMBR R5 R0 K4 - 0x00140B10, // 0039 ADD R5 R5 K16 - 0x90020805, // 003A SETMBR R0 K4 R5 - 0x8814070C, // 003B GETMBR R5 R3 K12 - 0x04140405, // 003C SUB R5 R2 R5 - 0x04140205, // 003D SUB R5 R1 R5 - 0x90020605, // 003E SETMBR R0 K3 R5 - 0x7002001A, // 003F JMP #005B - 0x6010000F, // 0040 GETGBL R4 G15 - 0x5C140600, // 0041 MOVE R5 R3 - 0xB81A1200, // 0042 GETNGBL R6 K9 - 0x88180D11, // 0043 GETMBR R6 R6 K17 - 0x7C100400, // 0044 CALL R4 2 - 0x78120013, // 0045 JMPF R4 #005A - 0x8810070C, // 0046 GETMBR R4 R3 K12 - 0x14100404, // 0047 LT R4 R2 R4 - 0x78120001, // 0048 JMPF R4 #004B - 0x70020011, // 0049 JMP #005C - 0x7002000D, // 004A JMP #0059 - 0x88100712, // 004B GETMBR R4 R3 K18 - 0x20100906, // 004C NE R4 R4 K6 - 0x78120004, // 004D JMPF R4 #0053 - 0x88100104, // 004E GETMBR R4 R0 K4 - 0x88140712, // 004F GETMBR R5 R3 K18 - 0x00100805, // 0050 ADD R4 R4 R5 - 0x90020804, // 0051 SETMBR R0 K4 R4 - 0x70020001, // 0052 JMP #0055 - 0x88100713, // 0053 GETMBR R4 R3 K19 - 0x90020804, // 0054 SETMBR R0 K4 R4 - 0x8810070C, // 0055 GETMBR R4 R3 K12 - 0x04100404, // 0056 SUB R4 R2 R4 - 0x04100204, // 0057 SUB R4 R1 R4 - 0x90020604, // 0058 SETMBR R0 K3 R4 - 0x70020000, // 0059 JMP #005B - 0xB0060F14, // 005A RAISE 1 K7 K20 - 0x7001FFAD, // 005B JMP #000A - 0x80000000, // 005C RET 0 - }) - ) -); -/*******************************************************************/ - - -/******************************************************************** -** Solidified function: autorun -********************************************************************/ -be_local_closure(Animate_engine_autorun, /* name */ - be_nested_proto( - 5, /* nstack */ - 2, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - ( &(const bvalue[ 3]) { /* constants */ - /* K0 */ be_nested_string("run", 718098122, 3), - /* K1 */ be_nested_string("tasmota", 424643812, 7), - /* K2 */ be_nested_string("add_driver", 1654458371, 10), - }), - (be_nested_const_str("autorun", 1447527407, 7)), - ((bstring*) &be_const_str_input), - ( &(const binstruction[ 8]) { /* code */ - 0x8C080100, // 0000 GETMET R2 R0 K0 - 0x5C100200, // 0001 MOVE R4 R1 - 0x7C080400, // 0002 CALL R2 2 - 0xB80A0200, // 0003 GETNGBL R2 K1 - 0x8C080502, // 0004 GETMET R2 R2 K2 - 0x5C100000, // 0005 MOVE R4 R0 - 0x7C080400, // 0006 CALL R2 2 - 0x80000000, // 0007 RET 0 + 0x90021A05, // 0030 SETMBR R0 K13 R5 + 0x78120002, // 0031 JMPF R4 #0035 + 0x5C140800, // 0032 MOVE R5 R4 + 0x8818010D, // 0033 GETMBR R6 R0 K13 + 0x7C140200, // 0034 CALL R5 1 + 0x7002002A, // 0035 JMP #0061 + 0x7002000C, // 0036 JMP #0044 + 0x88140710, // 0037 GETMBR R5 R3 K16 + 0x90021A05, // 0038 SETMBR R0 K13 R5 + 0x78120002, // 0039 JMPF R4 #003D + 0x5C140800, // 003A MOVE R5 R4 + 0x8818010D, // 003B GETMBR R6 R0 K13 + 0x7C140200, // 003C CALL R5 1 + 0x88140104, // 003D GETMBR R5 R0 K4 + 0x00140B11, // 003E ADD R5 R5 K17 + 0x90020805, // 003F SETMBR R0 K4 R5 + 0x8814070C, // 0040 GETMBR R5 R3 K12 + 0x04140405, // 0041 SUB R5 R2 R5 + 0x04140205, // 0042 SUB R5 R1 R5 + 0x90020605, // 0043 SETMBR R0 K3 R5 + 0x7002001A, // 0044 JMP #0060 + 0x6010000F, // 0045 GETGBL R4 G15 + 0x5C140600, // 0046 MOVE R5 R3 + 0xB81A1200, // 0047 GETNGBL R6 K9 + 0x88180D12, // 0048 GETMBR R6 R6 K18 + 0x7C100400, // 0049 CALL R4 2 + 0x78120013, // 004A JMPF R4 #005F + 0x8810070C, // 004B GETMBR R4 R3 K12 + 0x14100404, // 004C LT R4 R2 R4 + 0x78120001, // 004D JMPF R4 #0050 + 0x70020011, // 004E JMP #0061 + 0x7002000D, // 004F JMP #005E + 0x88100713, // 0050 GETMBR R4 R3 K19 + 0x20100906, // 0051 NE R4 R4 K6 + 0x78120004, // 0052 JMPF R4 #0058 + 0x88100104, // 0053 GETMBR R4 R0 K4 + 0x88140713, // 0054 GETMBR R5 R3 K19 + 0x00100805, // 0055 ADD R4 R4 R5 + 0x90020804, // 0056 SETMBR R0 K4 R4 + 0x70020001, // 0057 JMP #005A + 0x88100714, // 0058 GETMBR R4 R3 K20 + 0x90020804, // 0059 SETMBR R0 K4 R4 + 0x8810070C, // 005A GETMBR R4 R3 K12 + 0x04100404, // 005B SUB R4 R2 R4 + 0x04100204, // 005C SUB R4 R1 R4 + 0x90020604, // 005D SETMBR R0 K3 R4 + 0x70020000, // 005E JMP #0060 + 0xB0060F15, // 005F RAISE 1 K7 K21 + 0x7001FFA8, // 0060 JMP #000A + 0x8808010D, // 0061 GETMBR R2 R0 K13 + 0x80040400, // 0062 RET 1 R2 }) ) ); @@ -694,22 +672,23 @@ be_local_closure(Animate_engine_autorun, /* name */ ** Solidified class: Animate_engine ********************************************************************/ be_local_class(Animate_engine, - 5, + 6, NULL, - be_nested_map(12, + be_nested_map(13, ( (struct bmapnode*) &(const bmapnode[]) { - { be_nested_key("running", 343848780, 7, -1), be_const_var(4) }, - { be_nested_key("is_running", -2068120035, 10, 7), be_const_closure(Animate_engine_is_running_closure) }, - { be_nested_key("run", 718098122, 3, -1), be_const_closure(Animate_engine_run_closure) }, + { be_nested_key("code", -114201356, 4, -1), be_const_var(0) }, + { be_nested_key("run", 718098122, 3, 4), be_const_closure(Animate_engine_run_closure) }, + { be_nested_key("running", 343848780, 7, 8), be_const_var(4) }, { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_engine_init_closure) }, - { be_nested_key("every_50ms", -1911083288, 10, -1), be_const_closure(Animate_engine_every_50ms_closure) }, - { be_nested_key("stop", -883741979, 4, -1), be_const_closure(Animate_engine_stop_closure) }, - { be_nested_key("pc", 1313756516, 2, 4), be_const_var(2) }, - { be_nested_key("ins_time", -1314721743, 8, -1), be_const_var(3) }, - { be_nested_key("animate", -409180496, 7, 9), be_const_closure(Animate_engine_animate_closure) }, - { be_nested_key("code", -114201356, 4, 6), be_const_var(0) }, - { be_nested_key("closure", 1548407746, 7, -1), be_const_var(1) }, { be_nested_key("autorun", 1447527407, 7, -1), be_const_closure(Animate_engine_autorun_closure) }, + { be_nested_key("value", 1113510858, 5, -1), be_const_var(5) }, + { be_nested_key("stop", -883741979, 4, 3), be_const_closure(Animate_engine_stop_closure) }, + { be_nested_key("pc", 1313756516, 2, -1), be_const_var(2) }, + { be_nested_key("is_running", -2068120035, 10, 11), be_const_closure(Animate_engine_is_running_closure) }, + { be_nested_key("every_50ms", -1911083288, 10, 10), be_const_closure(Animate_engine_every_50ms_closure) }, + { be_nested_key("animate", -409180496, 7, -1), be_const_closure(Animate_engine_animate_closure) }, + { be_nested_key("closure", 1548407746, 7, -1), be_const_var(1) }, + { be_nested_key("ins_time", -1314721743, 8, 9), be_const_var(3) }, })), (be_nested_const_str("Animate_engine", 1498417667, 14)) ); diff --git a/lib/libesp32/Berry/default/embedded/Animate.be b/lib/libesp32/Berry/default/embedded/Animate.be index 6f4f28fcc..279fd39ed 100644 --- a/lib/libesp32/Berry/default/embedded/Animate.be +++ b/lib/libesp32/Berry/default/embedded/Animate.be @@ -40,10 +40,10 @@ class Animate_engine var pc # program-counter var ins_time # absolute time when the current instruction started var running # is the animation running? allows fast return + var value # current value def init() self.code = [] - self.closure = def (v) print("Animate next value:", v) end # default to debug function self.pc = 0 # start at instruction 0 self.ins_time = 0 self.running = false # not running by default @@ -51,8 +51,11 @@ class Animate_engine end # run but needs external calls to `animate()` - def run(cur_time) + # cur_time:int (opt) current timestamp in ms, defaults to `tasmota.millis()` + # val:int (opt) starting value, default to `nil` + def run(cur_time, val) if cur_time == nil cur_time = tasmota.millis() end + if (val != nil) self.value = val end self.ins_time = cur_time self.running = true @@ -60,8 +63,8 @@ class Animate_engine end # runs autonomously in the Tasmota event loop - def autorun(cur_time) - self.run(cur_time) + def autorun(cur_time, val) + self.run(cur_time, val) tasmota.add_driver(self) end @@ -96,15 +99,16 @@ class Animate_engine # Instruction Ramp if isinstance(ins, animate.ins_ramp) - var f = self.closure # assign to a local variable to not call a method + var f = self.closure # assign to a local variable to not call a method if sub_index < ins.duration # we're still in the ramp - var v = tasmota.scale_uint(sub_index, 0, ins.duration, ins.a, ins.b) + self.value = tasmota.scale_uint(sub_index, 0, ins.duration, ins.a, ins.b) # call closure - f(v) # call closure, need try? TODO + if f f(self.value) end # call closure, need try? TODO break else - f(ins.b) # set to last value + self.value = ins.b + if f f(self.value) end # set to last value self.pc += 1 # next instruction self.ins_time = cur_time - (sub_index - ins.duration) end @@ -127,6 +131,7 @@ class Animate_engine raise "internal_error", "unknown instruction" end end + return self.value end end @@ -136,7 +141,7 @@ class Animate_from_to : Animate_engine def init(closure, from, to, duration) super(self).init() - if closure != nil self.closure = closure end + self.closure = closure self.code.push(animate.ins_ramp(from, to, duration)) end @@ -152,7 +157,7 @@ class Animate_rotate : Animate_engine def init(closure, from, to, duration) super(self).init() - if closure != nil self.closure = closure end + self.closure = closure self.code.push(animate.ins_ramp(from, to, duration)) self.code.push(animate.ins_goto(0, 0, 0)) # goto abs pc = 0 without any pause end @@ -169,7 +174,7 @@ class Animate_back_forth : Animate_engine def init(closure, from, to, duration) super(self).init() - if closure != nil self.closure = closure end + self.closure = closure self.code.push(animate.ins_ramp(from, to, duration / 2)) self.code.push(animate.ins_ramp(to, from, duration / 2)) self.code.push(animate.ins_goto(0, 0, 0)) # goto abs pc = 0 without any pause