mirror of https://github.com/arendst/Tasmota.git
Merge pull request #13397 from s-hadinger/berry_cmdresult
Berry return last message in tasmota.cmd()
This commit is contained in:
s-hadinger
GitHub
commit
56df030bac
|
|
@ -625,7 +625,7 @@ be_local_closure(run_deferred, /* name */
|
||||||
********************************************************************/
|
********************************************************************/
|
||||||
be_local_closure(cmd, /* name */
|
be_local_closure(cmd, /* name */
|
||||||
be_nested_proto(
|
be_nested_proto(
|
||||||
7, /* nstack */
|
5, /* nstack */
|
||||||
2, /* argc */
|
2, /* argc */
|
||||||
0, /* varg */
|
0, /* varg */
|
||||||
0, /* has upvals */
|
0, /* has upvals */
|
||||||
|
|
@ -633,35 +633,27 @@ be_local_closure(cmd, /* 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[ 5]) { /* constants */
|
( &(const bvalue[ 2]) { /* constants */
|
||||||
/* K0 */ be_nested_string("json", 916562499, 4),
|
/* K0 */ be_nested_string("cmd_res", 921166762, 7),
|
||||||
/* K1 */ be_nested_string("_cmd", -875145154, 4),
|
/* K1 */ be_nested_string("_cmd", -875145154, 4),
|
||||||
/* K2 */ be_nested_string("load", -435725847, 4),
|
|
||||||
/* K3 */ be_nested_string("instance", 193386898, 8),
|
|
||||||
/* K4 */ be_nested_string("response", 1499316702, 8),
|
|
||||||
}),
|
}),
|
||||||
(be_nested_const_str("cmd", -158181397, 3)),
|
(be_nested_const_str("cmd", -158181397, 3)),
|
||||||
(be_nested_const_str("Tasmota.be", 825809411, 10)),
|
(be_nested_const_str("tasmota.be", 1128870755, 10)),
|
||||||
( &(const binstruction[19]) { /* code */
|
( &(const binstruction[14]) { /* code */
|
||||||
0xA40A0000, // 0000 IMPORT R2 K0
|
0x50080200, // 0000 LDBOOL R2 1 0
|
||||||
0x8C0C0101, // 0001 GETMET R3 R0 K1
|
0x90020002, // 0001 SETMBR R0 K0 R2
|
||||||
0x5C140200, // 0002 MOVE R5 R1
|
0x8C080101, // 0002 GETMET R2 R0 K1
|
||||||
0x7C0C0400, // 0003 CALL R3 2
|
0x5C100200, // 0003 MOVE R4 R1
|
||||||
0x8C100502, // 0004 GETMET R4 R2 K2
|
0x7C080400, // 0004 CALL R2 2
|
||||||
0x5C180600, // 0005 MOVE R6 R3
|
0x4C080000, // 0005 LDNIL R2
|
||||||
0x7C100400, // 0006 CALL R4 2
|
0x880C0100, // 0006 GETMBR R3 R0 K0
|
||||||
0x60140004, // 0007 GETGBL R5 G4
|
0x50100200, // 0007 LDBOOL R4 1 0
|
||||||
0x5C180800, // 0008 MOVE R6 R4
|
0x200C0604, // 0008 NE R3 R3 R4
|
||||||
0x7C140200, // 0009 CALL R5 1
|
0x780E0000, // 0009 JMPF R3 #000B
|
||||||
0x1C140B03, // 000A EQ R5 R5 K3
|
0x88080100, // 000A GETMBR R2 R0 K0
|
||||||
0x78160001, // 000B JMPF R5 #000E
|
0x4C0C0000, // 000B LDNIL R3
|
||||||
0x80040800, // 000C RET 1 R4
|
0x90020003, // 000C SETMBR R0 K0 R3
|
||||||
0x70020003, // 000D JMP #0012
|
0x80040400, // 000D RET 1 R2
|
||||||
0x60140013, // 000E GETGBL R5 G19
|
|
||||||
0x7C140000, // 000F CALL R5 0
|
|
||||||
0x98160804, // 0010 SETIDX R5 K4 R4
|
|
||||||
0x80040A00, // 0011 RET 1 R5
|
|
||||||
0x80000000, // 0012 RET 0
|
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
@ -1042,7 +1034,7 @@ be_local_closure(exec_rules, /* name */
|
||||||
/* K0 */ be_nested_string("try_rule", 1986449405, 8),
|
/* K0 */ be_nested_string("try_rule", 1986449405, 8),
|
||||||
}),
|
}),
|
||||||
(be_nested_const_str("<lambda>", 607256038, 8)),
|
(be_nested_const_str("<lambda>", 607256038, 8)),
|
||||||
(be_nested_const_str("input", -103256197, 5)),
|
(be_nested_const_str("tasmota.be", 1128870755, 10)),
|
||||||
( &(const binstruction[11]) { /* code */
|
( &(const binstruction[11]) { /* code */
|
||||||
0x680C0000, // 0000 GETUPV R3 U0
|
0x680C0000, // 0000 GETUPV R3 U0
|
||||||
0x8C0C0700, // 0001 GETMET R3 R3 K0
|
0x8C0C0700, // 0001 GETMET R3 R3 K0
|
||||||
|
|
@ -1059,20 +1051,22 @@ be_local_closure(exec_rules, /* name */
|
||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
1, /* has constants */
|
1, /* has constants */
|
||||||
( &(const bvalue[ 7]) { /* constants */
|
( &(const bvalue[ 9]) { /* constants */
|
||||||
/* K0 */ be_nested_string("_rules", -28750191, 6),
|
/* K0 */ be_nested_string("_rules", -28750191, 6),
|
||||||
/* K1 */ be_nested_string("json", 916562499, 4),
|
/* K1 */ be_nested_string("json", 916562499, 4),
|
||||||
/* K2 */ be_nested_string("load", -435725847, 4),
|
/* K2 */ be_nested_string("load", -435725847, 4),
|
||||||
/* K3 */ be_nested_string("BRY: ERROR, bad json: ", -1579831487, 22),
|
/* K3 */ be_nested_string("log", 1062293841, 3),
|
||||||
/* K4 */ be_const_int(3),
|
/* K4 */ be_nested_string("BRY: ERROR, bad json: ", -1579831487, 22),
|
||||||
/* K5 */ be_nested_string("reduce", 2002030311, 6),
|
/* K5 */ be_const_int(3),
|
||||||
/* K6 */ be_nested_string("stop_iteration", -121173395, 14),
|
/* K6 */ be_nested_string("cmd_res", 921166762, 7),
|
||||||
|
/* K7 */ be_nested_string("reduce", 2002030311, 6),
|
||||||
|
/* K8 */ be_nested_string("stop_iteration", -121173395, 14),
|
||||||
}),
|
}),
|
||||||
(be_nested_const_str("exec_rules", 1445221092, 10)),
|
(be_nested_const_str("exec_rules", 1445221092, 10)),
|
||||||
(be_nested_const_str("input", -103256197, 5)),
|
(be_nested_const_str("tasmota.be", 1128870755, 10)),
|
||||||
( &(const binstruction[36]) { /* code */
|
( &(const binstruction[41]) { /* code */
|
||||||
0x88080100, // 0000 GETMBR R2 R0 K0
|
0x88080100, // 0000 GETMBR R2 R0 K0
|
||||||
0x780A001E, // 0001 JMPF R2 #0021
|
0x780A0023, // 0001 JMPF R2 #0026
|
||||||
0xA40A0200, // 0002 IMPORT R2 K1
|
0xA40A0200, // 0002 IMPORT R2 K1
|
||||||
0x8C0C0502, // 0003 GETMET R3 R2 K2
|
0x8C0C0502, // 0003 GETMET R3 R2 K2
|
||||||
0x5C140200, // 0004 MOVE R5 R1
|
0x5C140200, // 0004 MOVE R5 R1
|
||||||
|
|
@ -1081,32 +1075,37 @@ be_local_closure(exec_rules, /* name */
|
||||||
0x4C140000, // 0007 LDNIL R5
|
0x4C140000, // 0007 LDNIL R5
|
||||||
0x1C140605, // 0008 EQ R5 R3 R5
|
0x1C140605, // 0008 EQ R5 R3 R5
|
||||||
0x78160004, // 0009 JMPF R5 #000F
|
0x78160004, // 0009 JMPF R5 #000F
|
||||||
0x60140001, // 000A GETGBL R5 G1
|
0x8C140103, // 000A GETMET R5 R0 K3
|
||||||
0x001A0601, // 000B ADD R6 K3 R1
|
0x001E0801, // 000B ADD R7 K4 R1
|
||||||
0x581C0004, // 000C LDCONST R7 K4
|
0x58200005, // 000C LDCONST R8 K5
|
||||||
0x7C140400, // 000D CALL R5 2
|
0x7C140600, // 000D CALL R5 3
|
||||||
0x7002000E, // 000E JMP #001E
|
0x5C0C0200, // 000E MOVE R3 R1
|
||||||
0xA8020008, // 000F EXBLK 0 #0019
|
0x88140106, // 000F GETMBR R5 R0 K6
|
||||||
0x88140100, // 0010 GETMBR R5 R0 K0
|
0x4C180000, // 0010 LDNIL R6
|
||||||
0x8C140B05, // 0011 GETMET R5 R5 K5
|
0x20140A06, // 0011 NE R5 R5 R6
|
||||||
0x841C0000, // 0012 CLOSURE R7 P0
|
0x78160000, // 0012 JMPF R5 #0014
|
||||||
0x4C200000, // 0013 LDNIL R8
|
0x90020C03, // 0013 SETMBR R0 K6 R3
|
||||||
0x50240000, // 0014 LDBOOL R9 0 0
|
0xA8020008, // 0014 EXBLK 0 #001E
|
||||||
0x7C140800, // 0015 CALL R5 4
|
0x88140100, // 0015 GETMBR R5 R0 K0
|
||||||
0x5C100A00, // 0016 MOVE R4 R5
|
0x8C140B07, // 0016 GETMET R5 R5 K7
|
||||||
0xA8040001, // 0017 EXBLK 1 1
|
0x841C0000, // 0017 CLOSURE R7 P0
|
||||||
0x70020004, // 0018 JMP #001E
|
0x4C200000, // 0018 LDNIL R8
|
||||||
0x58140006, // 0019 LDCONST R5 K6
|
0x50240000, // 0019 LDBOOL R9 0 0
|
||||||
0xAC140200, // 001A CATCH R5 1 0
|
0x7C140800, // 001A CALL R5 4
|
||||||
0x70020000, // 001B JMP #001D
|
0x5C100A00, // 001B MOVE R4 R5
|
||||||
0x70020000, // 001C JMP #001E
|
0xA8040001, // 001C EXBLK 1 1
|
||||||
0xB0080000, // 001D RAISE 2 R0 R0
|
0x70020004, // 001D JMP #0023
|
||||||
0xA0000000, // 001E CLOSE R0
|
0x58140008, // 001E LDCONST R5 K8
|
||||||
0x80040800, // 001F RET 1 R4
|
0xAC140200, // 001F CATCH R5 1 0
|
||||||
0xA0080000, // 0020 CLOSE R2
|
0x70020000, // 0020 JMP #0022
|
||||||
0x50080000, // 0021 LDBOOL R2 0 0
|
0x70020000, // 0021 JMP #0023
|
||||||
0xA0000000, // 0022 CLOSE R0
|
0xB0080000, // 0022 RAISE 2 R0 R0
|
||||||
0x80040400, // 0023 RET 1 R2
|
0xA0000000, // 0023 CLOSE R0
|
||||||
|
0x80040800, // 0024 RET 1 R4
|
||||||
|
0xA0080000, // 0025 CLOSE R2
|
||||||
|
0x50080000, // 0026 LDBOOL R2 0 0
|
||||||
|
0xA0000000, // 0027 CLOSE R0
|
||||||
|
0x80040400, // 0028 RET 1 R2
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
@ -1654,6 +1653,7 @@ class be_class_tasmota (scope: global, name: Tasmota) {
|
||||||
wire1, var
|
wire1, var
|
||||||
wire2, var
|
wire2, var
|
||||||
global, var
|
global, var
|
||||||
|
cmd_res, var
|
||||||
|
|
||||||
_global_def, comptr(&be_tasmota_global_struct)
|
_global_def, comptr(&be_tasmota_global_struct)
|
||||||
_global_addr, comptr(&TasmotaGlobal)
|
_global_addr, comptr(&TasmotaGlobal)
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,14 @@ end
|
||||||
|
|
||||||
tasmota = nil
|
tasmota = nil
|
||||||
class Tasmota
|
class Tasmota
|
||||||
|
var _rules
|
||||||
|
var _timers
|
||||||
|
var _ccmd
|
||||||
|
var _drivers
|
||||||
|
var _cb
|
||||||
|
var wire1
|
||||||
|
var wire2
|
||||||
|
var cmd_res # store the command result, nil if disables, true if capture enabled, contains return value
|
||||||
var global # mapping to TasmotaGlobal
|
var global # mapping to TasmotaGlobal
|
||||||
|
|
||||||
def init()
|
def init()
|
||||||
|
|
@ -144,20 +152,22 @@ class Tasmota
|
||||||
def exec_rules(ev_json)
|
def exec_rules(ev_json)
|
||||||
if self._rules
|
if self._rules
|
||||||
import json
|
import json
|
||||||
var ev = json.load(ev_json)
|
var ev = json.load(ev_json) # returns nil if invalid JSON
|
||||||
var ret = false
|
var ret = false
|
||||||
if ev == nil
|
if ev == nil
|
||||||
print('BRY: ERROR, bad json: '+ev_json, 3)
|
self.log('BRY: ERROR, bad json: '+ev_json, 3)
|
||||||
else
|
ev = ev_json # revert to string
|
||||||
|
end
|
||||||
|
# record the rule payload for tasmota.cmd()
|
||||||
|
if self.cmd_res != nil
|
||||||
|
self.cmd_res = ev
|
||||||
|
end
|
||||||
|
# try all rule handlers
|
||||||
try
|
try
|
||||||
ret = self._rules.reduce( /k,v,r-> self.try_rule(ev,k,v) || r, nil, false)
|
ret = self._rules.reduce( /k,v,r-> self.try_rule(ev,k,v) || r, nil, false)
|
||||||
except "stop_iteration"
|
except "stop_iteration"
|
||||||
# silence stop_iteration which means that the map was resized during iteration
|
# silence stop_iteration which means that the map was resized during iteration
|
||||||
end
|
end
|
||||||
# for r: self._rules.keys()
|
|
||||||
# ret = self.try_rule(ev,r,self._rules[r]) || ret
|
|
||||||
# end
|
|
||||||
end
|
|
||||||
return ret
|
return ret
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
@ -360,14 +370,17 @@ class Tasmota
|
||||||
|
|
||||||
# cmd high-level function
|
# cmd high-level function
|
||||||
def cmd(command)
|
def cmd(command)
|
||||||
import json
|
self.cmd_res = true # signal buffer capture
|
||||||
var ret = self._cmd(command)
|
|
||||||
var j = json.load(ret)
|
self._cmd(command)
|
||||||
if type(j) == 'instance'
|
|
||||||
return j
|
var ret = nil
|
||||||
else
|
if self.cmd_res != true # unchanged
|
||||||
return {'response':j}
|
ret = self.cmd_res
|
||||||
end
|
end
|
||||||
|
self.cmd_res = nil # clear buffer
|
||||||
|
|
||||||
|
return ret
|
||||||
end
|
end
|
||||||
|
|
||||||
# set_light and get_light deprecetaion
|
# set_light and get_light deprecetaion
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,84 +1,85 @@
|
||||||
#include "be_constobj.h"
|
#include "be_constobj.h"
|
||||||
|
|
||||||
static be_define_const_map_slots(be_class_tasmota_map) {
|
static be_define_const_map_slots(be_class_tasmota_map) {
|
||||||
{ be_const_key(cb_dispatch, -1), be_const_closure(cb_dispatch_closure) },
|
{ be_const_key(response_append, 44), be_const_func(l_respAppend) },
|
||||||
{ be_const_key(get_option, -1), be_const_func(l_getoption) },
|
{ be_const_key(add_rule, -1), be_const_closure(add_rule_closure) },
|
||||||
{ be_const_key(publish_result, 63), be_const_func(l_publish_result) },
|
{ be_const_key(resp_cmnd_str, 10), be_const_func(l_respCmndStr) },
|
||||||
{ be_const_key(try_rule, 18), be_const_closure(try_rule_closure) },
|
{ be_const_key(_cb, 33), be_const_var(0) },
|
||||||
{ be_const_key(eth, 26), be_const_func(l_eth) },
|
{ be_const_key(set_timer, 66), be_const_closure(set_timer_closure) },
|
||||||
{ be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) },
|
{ be_const_key(publish, -1), be_const_func(l_publish) },
|
||||||
{ be_const_key(_cmd, -1), be_const_func(l_cmd) },
|
|
||||||
{ be_const_key(exec_cmd, -1), be_const_closure(exec_cmd_closure) },
|
|
||||||
{ be_const_key(add_cmd, -1), be_const_closure(add_cmd_closure) },
|
|
||||||
{ be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
|
|
||||||
{ be_const_key(find_op, -1), be_const_closure(find_op_closure) },
|
|
||||||
{ be_const_key(add_driver, 40), be_const_closure(add_driver_closure) },
|
|
||||||
{ be_const_key(remove_rule, 4), be_const_closure(remove_rule_closure) },
|
|
||||||
{ be_const_key(load, -1), be_const_closure(load_closure) },
|
|
||||||
{ be_const_key(response_append, -1), be_const_func(l_respAppend) },
|
|
||||||
{ be_const_key(wire1, 20), be_const_var(0) },
|
|
||||||
{ be_const_key(set_light, -1), be_const_closure(set_light_closure) },
|
|
||||||
{ be_const_key(time_reached, 3), be_const_func(l_timereached) },
|
|
||||||
{ be_const_key(log, -1), be_const_func(l_logInfo) },
|
|
||||||
{ be_const_key(gc, -1), be_const_closure(gc_closure) },
|
|
||||||
{ be_const_key(init, 8), be_const_closure(init_closure) },
|
|
||||||
{ be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
|
|
||||||
{ be_const_key(global, 36), be_const_var(1) },
|
|
||||||
{ be_const_key(event, -1), be_const_closure(event_closure) },
|
|
||||||
{ be_const_key(time_str, 45), be_const_closure(time_str_closure) },
|
|
||||||
{ be_const_key(set_power, -1), be_const_func(l_setpower) },
|
{ be_const_key(set_power, -1), be_const_func(l_setpower) },
|
||||||
{ be_const_key(rtc, 42), be_const_func(l_rtc) },
|
{ be_const_key(add_cmd, 32), be_const_closure(add_cmd_closure) },
|
||||||
{ be_const_key(millis, -1), be_const_func(l_millis) },
|
{ be_const_key(find_key_i, -1), be_const_closure(find_key_i_closure) },
|
||||||
{ be_const_key(save, -1), be_const_func(l_save) },
|
{ be_const_key(chars_in_string, 35), be_const_closure(chars_in_string_closure) },
|
||||||
|
{ be_const_key(gen_cb, 48), be_const_closure(gen_cb_closure) },
|
||||||
|
{ be_const_key(set_light, -1), be_const_closure(set_light_closure) },
|
||||||
{ be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
|
{ be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
|
||||||
{ be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
|
|
||||||
{ be_const_key(strftime, -1), be_const_func(l_strftime) },
|
|
||||||
{ be_const_key(wifi, -1), be_const_func(l_wifi) },
|
|
||||||
{ be_const_key(_drivers, -1), be_const_var(2) },
|
|
||||||
{ be_const_key(chars_in_string, -1), be_const_closure(chars_in_string_closure) },
|
|
||||||
{ be_const_key(_cb, 0), be_const_var(3) },
|
|
||||||
{ be_const_key(resp_cmnd_failed, 59), be_const_func(l_respCmndFailed) },
|
|
||||||
{ be_const_key(get_power, -1), be_const_func(l_getpower) },
|
|
||||||
{ be_const_key(get_light, 2), be_const_closure(get_light_closure) },
|
|
||||||
{ be_const_key(gen_cb, -1), be_const_closure(gen_cb_closure) },
|
|
||||||
{ be_const_key(remove_timer, -1), be_const_closure(remove_timer_closure) },
|
|
||||||
{ be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
|
|
||||||
{ be_const_key(web_send, 54), be_const_func(l_webSend) },
|
|
||||||
{ be_const_key(time_dump, -1), be_const_func(l_time_dump) },
|
|
||||||
{ be_const_key(get_switch, 38), be_const_func(l_getswitch) },
|
|
||||||
{ be_const_key(exec_rules, -1), be_const_closure(exec_rules_closure) },
|
|
||||||
{ be_const_key(find_key_i, 5), be_const_closure(find_key_i_closure) },
|
|
||||||
{ be_const_key(yield, -1), be_const_func(l_yield) },
|
|
||||||
{ be_const_key(web_send_decimal, 34), be_const_func(l_webSendDecimal) },
|
|
||||||
{ be_const_key(i2c_enabled, 13), be_const_func(l_i2cenabled) },
|
|
||||||
{ be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
|
|
||||||
{ be_const_key(cmd, 14), be_const_closure(cmd_closure) },
|
|
||||||
{ be_const_key(publish, 10), be_const_func(l_publish) },
|
|
||||||
{ be_const_key(_ccmd, -1), be_const_var(4) },
|
|
||||||
{ be_const_key(_timers, -1), be_const_var(5) },
|
|
||||||
{ be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) },
|
|
||||||
{ be_const_key(wire_scan, -1), be_const_closure(wire_scan_closure) },
|
{ be_const_key(wire_scan, -1), be_const_closure(wire_scan_closure) },
|
||||||
{ be_const_key(_rules, -1), be_const_var(6) },
|
{ be_const_key(yield, -1), be_const_func(l_yield) },
|
||||||
|
{ be_const_key(exec_rules, -1), be_const_closure(exec_rules_closure) },
|
||||||
|
{ be_const_key(log, -1), be_const_func(l_logInfo) },
|
||||||
|
{ be_const_key(remove_rule, -1), be_const_closure(remove_rule_closure) },
|
||||||
|
{ be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
|
||||||
{ be_const_key(remove_cmd, -1), be_const_closure(remove_cmd_closure) },
|
{ be_const_key(remove_cmd, -1), be_const_closure(remove_cmd_closure) },
|
||||||
{ be_const_key(scale_uint, -1), be_const_func(l_scaleuint) },
|
{ be_const_key(get_light, -1), be_const_closure(get_light_closure) },
|
||||||
{ be_const_key(run_deferred, -1), be_const_closure(run_deferred_closure) },
|
|
||||||
{ be_const_key(set_timer, -1), be_const_closure(set_timer_closure) },
|
|
||||||
{ be_const_key(wire2, 47), be_const_var(7) },
|
|
||||||
{ be_const_key(remove_driver, -1), be_const_closure(remove_driver_closure) },
|
|
||||||
{ be_const_key(delay, -1), be_const_func(l_delay) },
|
|
||||||
{ be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) },
|
{ be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) },
|
||||||
|
{ be_const_key(eth, -1), be_const_func(l_eth) },
|
||||||
|
{ be_const_key(gc, -1), be_const_closure(gc_closure) },
|
||||||
|
{ be_const_key(resp_cmnd_failed, 2), be_const_func(l_respCmndFailed) },
|
||||||
|
{ be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
|
||||||
|
{ be_const_key(run_deferred, -1), be_const_closure(run_deferred_closure) },
|
||||||
|
{ be_const_key(millis, 37), be_const_func(l_millis) },
|
||||||
|
{ be_const_key(_rules, -1), be_const_var(1) },
|
||||||
|
{ be_const_key(time_dump, -1), be_const_func(l_time_dump) },
|
||||||
|
{ be_const_key(cb_dispatch, -1), be_const_closure(cb_dispatch_closure) },
|
||||||
|
{ be_const_key(remove_timer, -1), be_const_closure(remove_timer_closure) },
|
||||||
|
{ be_const_key(remove_driver, -1), be_const_closure(remove_driver_closure) },
|
||||||
{ be_const_key(memory, -1), be_const_func(l_memory) },
|
{ be_const_key(memory, -1), be_const_func(l_memory) },
|
||||||
{ be_const_key(add_rule, 29), be_const_closure(add_rule_closure) },
|
{ be_const_key(load, -1), be_const_closure(load_closure) },
|
||||||
|
{ be_const_key(get_option, -1), be_const_func(l_getoption) },
|
||||||
|
{ be_const_key(resp_cmnd_done, 53), be_const_func(l_respCmndDone) },
|
||||||
|
{ be_const_key(delay, 55), be_const_func(l_delay) },
|
||||||
|
{ be_const_key(add_driver, 62), be_const_closure(add_driver_closure) },
|
||||||
|
{ be_const_key(cmd_res, -1), be_const_var(2) },
|
||||||
|
{ be_const_key(_global_addr, 12), be_const_comptr(&TasmotaGlobal) },
|
||||||
|
{ be_const_key(time_str, 30), be_const_closure(time_str_closure) },
|
||||||
|
{ be_const_key(save, -1), be_const_func(l_save) },
|
||||||
|
{ be_const_key(cmd, -1), be_const_closure(cmd_closure) },
|
||||||
|
{ be_const_key(event, -1), be_const_closure(event_closure) },
|
||||||
|
{ be_const_key(publish_result, -1), be_const_func(l_publish_result) },
|
||||||
|
{ be_const_key(time_reached, 59), be_const_func(l_timereached) },
|
||||||
|
{ be_const_key(scale_uint, -1), be_const_func(l_scaleuint) },
|
||||||
|
{ be_const_key(wifi, -1), be_const_func(l_wifi) },
|
||||||
|
{ be_const_key(_drivers, 4), be_const_var(3) },
|
||||||
|
{ be_const_key(global, -1), be_const_var(4) },
|
||||||
|
{ be_const_key(_cmd, 6), be_const_func(l_cmd) },
|
||||||
|
{ be_const_key(web_send, -1), be_const_func(l_webSend) },
|
||||||
|
{ be_const_key(_ccmd, -1), be_const_var(5) },
|
||||||
|
{ be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
|
||||||
|
{ be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) },
|
||||||
|
{ be_const_key(try_rule, -1), be_const_closure(try_rule_closure) },
|
||||||
|
{ be_const_key(get_power, 43), be_const_func(l_getpower) },
|
||||||
|
{ be_const_key(rtc, -1), be_const_func(l_rtc) },
|
||||||
|
{ be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
|
||||||
|
{ be_const_key(init, -1), be_const_closure(init_closure) },
|
||||||
|
{ be_const_key(wire2, -1), be_const_var(6) },
|
||||||
|
{ be_const_key(get_switch, -1), be_const_func(l_getswitch) },
|
||||||
|
{ be_const_key(strftime, 16), be_const_func(l_strftime) },
|
||||||
|
{ be_const_key(find_op, 39), be_const_closure(find_op_closure) },
|
||||||
|
{ be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) },
|
||||||
|
{ be_const_key(exec_cmd, -1), be_const_closure(exec_cmd_closure) },
|
||||||
|
{ be_const_key(_timers, -1), be_const_var(7) },
|
||||||
|
{ be_const_key(wire1, 46), be_const_var(8) },
|
||||||
};
|
};
|
||||||
|
|
||||||
static be_define_const_map(
|
static be_define_const_map(
|
||||||
be_class_tasmota_map,
|
be_class_tasmota_map,
|
||||||
68
|
69
|
||||||
);
|
);
|
||||||
|
|
||||||
BE_EXPORT_VARIABLE be_define_const_class(
|
BE_EXPORT_VARIABLE be_define_const_class(
|
||||||
be_class_tasmota,
|
be_class_tasmota,
|
||||||
8,
|
9,
|
||||||
NULL,
|
NULL,
|
||||||
Tasmota
|
Tasmota
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -123,8 +123,7 @@ extern "C" {
|
||||||
const char * command = be_tostring(vm, 2);
|
const char * command = be_tostring(vm, 2);
|
||||||
be_pop(vm, 2); // clear the stack before calling, because of re-entrant call to Berry in a Rule
|
be_pop(vm, 2); // clear the stack before calling, because of re-entrant call to Berry in a Rule
|
||||||
ExecuteCommand(command, SRC_BERRY);
|
ExecuteCommand(command, SRC_BERRY);
|
||||||
be_pushstring(vm, ResponseData());
|
be_return_nil(vm); // Return
|
||||||
be_return(vm); // Return
|
|
||||||
}
|
}
|
||||||
be_raise(vm, kTypeError, nullptr);
|
be_raise(vm, kTypeError, nullptr);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue