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

Improve animation (#20246)

This commit is contained in:
s-hadinger 2023-12-16 17:26:58 +01:00 committed by GitHub
parent d10b30ef55
commit 3f4b69f91c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 705 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libesp32/berry_tasmota/src/embedded/animate_0_core.be
View File

@ -62,6 +62,28 @@ class Animate_core
self.animators.push(anim)
end
# remove a specific animator
# remove all animators if no parameter or nil
# silently ignores if the animator can't be found
def remove_animator(anim)
var animators = self.animators
if (anim != nil)
animators.remove(animators.find(anim))
else
animators.clear()
end
end
def remove_painter(p)
var painters = self.painters
if (p != nil)
painters.remove(painters.find(p))
else
painters.clear()
end
end
def add_painter(painter)
self.painters.push(painter)
end

5
lib/libesp32/berry_tasmota/src/embedded/animate_9_module.be
View File

@ -444,6 +444,11 @@ class Animate_oscillator : Animate_animator
self.b = b
end
def set_form(form)
if (form == nil) form = 1 end
self.form = form
end
def animate(millis)
if (self.duration_ms == nil) return end
if millis == nil millis = tasmota.millis() end

1018
lib/libesp32/berry_tasmota/src/solidify/solidified_animate_0_core.h
View File

File diff suppressed because it is too large Load Diff

213
lib/libesp32/berry_tasmota/src/solidify/solidified_animate_9_module.h
View File

@ -1106,11 +1106,11 @@ void be_load_Animate_palette_class(bvm *vm) {
extern const bclass be_class_Animate_oscillator;
/********************************************************************
** Solidified function: set_b
** Solidified function: set_duty_cycle
********************************************************************/
be_local_closure(Animate_oscillator_set_b, /* name */
be_local_closure(Animate_oscillator_set_duty_cycle, /* name */
be_nested_proto(
2, /* nstack */
3, /* nstack */
2, /* argc */
2, /* varg */
0, /* has upvals */
@ -1118,14 +1118,22 @@ be_local_closure(Animate_oscillator_set_b, /* name */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 1]) { /* constants */
/* K0 */ be_nested_str_weak(b),
( &(const bvalue[ 2]) { /* constants */
/* K0 */ be_const_int(0),
/* K1 */ be_nested_str_weak(duty_cycle),
}),
be_str_weak(set_b),
be_str_weak(set_duty_cycle),
&be_const_str_solidified,
( &(const binstruction[ 2]) { /* code */
0x90020001, // 0000 SETMBR R0 K0 R1
0x80000000, // 0001 RET 0
( &(const binstruction[ 9]) { /* code */
0x14080300, // 0000 LT R2 R1 K0
0x780A0000, // 0001 JMPF R2 #0003
0x58040000, // 0002 LDCONST R1 K0
0x540A0063, // 0003 LDINT R2 100
0x24080202, // 0004 GT R2 R1 R2
0x780A0000, // 0005 JMPF R2 #0007
0x54060063, // 0006 LDINT R1 100
0x90020201, // 0007 SETMBR R0 K1 R1
0x80000000, // 0008 RET 0
})
)
);
@ -1159,6 +1167,100 @@ be_local_closure(Animate_oscillator_set_a, /* name */
/*******************************************************************/
/********************************************************************
** Solidified function: set_b
********************************************************************/
be_local_closure(Animate_oscillator_set_b, /* name */
be_nested_proto(
2, /* nstack */
2, /* argc */
2, /* 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_str_weak(b),
}),
be_str_weak(set_b),
&be_const_str_solidified,
( &(const binstruction[ 2]) { /* code */
0x90020001, // 0000 SETMBR R0 K0 R1
0x80000000, // 0001 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: set_form
********************************************************************/
be_local_closure(Animate_oscillator_set_form, /* name */
be_nested_proto(
3, /* nstack */
2, /* 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_const_int(1),
/* K1 */ be_nested_str_weak(form),
}),
be_str_weak(set_form),
&be_const_str_solidified,
( &(const binstruction[ 6]) { /* code */
0x4C080000, // 0000 LDNIL R2
0x1C080202, // 0001 EQ R2 R1 R2
0x780A0000, // 0002 JMPF R2 #0004
0x58040000, // 0003 LDCONST R1 K0
0x90020201, // 0004 SETMBR R0 K1 R1
0x80000000, // 0005 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: set_phase
********************************************************************/
be_local_closure(Animate_oscillator_set_phase, /* name */
be_nested_proto(
3, /* nstack */
2, /* 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_const_int(0),
/* K1 */ be_nested_str_weak(phase),
}),
be_str_weak(set_phase),
&be_const_str_solidified,
( &(const binstruction[ 9]) { /* code */
0x14080300, // 0000 LT R2 R1 K0
0x780A0000, // 0001 JMPF R2 #0003
0x58040000, // 0002 LDCONST R1 K0
0x540A0063, // 0003 LDINT R2 100
0x24080202, // 0004 GT R2 R1 R2
0x780A0000, // 0005 JMPF R2 #0007
0x54060063, // 0006 LDINT R1 100
0x90020201, // 0007 SETMBR R0 K1 R1
0x80000000, // 0008 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: init
********************************************************************/
@ -1400,76 +1502,6 @@ be_local_closure(Animate_oscillator_animate, /* name */
/*******************************************************************/
/********************************************************************
** Solidified function: set_duty_cycle
********************************************************************/
be_local_closure(Animate_oscillator_set_duty_cycle, /* name */
be_nested_proto(
3, /* nstack */
2, /* 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_const_int(0),
/* K1 */ be_nested_str_weak(duty_cycle),
}),
be_str_weak(set_duty_cycle),
&be_const_str_solidified,
( &(const binstruction[ 9]) { /* code */
0x14080300, // 0000 LT R2 R1 K0
0x780A0000, // 0001 JMPF R2 #0003
0x58040000, // 0002 LDCONST R1 K0
0x540A0063, // 0003 LDINT R2 100
0x24080202, // 0004 GT R2 R1 R2
0x780A0000, // 0005 JMPF R2 #0007
0x54060063, // 0006 LDINT R1 100
0x90020201, // 0007 SETMBR R0 K1 R1
0x80000000, // 0008 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: set_phase
********************************************************************/
be_local_closure(Animate_oscillator_set_phase, /* name */
be_nested_proto(
3, /* nstack */
2, /* 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_const_int(0),
/* K1 */ be_nested_str_weak(phase),
}),
be_str_weak(set_phase),
&be_const_str_solidified,
( &(const binstruction[ 9]) { /* code */
0x14080300, // 0000 LT R2 R1 K0
0x780A0000, // 0001 JMPF R2 #0003
0x58040000, // 0002 LDCONST R1 K0
0x540A0063, // 0003 LDINT R2 100
0x24080202, // 0004 GT R2 R1 R2
0x780A0000, // 0005 JMPF R2 #0007
0x54060063, // 0006 LDINT R1 100
0x90020201, // 0007 SETMBR R0 K1 R1
0x80000000, // 0008 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified class: Animate_oscillator
********************************************************************/
@ -1477,20 +1509,21 @@ extern const bclass be_class_Animate_animator;
be_local_class(Animate_oscillator,
6,
&be_class_Animate_animator,
be_nested_map(12,
be_nested_map(13,
( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key_weak(phase, -1), be_const_var(0) },
{ be_const_key_weak(b, -1), be_const_var(3) },
{ be_const_key_weak(set_b, -1), be_const_closure(Animate_oscillator_set_b_closure) },
{ be_const_key_weak(set_a, 10), be_const_closure(Animate_oscillator_set_a_closure) },
{ be_const_key_weak(animate, -1), be_const_closure(Animate_oscillator_animate_closure) },
{ be_const_key_weak(a, -1), be_const_var(2) },
{ be_const_key_weak(set_phase, -1), be_const_closure(Animate_oscillator_set_phase_closure) },
{ be_const_key_weak(init, 11), be_const_closure(Animate_oscillator_init_closure) },
{ be_const_key_weak(duty_cycle, 10), be_const_var(1) },
{ be_const_key_weak(b, -1), be_const_var(3) },
{ be_const_key_weak(value, -1), be_const_var(5) },
{ be_const_key_weak(duty_cycle, -1), be_const_var(1) },
{ be_const_key_weak(animate, 7), be_const_closure(Animate_oscillator_animate_closure) },
{ be_const_key_weak(set_duty_cycle, -1), be_const_closure(Animate_oscillator_set_duty_cycle_closure) },
{ be_const_key_weak(init, -1), be_const_closure(Animate_oscillator_init_closure) },
{ be_const_key_weak(form, 5), be_const_var(4) },
{ be_const_key_weak(set_duty_cycle, 2), be_const_closure(Animate_oscillator_set_duty_cycle_closure) },
{ be_const_key_weak(set_a, -1), be_const_closure(Animate_oscillator_set_a_closure) },
{ be_const_key_weak(set_b, -1), be_const_closure(Animate_oscillator_set_b_closure) },
{ be_const_key_weak(set_form, -1), be_const_closure(Animate_oscillator_set_form_closure) },
{ be_const_key_weak(phase, -1), be_const_var(0) },
{ be_const_key_weak(form, -1), be_const_var(4) },
{ be_const_key_weak(set_phase, 0), be_const_closure(Animate_oscillator_set_phase_closure) },
})),
be_str_weak(Animate_oscillator)
);

5
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_leds.ino
View File

@ -348,13 +348,16 @@ extern "C" {
uint32_t r = (color_a >> 16) & 0xFF;
uint32_t g = (color_a >> 8) & 0xFF;
uint32_t b = (color_a ) & 0xFF;
uint32_t a = (color_a >> 24) & 0xFF;
uint32_t r2 = (color_b >> 16) & 0xFF;
uint32_t g2 = (color_b >> 8) & 0xFF;
uint32_t b2 = (color_b ) & 0xFF;
uint32_t a2 = (color_b >> 24) & 0xFF;
uint32_t r3 = changeUIntScale(alpha, 0, 255, r2, r);
uint32_t g3 = changeUIntScale(alpha, 0, 255, g2, g);
uint32_t b3 = changeUIntScale(alpha, 0, 255, b2, b);
uint32_t rgb = (r3 << 16) | (g3 << 8) | b3;
uint32_t a3 = changeUIntScale(alpha, 0, 255, a2, a);
uint32_t rgb = (a3 << 24) | (r3 << 16) | (g3 << 8) | b3;
be_pushint(vm, rgb);
be_return(vm);
}