Skip to content

Commit

Permalink
update eez-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Jan 26, 2025
1 parent 89613ce commit 9f9b2a2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
13 changes: 10 additions & 3 deletions resources/eez-framework-amalgamation/eez-flow.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Autogenerated on December 17, 2024 7:08:39 PM from eez-framework commit 5ca49b64d830b3cd1abdc4270f2b9cbc48d7a9f3 */
/* Autogenerated on January 24, 2025 9:01:25 PM from eez-framework commit 3e77217de3bfe5f3bee72e7c438adff9f71b8401 */
/*
* eez-framework
*
* MIT License
* Copyright 2024 Envox d.o.o.
* Copyright 2025 Envox d.o.o.
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Expand Down Expand Up @@ -3958,7 +3958,11 @@ void executeLVGLComponent(FlowState *flowState, unsigned componentIndex) {
} else if (specific->property == BASIC_OPACITY) {
lv_obj_set_style_opa(target, intValue, 0);
} else if (specific->property == DROPDOWN_SELECTED) {
#if LVGL_VERSION_MAJOR >= 9 && LVGL_VERSION_MINOR >= 3
lv_dropdown_set_selected(target, intValue, LV_ANIM_OFF);
#else
lv_dropdown_set_selected(target, intValue);
#endif
} else if (specific->property == IMAGE_ANGLE) {
lv_img_set_angle(target, intValue);
} else if (specific->property == IMAGE_ZOOM) {
Expand Down Expand Up @@ -4422,7 +4426,11 @@ ACTION_START(dropdownSetSelected)
WIDGET_PROP(obj);
UINT32_PROP(value);
#if LVGL_VERSION_MAJOR >= 9
#if LVGL_VERSION_MINOR >= 3
lv_dropdown_set_selected(obj, value, LV_ANIM_OFF);
#else
lv_dropdown_set_selected(obj, value);
#endif
#else
lv_dropdown_set_selected(obj, (uint16_t)value);
#endif
Expand Down Expand Up @@ -10404,7 +10412,6 @@ void assignValue(FlowState *flowState, int componentIndex, Value &dstValue, cons
return;
}
pDstValue = &array->values[arrayElementValue->elementIndex];
dstValueType = arrayElementValue->dstValueType;
}
}
#if defined(EEZ_DASHBOARD_API)
Expand Down
4 changes: 2 additions & 2 deletions resources/eez-framework-amalgamation/eez-flow.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Autogenerated on December 17, 2024 7:08:39 PM from eez-framework commit 5ca49b64d830b3cd1abdc4270f2b9cbc48d7a9f3 */
/* Autogenerated on January 24, 2025 9:01:25 PM from eez-framework commit 3e77217de3bfe5f3bee72e7c438adff9f71b8401 */
/*
* eez-framework
*
* MIT License
* Copyright 2024 Envox d.o.o.
* Copyright 2025 Envox d.o.o.
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Expand Down
2 changes: 1 addition & 1 deletion wasm/eez-framework

0 comments on commit 9f9b2a2

Please sign in to comment.