Skip to content

Revert tasmota millis static #24201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
s-hadinger wants to merge 11 commits into from
+2 −2
Closed

Revert tasmota millis static #24201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df255bc
Remove tab from json
s-hadinger Nov 29, 2025
547e96f
Merge branch 'arendst:development' into development
s-hadinger Nov 29, 2025
778d46b
Merge branch 'arendst:development' into development
s-hadinger Nov 29, 2025
6c2610e
Merge branch 'arendst:development' into development
s-hadinger Nov 30, 2025
dea9a4e
Merge branch 'arendst:development' into development
s-hadinger Dec 2, 2025
2e0e5be
Merge branch 'arendst:development' into development
s-hadinger Dec 2, 2025
543d699
Merge branch 'arendst:development' into development
s-hadinger Dec 5, 2025
5fdeba7
Merge branch 'arendst:development' into development
s-hadinger Dec 6, 2025
2577d60
Merge branch 'arendst:development' into development
s-hadinger Dec 6, 2025
aafd7bd
Merge branch 'arendst:development' into development
s-hadinger Dec 6, 2025
5690d0b
Revert Berry tasmota.millis() as static
s-hadinger Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/libesp32/berry_tasmota/src/be_tasmota_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class be_class_tasmota (scope: global, name: Tasmota) {
publish_rule, func(l_publish_rule)
_cmd, func(l_cmd)
get_option, func(l_getoption)
millis, static_func(l_millis)
millis, func(l_millis)
micros, static_func(l_micros)
time_reached, func(l_timereached)
rtc, static_func(l_rtc)
Expand Down
2 changes: 1 addition & 1 deletion tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ extern "C" {
int32_t l_millis(struct bvm *vm);
int32_t l_millis(struct bvm *vm) {
int32_t top = be_top(vm); // Get the number of arguments
if (top == 0 || (top == 1 && be_isint(vm, 1))) { // only 1 argument of type string accepted
if (top == 1 || (top == 2 && be_isint(vm, 2))) { // only 1 argument of type int accepted
uint32_t delay = 0;
if (top == 2) {
delay = be_toint(vm, 1);
Expand Down