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

Berry `tasmota.arch()` (#13635) 

* Berry `tasmota.arch()`

* Fix typo
This commit is contained in:
s-hadinger 2021-11-10 20:58:06 +01:00 committed by GitHub
parent 1f229e7534
commit e69522f70b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 96 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/Berry/default/be_tasmotalib.c
View File

@ -12,6 +12,7 @@ extern struct dummy_struct be_tasmota_global_struct;
extern struct dummy_struct be_tasmota_settings_struct;
extern int l_getFreeHeap(bvm *vm);
extern int l_arch(bvm *vm);
extern int l_publish(bvm *vm);
extern int l_publish_result(bvm *vm);
extern int l_cmd(bvm *vm);
@ -1865,6 +1866,7 @@ class be_class_tasmota (scope: global, name: Tasmota) {
kv, closure(kv_closure)
get_free_heap, func(l_getFreeHeap)
arch, func(l_arch)
publish, func(l_publish)
publish_result, func(l_publish_result)
_cmd, func(l_cmd)

1
lib/libesp32/Berry/generate/be_const_strtab.h
View File

@ -293,6 +293,7 @@ extern const bcstring be_const_str_print;
extern const bcstring be_const_str_run_deferred;
extern const bcstring be_const_str_scan;
extern const bcstring be_const_str_settings;
extern const bcstring be_const_str_arch;
extern const bcstring be_const_str_open;
extern const bcstring be_const_str_cmd;
extern const bcstring be_const_str_loop;

5
lib/libesp32/Berry/generate/be_const_strtab_def.h
View File

@ -293,6 +293,7 @@ be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_run_deferred
be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, &be_const_str_scan);
be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_settings);
be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL);
be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_open);
be_define_const_str(open, "open", 3546203337u, 0, 4, NULL);
be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_loop);
be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_wire1);
@ -479,7 +480,7 @@ static const bstring* const m_string_table[] = {
(const bstring *)&be_const_str_SERIAL_7O2,
NULL,
(const bstring *)&be_const_str__ptr,
(const bstring *)&be_const_str_open,
(const bstring *)&be_const_str_arch,
NULL,
(const bstring *)&be_const_str_cmd,
(const bstring *)&be_const_str_nil,
@ -506,6 +507,6 @@ static const bstring* const m_string_table[] = {
static const struct bconststrtab m_const_string_table = {
.size = 160,
.count = 320,
.count = 321,
.table = m_string_table
};

137
lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
View File

@ -1,85 +1,86 @@
#include "be_constobj.h"
static be_define_const_map_slots(be_class_tasmota_map) {
{ be_const_key(set_light, -1), be_const_closure(set_light_closure) },
{ be_const_key(gc, -1), be_const_closure(gc_closure) },
{ be_const_key(remove_cmd, -1), be_const_closure(remove_cmd_closure) },
{ be_const_key(set_timer, 42), be_const_closure(set_timer_closure) },
{ be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) },
{ be_const_key(set_power, -1), be_const_func(l_setpower) },
{ be_const_key(remove_driver, -1), be_const_closure(remove_driver_closure) },
{ be_const_key(try_rule, -1), be_const_closure(try_rule_closure) },
{ be_const_key(find_op, 58), be_const_closure(find_op_closure) },
{ be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
{ be_const_key(find_key_i, -1), be_const_closure(find_key_i_closure) },
{ be_const_key(_cb, 3), be_const_var(0) },
{ be_const_key(web_send, -1), be_const_func(l_webSend) },
{ be_const_key(log, 1), be_const_func(l_logInfo) },
{ be_const_key(get_switch, 50), be_const_func(l_getswitch) },
{ be_const_key(_ccmd, 19), be_const_var(1) },
{ be_const_key(eth, -1), be_const_func(l_eth) },
{ be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
{ be_const_key(init, 39), be_const_closure(init_closure) },
{ be_const_key(strftime, -1), be_const_func(l_strftime) },
{ be_const_key(kv, -1), be_const_closure(kv_closure) },
{ be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) },
{ be_const_key(cmd_res, 67), be_const_var(2) },
{ be_const_key(wire1, 43), be_const_var(3) },
{ be_const_key(get_light, -1), be_const_closure(get_light_closure) },
{ be_const_key(resp_cmnd_error, 62), be_const_func(l_respCmndError) },
{ be_const_key(publish_result, 9), be_const_func(l_publish_result) },
{ be_const_key(gen_cb, -1), be_const_closure(gen_cb_closure) },
{ be_const_key(yield, -1), be_const_func(l_yield) },
{ be_const_key(add_rule, -1), be_const_closure(add_rule_closure) },
{ be_const_key(settings, -1), be_const_var(4) },
{ be_const_key(chars_in_string, -1), be_const_closure(chars_in_string_closure) },
{ be_const_key(resp_cmnd, 31), be_const_func(l_respCmnd) },
{ be_const_key(exec_tele, 68), be_const_closure(exec_tele_closure) },
{ be_const_key(exec_rules, 51), be_const_closure(exec_rules_closure) },
{ be_const_key(load, -1), be_const_closure(load_closure) },
{ be_const_key(remove_rule, 22), be_const_closure(remove_rule_closure) },
{ be_const_key(_rules, 18), be_const_var(5) },
{ be_const_key(publish, -1), be_const_func(l_publish) },
{ be_const_key(get_option, 15), be_const_func(l_getoption) },
{ be_const_key(global, -1), be_const_var(6) },
{ be_const_key(add_driver, 33), be_const_closure(add_driver_closure) },
{ be_const_key(cmd, -1), be_const_closure(cmd_closure) },
{ be_const_key(settings, 70), be_const_var(0) },
{ be_const_key(set_light, -1), be_const_closure(set_light_closure) },
{ be_const_key(gc, 35), be_const_closure(gc_closure) },
{ be_const_key(add_cmd, -1), be_const_closure(add_cmd_closure) },
{ be_const_key(run_deferred, -1), be_const_closure(run_deferred_closure) },
{ be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
{ be_const_key(wifi, -1), be_const_func(l_wifi) },
{ be_const_key(time_dump, -1), be_const_func(l_time_dump) },
{ be_const_key(rtc, 24), be_const_func(l_rtc) },
{ be_const_key(cb_dispatch, -1), be_const_closure(cb_dispatch_closure) },
{ be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
{ be_const_key(resp_cmnd_failed, 72), be_const_func(l_respCmndFailed) },
{ be_const_key(wire_scan, -1), be_const_closure(wire_scan_closure) },
{ be_const_key(exec_cmd, -1), be_const_closure(exec_cmd_closure) },
{ be_const_key(_cmd, 46), be_const_func(l_cmd) },
{ be_const_key(remove_timer, -1), be_const_closure(remove_timer_closure) },
{ be_const_key(time_str, 34), be_const_closure(time_str_closure) },
{ be_const_key(response_append, -1), be_const_func(l_respAppend) },
{ be_const_key(web_send_decimal, 60), be_const_func(l_webSendDecimal) },
{ be_const_key(_drivers, 71), be_const_var(7) },
{ be_const_key(try_rule, -1), be_const_closure(try_rule_closure) },
{ be_const_key(publish, 20), be_const_func(l_publish) },
{ be_const_key(_settings_ptr, 28), be_const_comptr(&Settings) },
{ be_const_key(exec_tele, 36), be_const_closure(exec_tele_closure) },
{ be_const_key(delay, -1), be_const_func(l_delay) },
{ be_const_key(_drivers, -1), be_const_var(1) },
{ be_const_key(find_key_i, -1), be_const_closure(find_key_i_closure) },
{ be_const_key(resp_cmnd_failed, -1), be_const_func(l_respCmndFailed) },
{ be_const_key(wire2, 64), be_const_var(2) },
{ be_const_key(gen_cb, 56), be_const_closure(gen_cb_closure) },
{ be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
{ be_const_key(_timers, 25), be_const_var(3) },
{ be_const_key(kv, -1), be_const_closure(kv_closure) },
{ be_const_key(set_power, -1), be_const_func(l_setpower) },
{ be_const_key(cmd, 38), be_const_closure(cmd_closure) },
{ be_const_key(global, -1), be_const_var(4) },
{ be_const_key(response_append, -1), be_const_func(l_respAppend) },
{ be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
{ be_const_key(time_reached, -1), be_const_func(l_timereached) },
{ be_const_key(wifi, 19), be_const_func(l_wifi) },
{ be_const_key(rtc, -1), be_const_func(l_rtc) },
{ be_const_key(i2c_enabled, 8), be_const_func(l_i2cenabled) },
{ be_const_key(publish_result, 34), be_const_func(l_publish_result) },
{ be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
{ be_const_key(yield, 6), be_const_func(l_yield) },
{ be_const_key(init, -1), be_const_closure(init_closure) },
{ be_const_key(eth, -1), be_const_func(l_eth) },
{ be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
{ be_const_key(get_option, -1), be_const_func(l_getoption) },
{ be_const_key(get_power, -1), be_const_func(l_getpower) },
{ be_const_key(run_deferred, -1), be_const_closure(run_deferred_closure) },
{ be_const_key(get_light, 11), be_const_closure(get_light_closure) },
{ be_const_key(cmd_res, -1), be_const_var(5) },
{ be_const_key(event, -1), be_const_closure(event_closure) },
{ be_const_key(load, -1), be_const_closure(load_closure) },
{ be_const_key(remove_timer, -1), be_const_closure(remove_timer_closure) },
{ be_const_key(wire_scan, -1), be_const_closure(wire_scan_closure) },
{ be_const_key(_cb, 50), be_const_var(6) },
{ be_const_key(remove_driver, 67), be_const_closure(remove_driver_closure) },
{ be_const_key(wire1, 61), be_const_var(7) },
{ be_const_key(memory, -1), be_const_func(l_memory) },
{ be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
{ be_const_key(time_dump, -1), be_const_func(l_time_dump) },
{ be_const_key(_ccmd, -1), be_const_var(8) },
{ be_const_key(exec_cmd, 39), be_const_closure(exec_cmd_closure) },
{ be_const_key(exec_rules, 68), be_const_closure(exec_rules_closure) },
{ be_const_key(resp_cmnd, 14), be_const_func(l_respCmnd) },
{ be_const_key(remove_cmd, -1), be_const_closure(remove_cmd_closure) },
{ be_const_key(remove_rule, 69), be_const_closure(remove_rule_closure) },
{ be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
{ be_const_key(_rules, 41), be_const_var(9) },
{ be_const_key(strftime, 59), be_const_func(l_strftime) },
{ be_const_key(chars_in_string, -1), be_const_closure(chars_in_string_closure) },
{ be_const_key(set_timer, -1), be_const_closure(set_timer_closure) },
{ be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) },
{ be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
{ be_const_key(_timers, -1), be_const_var(8) },
{ be_const_key(event, 7), be_const_closure(event_closure) },
{ be_const_key(wire2, -1), be_const_var(9) },
{ be_const_key(scale_uint, -1), be_const_func(l_scaleuint) },
{ be_const_key(get_power, 73), be_const_func(l_getpower) },
{ be_const_key(millis, -1), be_const_func(l_millis) },
{ be_const_key(save, 44), be_const_func(l_save) },
{ be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
{ be_const_key(memory, -1), be_const_func(l_memory) },
{ be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) },
{ be_const_key(time_str, -1), be_const_closure(time_str_closure) },
{ be_const_key(millis, 48), be_const_func(l_millis) },
{ be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
{ be_const_key(arch, -1), be_const_func(l_arch) },
{ be_const_key(log, -1), be_const_func(l_logInfo) },
{ be_const_key(add_rule, -1), be_const_closure(add_rule_closure) },
{ be_const_key(_cmd, 17), be_const_func(l_cmd) },
{ be_const_key(get_switch, -1), be_const_func(l_getswitch) },
{ be_const_key(find_op, -1), be_const_closure(find_op_closure) },
{ be_const_key(add_driver, 3), be_const_closure(add_driver_closure) },
{ be_const_key(save, 65), be_const_func(l_save) },
{ be_const_key(web_send, -1), be_const_func(l_webSend) },
{ be_const_key(cb_dispatch, -1), be_const_closure(cb_dispatch_closure) },
};
static be_define_const_map(
be_class_tasmota_map,
74
75
);
BE_EXPORT_VARIABLE be_define_const_class(

13
tasmota/support_esp.ino
View File

@ -103,6 +103,19 @@ String GetDeviceHardware(void) {
#ifdef ESP32
// ESP32_ARCH contains the name of the architecture (used by autoconf)
#if CONFIG_IDF_TARGET_ESP32
#define ESP32_ARCH "esp32"
#elif CONFIG_IDF_TARGET_ESP32S2
#define ESP32_ARCH "esp32s2"
#elif CONFIG_IDF_TARGET_ESP32S3
#define ESP32_ARCH "esp32s3"
#elif CONFIG_IDF_TARGET_ESP32C3
#define ESP32_ARCH "esp32c3"
#else
#define ESP32_ARCH ""
#endif
// Handle 20k of NVM
#include <nvs.h>

8
tasmota/xdrv_52_3_berry_tasmota.ino
View File

@ -519,6 +519,14 @@ extern "C" {
be_return(vm);
}
// Berry: `arvh() -> string`
// ESP object
int32_t l_arch(bvm *vm);
int32_t l_arch(bvm *vm) {
be_pushstring(vm, ESP32_ARCH);
be_return(vm);
}
// Berry: `save(file:string, f:closure) -> bool`
int32_t l_save(struct bvm *vm);
int32_t l_save(struct bvm *vm) {