Skip to content

Commit a794695

Browse files
committed
update eez-framework
1 parent 1e0a4c2 commit a794695

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed
Binary file not shown.

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

+22-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on January 26, 2025 4:44:23 PM from eez-framework commit 0006a5c3421e344c1cceb13528634cd9dd62adac */
1+
/* Autogenerated on January 26, 2025 5:54:00 PM from eez-framework commit 4d6976602ece58918a4bb20ba0f56bbaaa70949c */
22
/*
33
* eez-framework
44
*
@@ -5370,11 +5370,13 @@ void executeSetColorThemeComponent(FlowState *flowState, unsigned componentIndex
53705370
#if defined(EEZ_FOR_LVGL)
53715371
lvglSetColorThemeHook(theme);
53725372
#elif EEZ_OPTION_GUI
5373+
#if defined(EEZ_DASHBOARD_API)
53735374
if (g_mainAssets->assetsType == ASSETS_TYPE_DASHBOARD) {
53745375
setDashboardColorTheme(theme);
53755376
propagateValueThroughSeqout(flowState, componentIndex);
53765377
} else {
5377-
auto &themes = flowState->assets->colorsDefinition->themes;
5378+
#endif
5379+
auto &themes = flowState->assets->colorsDefinition->themes;
53785380
for (uint32_t themeIndex = 0; themeIndex < themes.count; themeIndex++) {
53795381
if (strcmp(themes[themeIndex]->name, theme) == 0) {
53805382
eez::gui::g_selectedThemeIndex = themeIndex;
@@ -5386,8 +5388,10 @@ void executeSetColorThemeComponent(FlowState *flowState, unsigned componentIndex
53865388
char message[256];
53875389
snprintf(message, sizeof(message), "Unknown theme %s", theme);
53885390
throwError(flowState, componentIndex, FlowError::Plain(message));
5391+
#if defined(EEZ_DASHBOARD_API)
53895392
}
53905393
#endif
5394+
#endif
53915395
}
53925396
}
53935397
}
@@ -6688,6 +6692,17 @@ bool evalExpression(FlowState *flowState, int componentIndex, const uint8_t *ins
66886692
}
66896693
return true;
66906694
}
6695+
} else if (operation == DATA_OPERATION_GET_CANVAS_REFRESH_STATE) {
6696+
result = g_stack.pop();
6697+
if (!result.isError()) {
6698+
if (result.getType() == VALUE_TYPE_NATIVE_VARIABLE) {
6699+
auto nativeVariableId = result.getInt();
6700+
result = getCanvasRefreshState(g_widgetCursor, nativeVariableId);
6701+
} else {
6702+
result = Value();
6703+
}
6704+
return true;
6705+
}
66916706
} else {
66926707
#endif
66936708
result = g_stack.pop().getValue();
@@ -7198,6 +7213,11 @@ void dataOperation(int16_t dataId, DataOperationEnum operation, const WidgetCurs
71987213
else if (operation == DATA_OPERATION_GET_TEXT_CURSOR_POSITION) {
71997214
getValue(flowDataId, operation, widgetCursor, value);
72007215
}
7216+
#endif
7217+
#if EEZ_OPTION_GUI
7218+
else if (operation == DATA_OPERATION_GET_CANVAS_REFRESH_STATE) {
7219+
getValue(flowDataId, operation, widgetCursor, value);
7220+
}
72017221
#endif
72027222
} else {
72037223
value = Value();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on January 26, 2025 4:44:23 PM from eez-framework commit 0006a5c3421e344c1cceb13528634cd9dd62adac */
1+
/* Autogenerated on January 26, 2025 5:54:00 PM from eez-framework commit 4d6976602ece58918a4bb20ba0f56bbaaa70949c */
22
/*
33
* eez-framework
44
*

0 commit comments

Comments
 (0)