Skip to content

Commit d8fe5b2

Browse files
committed
Fixed: [LVGL] Change Screen in LVGL action when using expression for the Screen property doesn't work in compiled code #636
1 parent 3309f36 commit d8fe5b2

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

resources/eez-framework-amalgamation/eez-flow.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */
1+
/* Autogenerated on November 17, 2024 10:35:13 AM from eez-framework commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051 */
22
/*
33
* eez-framework
44
*
@@ -7332,7 +7332,7 @@ static lv_group_t *getLvglGroupFromIndex(int32_t index) {
73327332
static int32_t getLvglScreenByName(const char *name) {
73337333
for (size_t i = 0; i < g_numScreens; i++) {
73347334
if (strcmp(g_screenNames[i], name) == 0) {
7335-
return i;
7335+
return i + 1;
73367336
}
73377337
}
73387338
return -1;
@@ -7428,6 +7428,7 @@ extern "C" void eez_flow_init(const uint8_t *assets, uint32_t assetsSize, lv_obj
74287428
eez::initAllocHeap(eez::ALLOC_BUFFER, eez::ALLOC_BUFFER_SIZE);
74297429
eez::flow::replacePageHook = replacePageHook;
74307430
eez::flow::getLvglObjectFromIndexHook = getLvglObjectFromIndex;
7431+
eez::flow::getLvglScreenByNameHook = getLvglScreenByName;
74317432
eez::flow::getLvglObjectByNameHook = getLvglObjectByName;
74327433
eez::flow::getLvglGroupByNameHook = getLvglGroupByName;
74337434
eez::flow::getLvglStyleByNameHook = getLvglStyleByName;

resources/eez-framework-amalgamation/eez-flow.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */
1+
/* Autogenerated on November 17, 2024 10:35:13 AM from eez-framework commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051 */
22
/*
33
* eez-framework
44
*

0 commit comments

Comments
 (0)