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

Merge pull request #12434 from s-hadinger/berry_driver_simpler 

Berry simplify Driver class
This commit is contained in:
s-hadinger 2021-06-21 20:38:28 +02:00 committed by GitHub
parent c3f6141600 32b6f7d4b2
commit 41db97ea1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/libesp32/Berry/default/be_driverlib.c
View File

@ -6,18 +6,57 @@
*******************************************************************/
#include "be_constobj.h"
extern int d_getTasmotaGlob(bvm *vm);
/********************************************************************
class Driver2 : Driver
var every_second
var every_100ms
var web_add_handler
var web_add_button
var web_add_main_button
var save_before_restart
var web_sensor
var json_append
var button_pressed
var display
def get_tasmota()
import global
return global.tasmota
end
def add_cmd(c, f)
var tasmota = self.get_tasmota()
tasmota.add_cmd(c, / cmd, idx, payload, payload_json -> f(self, cmd, idx, payload, payload_json))
end
end
********************************************************************/
/********************************************************************
"class Driver2 : Driver "
"def add_cmd(c, f) "
"var tasmota = self.get_tasmota() "
"tasmota.add_cmd(c, / cmd, idx, payload, payload_json -> f(self, cmd, idx, payload, payload_json)) "
"end "
"end "
"Driver = Driver2 "
** Solidified function: get_tasmota
********************************************************************/
/********** Solidified proto: get_tasmota */
be_define_local_const_str(get_tasmota_str_name, "get_tasmota", 334356779, 11);
be_define_local_const_str(get_tasmota_str_source, "input", -103256197, 5);
be_define_local_const_str(get_tasmota_str_0, "global", 503252654, 6);
be_define_local_const_str(get_tasmota_str_1, "tasmota", 424643812, 7);
static const bvalue get_tasmota_ktab[2] = {
{ { .s=be_local_const_str(get_tasmota_str_0) }, BE_STRING},
{ { .s=be_local_const_str(get_tasmota_str_1) }, BE_STRING},
};
static const uint32_t get_tasmota_code[3] = {
0xA4060000, // 0000 IMPORT R1 R256
0x88080301, // 0001 GETMBR R2 R1 R257
0x80040400, // 0002 RET 1 R2
};
be_define_local_proto(get_tasmota, 3, 1, 1, 0, 0);
be_define_local_closure(get_tasmota);
/*******************************************************************/
/********************************************************************
** Solidified function: add_cmd
********************************************************************/
@ -95,9 +134,8 @@ void be_load_driverlib(bvm *vm) {
{ "button_pressed", NULL },
{ "display", NULL },
{ "get_tasmota", d_getTasmotaGlob },
{ NULL, (bntvfunc) BE_CLOSURE }, /* mark section for berry closures */
{ "get_tasmota", (bntvfunc) &get_tasmota_closure },
{ "add_cmd", (bntvfunc) &add_cmd_closure },
{ NULL, NULL }
@ -123,7 +161,7 @@ class be_class_tasmota_driver (scope: global, name: Driver) {
button_pressed, var
display, var
get_tasmota, func(d_getTasmotaGlob)
get_tasmota, closure(get_tasmota_closure)
add_cmd, closure(add_cmd_closure)
}

2
lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_driver.h
View File

@ -12,7 +12,7 @@ static be_define_const_map_slots(be_class_tasmota_driver_map) {
{ be_const_key(button_pressed, 4), be_const_int(7) },
{ be_const_key(every_second, -1), be_const_int(8) },
{ be_const_key(web_sensor, 5), be_const_int(9) },
{ be_const_key(get_tasmota, -1), be_const_func(d_getTasmotaGlob) },
{ be_const_key(get_tasmota, -1), be_const_closure(get_tasmota_closure) },
};
static be_define_const_map(

18
tasmota/xdrv_52_3_berry_tasmota.ino
View File

@ -484,22 +484,4 @@ void berry_log_P(const char * berry_buf, ...) {
berry_log(log_data);
}
/*********************************************************************************************\
* Helper function for `Driver` class
*
* get_tasmota() -> tasmota instance from globals
* allows to use solidified methods refering to the global object `tasmota`
*
\*********************************************************************************************/
extern "C" {
int32_t d_getTasmotaGlob(struct bvm *vm);
int32_t d_getTasmotaGlob(struct bvm *vm) {
be_getglobal(berry.vm, PSTR("tasmota"));
be_return(vm); // Return
}
}
#endif // USE_BERRY