update eez-framework

eez-open · Sep 2, 2024 · 21f8ae3 · 21f8ae3
1 parent 99778a9
commit 21f8ae3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework
diff --git 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 <stdio.h>
-#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
@@ -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 <math.h>
 #if defined(EEZ_FOR_LVGL)
 #include <stdint.h>
-#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
+0 −9		src/eez/flow/lvgl_api.cpp
+8 −4		src/eez/flow/lvgl_api.h