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

Merge pull request #14376 from s-hadinger/berry_fix_rev0_bug 

Berry workaround for ESP32 Rev0 bug
This commit is contained in:
Theo Arends 2022-01-10 23:23:54 +01:00 committed by GitHub
parent df19e6755b 2539f04007
commit 6735c0c3fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libesp32/berry/src/be_vm.c
View File

@ -596,8 +596,11 @@ newframe: /* a new call frame */
if (var_isint(a) && var_isint(b)) { if (var_isint(a) && var_isint(b)) {
var_setint(dst, ibinop(+, a, b)); var_setint(dst, ibinop(+, a, b));
} else if (var_isnumber(a) && var_isnumber(b)) { } else if (var_isnumber(a) && var_isnumber(b)) {
breal x = var2real(a), y = var2real(b); union bvaldata x, y; // TASMOTA workaround for ESP32 rev0 bug
var_setreal(dst, x + y); x.i = a->v.i;
y.i = b->v.i;
// breal x = var2real(a), y = var2real(b);
var_setreal(dst, x.r + y.r);
} else if (var_isstr(a) && var_isstr(b)) { /* strcat */ } else if (var_isstr(a) && var_isstr(b)) { /* strcat */
bstring *s = be_strcat(vm, var_tostr(a), var_tostr(b)); bstring *s = be_strcat(vm, var_tostr(a), var_tostr(b));
reg = vm->reg; reg = vm->reg;