From a794695ba1912e57469051fc547bf9f2df107f00 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Sun, 26 Jan 2025 17:55:13 +0100 Subject: [PATCH] update eez-framework --- .../flow/runtime/eez_runtime.wasm | Bin 532029 -> 532528 bytes .../eez-framework-amalgamation/eez-flow.cpp | 24 ++++++++++++++++-- .../eez-framework-amalgamation/eez-flow.h | 2 +- wasm/eez-framework | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm index ee6801004938a5c6911b03bb3fdb447ba821dad2..6f04c0957cca760fce7c2daf3765fca9271b8805 100644 GIT binary patch delta 503 zcmY*UJ4*vW5Wd;D%WE&mtq_S3!fN3IK?9P^l^ zC)Og!p(v}t RAEAP-U?_zA@uTqP`ZqyXeboQ} delta 444 zcmY*UJxc>Y5WU&C%O#gwvOyw#Kv)Y!2^zGqlWcW`SZRm>D@&~eK@dTrLTU|hatUc| zgplqU1JOps!Vmlf`2&K8g%)uyF@gi{&6~Hw&P=l{T34bulVD$s<5a>+C7`^-KEiaf z3iX&UWm|LfjLJ#J2HIPL2NF35(@GW!pwnX(PH27|UT880#bO~33d}3y@qH0)Y4;Q_ z4h2M|#yMxmbmcnNP{Lv96Ki1 zGz+GI39Z-RJG$gs6B^5?C#s#{HpHmu;wXs{?vq!>4ezsr*Fdj?ak?zwvNv?@*WZLu z>X7Q3tzZZp+aj}qQ()0t1zX%2Y|-1{8L8poI1Rh#(q*m|h4`g(DJ^%m! diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 2bdbbca0..cf3b1f57 100644 --- 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 index 1d7e112c..4ded878d 100644 --- 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 index 4d697660..bc909755 160000 --- a/wasm/eez-framework +++ b/wasm/eez-framework @@ -1 +1 @@ -Subproject commit 4d6976602ece58918a4bb20ba0f56bbaaa70949c +Subproject commit bc909755c9b83d15689e53474f6339176a299ac7