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

Merge pull request #16724 from s-hadinger/haspmota_lvswitch 

HASPmota support for switch `val` attribute
This commit is contained in:
s-hadinger 2022-10-05 09:40:50 +02:00 committed by GitHub
parent d6b045e3d4 51f4bae703
commit 7d5e37e23d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
lib/libesp32/berry_tasmota/src/be_lv_haspmota.c
View File

@ -3539,33 +3539,39 @@ be_local_closure(lvh_obj_set_toggle, /* name */
}), }),
be_str_weak(set_toggle), be_str_weak(set_toggle),
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[26]) { /* code */ ( &(const binstruction[32]) { /* code */
0xA40A0000, // 0000 IMPORT R2 K0 0x60080004, // 0000 GETGBL R2 G4
0x8C0C0501, // 0001 GETMET R3 R2 K1 0x5C0C0200, // 0001 MOVE R3 R1
0x60140008, // 0002 GETGBL R5 G8 0x7C080200, // 0002 CALL R2 1
0x5C180200, // 0003 MOVE R6 R1 0x1C080500, // 0003 EQ R2 R2 K0
0x7C140200, // 0004 CALL R5 1 0x780A000D, // 0004 JMPF R2 #0013
0x7C0C0400, // 0005 CALL R3 2 0xA40A0000, // 0005 IMPORT R2 K0
0x5C040600, // 0006 MOVE R1 R3 0x8C0C0501, // 0006 GETMET R3 R2 K1
0x1C0C0302, // 0007 EQ R3 R1 K2 0x60140008, // 0007 GETGBL R5 G8
0x780E0000, // 0008 JMPF R3 #000A 0x5C180200, // 0008 MOVE R6 R1
0x50040200, // 0009 LDBOOL R1 1 0 0x7C140200, // 0009 CALL R5 1
0x1C0C0303, // 000A EQ R3 R1 K3 0x7C0C0400, // 000A CALL R3 2
0x780E0000, // 000B JMPF R3 #000D 0x5C040600, // 000B MOVE R1 R3
0x50040000, // 000C LDBOOL R1 0 0 0x1C0C0302, // 000C EQ R3 R1 K2
0x78060005, // 000D JMPF R1 #0014 0x780E0001, // 000D JMPF R3 #0010
0x880C0104, // 000E GETMBR R3 R0 K4 0x50040200, // 000E LDBOOL R1 1 0
0x8C0C0705, // 000F GETMET R3 R3 K5 0x70020002, // 000F JMP #0013
0xB8160C00, // 0010 GETNGBL R5 K6 0x1C0C0303, // 0010 EQ R3 R1 K3
0x88140B07, // 0011 GETMBR R5 R5 K7 0x780E0000, // 0011 JMPF R3 #0013
0x7C0C0400, // 0012 CALL R3 2 0x50040000, // 0012 LDBOOL R1 0 0
0x70020004, // 0013 JMP #0019 0x78060005, // 0013 JMPF R1 #001A
0x880C0104, // 0014 GETMBR R3 R0 K4 0x88080104, // 0014 GETMBR R2 R0 K4
0x8C0C0708, // 0015 GETMET R3 R3 K8 0x8C080505, // 0015 GETMET R2 R2 K5
0xB8160C00, // 0016 GETNGBL R5 K6 0xB8120C00, // 0016 GETNGBL R4 K6
0x88140B07, // 0017 GETMBR R5 R5 K7 0x88100907, // 0017 GETMBR R4 R4 K7
0x7C0C0400, // 0018 CALL R3 2 0x7C080400, // 0018 CALL R2 2
0x80000000, // 0019 RET 0 0x70020004, // 0019 JMP #001F
0x88080104, // 001A GETMBR R2 R0 K4
0x8C080508, // 001B GETMET R2 R2 K8
0xB8120C00, // 001C GETNGBL R4 K6
0x88100907, // 001D GETMBR R4 R4 K7
0x7C080400, // 001E CALL R2 2
0x80000000, // 001F RET 0
}) })
) )
); );
@ -4033,6 +4039,63 @@ void be_load_lvh_btn_class(bvm *vm) {
be_pop(vm, 1); be_pop(vm, 1);
} }
/********************************************************************
** Solidified function: set_val
********************************************************************/
be_local_closure(lvh_switch_set_val, /* name */
be_nested_proto(
5, /* 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(set_toggle),
}),
be_str_weak(set_val),
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x8C080100, // 0000 GETMET R2 R0 K0
0x5C100200, // 0001 MOVE R4 R1
0x7C080400, // 0002 CALL R2 2
0x80040400, // 0003 RET 1 R2
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: get_val
********************************************************************/
be_local_closure(lvh_switch_get_val, /* name */
be_nested_proto(
3, /* nstack */
1, /* 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(get_toggle),
}),
be_str_weak(get_val),
&be_const_str_solidified,
( &(const binstruction[ 3]) { /* code */
0x8C040100, // 0000 GETMET R1 R0 K0
0x7C040200, // 0001 CALL R1 1
0x80040200, // 0002 RET 1 R1
})
)
);
/*******************************************************************/
/******************************************************************** /********************************************************************
** Solidified class: lvh_switch ** Solidified class: lvh_switch
********************************************************************/ ********************************************************************/
@ -4040,10 +4103,12 @@ extern const bclass be_class_lvh_obj;
be_local_class(lvh_switch, be_local_class(lvh_switch,
0, 0,
&be_class_lvh_obj, &be_class_lvh_obj,
be_nested_map(2, be_nested_map(4,
( (struct bmapnode*) &(const bmapnode[]) { ( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key_weak(get_val, 1), be_const_closure(lvh_switch_get_val_closure) },
{ be_const_key_weak(set_val, -1), be_const_closure(lvh_switch_set_val_closure) },
{ be_const_key_weak(_lv_part2_selector, -1), be_const_int(196608) }, { be_const_key_weak(_lv_part2_selector, -1), be_const_int(196608) },
{ be_const_key_weak(_lv_class, -1), be_const_class(be_class_lv_switch) }, { be_const_key_weak(_lv_class, 0), be_const_class(be_class_lv_switch) },
})), })),
be_str_weak(lvh_switch) be_str_weak(lvh_switch)
); );

18
tasmota/berry/haspmota_src/haspmota_core/haspmota.be
View File

@ -410,10 +410,13 @@ class lvh_obj
# `toggle` attributes mapped to STATE_CHECKED # `toggle` attributes mapped to STATE_CHECKED
#==================================================================== #====================================================================
def set_toggle(t) def set_toggle(t)
import string if type(t) == 'string'
t = string.toupper(str(t)) import string
if t == "TRUE" t = true end t = string.toupper(str(t))
if t == "FALSE" t = false end if t == "TRUE" t = true
elif t == "FALSE" t = false
end
end
if t if t
self._lv_obj.add_state(lv.STATE_CHECKED) self._lv_obj.add_state(lv.STATE_CHECKED)
else else
@ -953,6 +956,13 @@ end
class lvh_switch : lvh_obj class lvh_switch : lvh_obj
static _lv_class = lv.switch static _lv_class = lv.switch
static _lv_part2_selector = lv.PART_KNOB static _lv_part2_selector = lv.PART_KNOB
# map val to toggle
def set_val(t)
return self.set_toggle(t)
end
def get_val()
return self.get_toggle()
end
end end
#==================================================================== #====================================================================