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

Berry bootloop protection

This commit is contained in:
Stephan Hadinger 2022-02-14 14:53:42 +01:00
parent 64aa9b69c0
commit 05ac33c231
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/tasmota.ino
View File

@ -446,7 +446,9 @@ void setup(void) {
RotaryInit(); RotaryInit();
#endif // ROTARY_V1 #endif // ROTARY_V1
#ifdef USE_BERRY #ifdef USE_BERRY
if (!TasmotaGlobal.no_autoexec) {
BerryInit(); BerryInit();
}
#endif // USE_BERRY #endif // USE_BERRY
XdrvCall(FUNC_PRE_INIT); XdrvCall(FUNC_PRE_INIT);

12
tasmota/xdrv_52_3_berry_hue.ino
View File

@ -31,6 +31,7 @@ bool be_hue_status(String* response, uint32_t device_id) {
// If so, append json response, and return `true` // If so, append json response, and return `true`
// otherwise ignore and respond `false`` // otherwise ignore and respond `false``
bvm* vm = berry.vm; bvm* vm = berry.vm;
if (nullptr == vm) { return false; }
if (be_getglobal(vm, "hue_bridge")) { if (be_getglobal(vm, "hue_bridge")) {
if (be_getmember(vm, -1, "full_status")) { if (be_getmember(vm, -1, "full_status")) {
// AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_status found"); // AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_status found");
@ -38,7 +39,7 @@ bool be_hue_status(String* response, uint32_t device_id) {
be_pushint(vm, device_id); be_pushint(vm, device_id);
int32_t ret = be_pcall(vm, 2); // 2 params: self, id int32_t ret = be_pcall(vm, 2); // 2 params: self, id
if (ret != 0) { if (ret != 0) {
be_error_pop_all(berry.vm); // clear Berry stack be_error_pop_all(vm); // clear Berry stack
} }
be_pop(vm, 2); be_pop(vm, 2);
if (be_isstring(vm, -1)) { if (be_isstring(vm, -1)) {
@ -60,6 +61,7 @@ bool be_hue_status(String* response, uint32_t device_id) {
void be_hue_discovery(String* response, bool* appending); void be_hue_discovery(String* response, bool* appending);
void be_hue_discovery(String* response, bool* appending) { void be_hue_discovery(String* response, bool* appending) {
bvm* vm = berry.vm; bvm* vm = berry.vm;
if (nullptr == vm) { return; }
if (be_getglobal(vm, "hue_bridge")) { if (be_getglobal(vm, "hue_bridge")) {
// AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_discovery hue_bridge found"); // AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_discovery hue_bridge found");
if (be_getmember(vm, -1, "discover")) { if (be_getmember(vm, -1, "discover")) {
@ -67,7 +69,7 @@ void be_hue_discovery(String* response, bool* appending) {
be_pushvalue(vm, -2); be_pushvalue(vm, -2);
int32_t ret = be_pcall(vm, 1); // 2 params: self int32_t ret = be_pcall(vm, 1); // 2 params: self
if (ret != 0) { if (ret != 0) {
be_error_pop_all(berry.vm); // clear Berry stack be_error_pop_all(vm); // clear Berry stack
} }
be_pop(vm, 1); be_pop(vm, 1);
if (be_isstring(vm, -1)) { if (be_isstring(vm, -1)) {
@ -87,6 +89,7 @@ void be_hue_discovery(String* response, bool* appending) {
void be_hue_groups(String* response); void be_hue_groups(String* response);
void be_hue_groups(String* response) { void be_hue_groups(String* response) {
bvm* vm = berry.vm; bvm* vm = berry.vm;
if (nullptr == vm) { return; }
if (be_getglobal(vm, "hue_bridge")) { if (be_getglobal(vm, "hue_bridge")) {
// AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_discovery hue_bridge found"); // AddLog(LOG_LEVEL_DEBUG_MORE, ">be_hue_discovery hue_bridge found");
if (be_getmember(vm, -1, "groups")) { if (be_getmember(vm, -1, "groups")) {
@ -94,7 +97,7 @@ void be_hue_groups(String* response) {
be_pushvalue(vm, -2); be_pushvalue(vm, -2);
int32_t ret = be_pcall(vm, 1); // 2 params: self int32_t ret = be_pcall(vm, 1); // 2 params: self
if (ret != 0) { if (ret != 0) {
be_error_pop_all(berry.vm); // clear Berry stack be_error_pop_all(vm); // clear Berry stack
} }
be_pop(vm, 1); be_pop(vm, 1);
if (be_isstring(vm, -1)) { if (be_isstring(vm, -1)) {
@ -114,6 +117,7 @@ bool be_hue_command(uint8_t device, uint32_t device_id, String* response) {
// If so, append json response, and return `true` // If so, append json response, and return `true`
// otherwise ignore and respond `false`` // otherwise ignore and respond `false``
bvm* vm = berry.vm; bvm* vm = berry.vm;
if (nullptr == vm) { return false; }
if (be_getglobal(vm, "hue_bridge")) { if (be_getglobal(vm, "hue_bridge")) {
if (be_getmember(vm, -1, "cmd")) { if (be_getmember(vm, -1, "cmd")) {
be_pushvalue(vm, -2); be_pushvalue(vm, -2);
@ -125,7 +129,7 @@ bool be_hue_command(uint8_t device, uint32_t device_id, String* response) {
// be_pushint(vm, device); // be_pushint(vm, device);
int32_t ret = be_pcall(vm, 3); // 2 params: self, id, args int32_t ret = be_pcall(vm, 3); // 2 params: self, id, args
if (ret != 0) { if (ret != 0) {
be_error_pop_all(berry.vm); // clear Berry stack be_error_pop_all(vm); // clear Berry stack
} }
be_pop(vm, 3); be_pop(vm, 3);
if (be_isstring(vm, -1)) { if (be_isstring(vm, -1)) {

2
tasmota/xdrv_52_9_berry.ino
View File

@ -270,11 +270,13 @@ void BerryObservability(bvm *vm, int event...) {
\*********************************************************************************************/ \*********************************************************************************************/
void BrShowState(void); void BrShowState(void);
void BrShowState(void) { void BrShowState(void) {
if (berry.vm) {
// trigger a gc first // trigger a gc first
be_gc_collect(berry.vm); be_gc_collect(berry.vm);
ResponseAppend_P(PSTR(",\"Berry\":{\"HeapUsed\":%u,\"Objects\":%u}"), ResponseAppend_P(PSTR(",\"Berry\":{\"HeapUsed\":%u,\"Objects\":%u}"),
berry.vm->gc.usage / 1024, berry.vm->counter_gc_kept); berry.vm->gc.usage / 1024, berry.vm->counter_gc_kept);
} }
}
/*********************************************************************************************\ /*********************************************************************************************\
* VM Init * VM Init