diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index af633590..09bccc25 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit af63359021c274228adb07e9e966c0afbe943c93 +Subproject commit 09bccc25ad4c76af081a611e8a672e00b2e9a2d5 diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index f4e5737a..a181be40 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on September 2, 2024 12:07:59 PM from eez-framework commit 8f7c298c8720f9a9cbd2891d299ad83824c0e3f1 */ +/* Autogenerated on September 2, 2024 12:29:44 PM from eez-framework commit af63359021c274228adb07e9e966c0afbe943c93 */ /* * eez-framework * @@ -6501,13 +6501,6 @@ void (*onFlowErrorHook)(FlowState *flowState, int componentIndex, const char *er // ----------------------------------------------------------------------------- #if defined(EEZ_FOR_LVGL) #include -#if defined(EEZ_FOR_LVGL) -#ifdef LV_LVGL_H_INCLUDE_SIMPLE -#include "lvgl.h" -#else -#include "lvgl/lvgl.h" -#endif -#endif static void replacePageHook(int16_t pageId, uint32_t animType, uint32_t speed, uint32_t delay); extern "C" void create_screens(); extern "C" void tick_screen(int screen_index); diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index b11eca0c..ec81b8f2 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on September 2, 2024 12:07:59 PM from eez-framework commit 8f7c298c8720f9a9cbd2891d299ad83824c0e3f1 */ +/* Autogenerated on September 2, 2024 12:29:44 PM from eez-framework commit af63359021c274228adb07e9e966c0afbe943c93 */ /* * eez-framework * @@ -2800,12 +2800,16 @@ extern native_var_t native_vars[]; #include #if defined(EEZ_FOR_LVGL) #include -#if defined(EEZ_FOR_LVGL) #ifdef LV_LVGL_H_INCLUDE_SIMPLE -#include "lvgl.h" + #include "lvgl.h" + #if LVGL_VERSION_MAJOR > 9 || (LVGL_VERSION_MAJOR == 9 && LVGL_VERSION_MINOR > 1) + #include "src/lvgl_private.h" + #endif #else -#include "lvgl/lvgl.h" -#endif + #include "lvgl/lvgl.h" + #if LVGL_VERSION_MAJOR > 9 || (LVGL_VERSION_MAJOR == 9 && LVGL_VERSION_MINOR > 1) + #include "lvgl/src/lvgl_private.h" + #endif #endif #if LVGL_VERSION_MAJOR >= 9 #define lv_scr_load_anim_t lv_screen_load_anim_t