update eez-framework

eez-open · Jan 26, 2025 · a794695 · a794695
1 parent 1e0a4c2
commit a794695
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm
diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp
@@ -1,4 +1,4 @@
-/* Autogenerated on January 26, 2025 4:44:23 PM from eez-framework commit 0006a5c3421e344c1cceb13528634cd9dd62adac */
+/* Autogenerated on January 26, 2025 5:54:00 PM from eez-framework commit 4d6976602ece58918a4bb20ba0f56bbaaa70949c */
 /*
  * eez-framework
  *
@@ -5370,11 +5370,13 @@ void executeSetColorThemeComponent(FlowState *flowState, unsigned componentIndex
 #if defined(EEZ_FOR_LVGL)
     lvglSetColorThemeHook(theme);
 #elif EEZ_OPTION_GUI
+#if defined(EEZ_DASHBOARD_API)
     if (g_mainAssets->assetsType == ASSETS_TYPE_DASHBOARD) {
         setDashboardColorTheme(theme);
         propagateValueThroughSeqout(flowState, componentIndex);
     } else {
-        auto &themes = flowState->assets->colorsDefinition->themes;
+#endif
+    	auto &themes = flowState->assets->colorsDefinition->themes;
         for (uint32_t themeIndex = 0; themeIndex < themes.count; themeIndex++) {
             if (strcmp(themes[themeIndex]->name, theme) == 0) {
                 eez::gui::g_selectedThemeIndex = themeIndex;
@@ -5386,8 +5388,10 @@ void executeSetColorThemeComponent(FlowState *flowState, unsigned componentIndex
         char message[256];
         snprintf(message, sizeof(message), "Unknown theme %s", theme);
         throwError(flowState, componentIndex, FlowError::Plain(message));
+#if defined(EEZ_DASHBOARD_API)
     }
 #endif
+#endif
 }
 } 
 } 
@@ -6688,6 +6692,17 @@ bool evalExpression(FlowState *flowState, int componentIndex, const uint8_t *ins
                 }
                 return true;
             }
+        }  else if (operation == DATA_OPERATION_GET_CANVAS_REFRESH_STATE) {
+            result = g_stack.pop();
+            if (!result.isError()) {
+                if (result.getType() == VALUE_TYPE_NATIVE_VARIABLE) {
+                    auto nativeVariableId = result.getInt();
+                    result = getCanvasRefreshState(g_widgetCursor, nativeVariableId);
+                } else {
+                    result = Value();
+                }
+                return true;
+            }
         } else {
 #endif
             result = g_stack.pop().getValue();
@@ -7198,6 +7213,11 @@ void dataOperation(int16_t dataId, DataOperationEnum operation, const WidgetCurs
 		else if (operation == DATA_OPERATION_GET_TEXT_CURSOR_POSITION) {
             getValue(flowDataId, operation, widgetCursor, value);
 		}
+#endif
+#if EEZ_OPTION_GUI
+		else if (operation == DATA_OPERATION_GET_CANVAS_REFRESH_STATE) {
+            getValue(flowDataId, operation, widgetCursor, value);
+		}
 #endif
 	} else {
 		value = Value();

diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h
@@ -1,4 +1,4 @@
-/* Autogenerated on January 26, 2025 4:44:23 PM from eez-framework commit 0006a5c3421e344c1cceb13528634cd9dd62adac */
+/* Autogenerated on January 26, 2025 5:54:00 PM from eez-framework commit 4d6976602ece58918a4bb20ba0f56bbaaa70949c */
 /*
  * eez-framework
  *

diff --git a/wasm/eez-framework b/wasm/eez-framework
+9 −1		src/eez/flow/components/set_color_theme.cpp
+11 −0		src/eez/flow/expression.cpp
+5 −0		src/eez/flow/flow.cpp