From c1d55049d1d7ac5faf96e2cb77feeb09d1f75bc4 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Thu, 7 Nov 2024 10:27:38 +0100 Subject: [PATCH] update eez-framework --- installation/make-electron-builder-yml.ts | 1 + .../_stylesheets/project-editor.less | 3 ++- packages/instrument/bb3/conf.ts | 2 +- .../flow/debugger/WatchPanel.tsx | 4 ++- .../flow/runtime/cpp/eez-framework | 2 +- .../flow/runtime/eez_runtime.wasm | Bin 528167 -> 528138 bytes .../flow/runtime/lvgl_runtime_v8.3.wasm | Bin 1999830 -> 1999882 bytes .../flow/runtime/lvgl_runtime_v9.0.wasm | Bin 1961432 -> 1961484 bytes .../flow/runtime/wasm-runtime.tsx | 23 ++++++++++-------- .../project-editor/project/ui/Toolbar.tsx | 5 ++-- .../eez-framework-amalgamation/eez-flow.cpp | 8 +++--- .../eez-framework-amalgamation/eez-flow.h | 2 +- 12 files changed, 30 insertions(+), 20 deletions(-) diff --git a/installation/make-electron-builder-yml.ts b/installation/make-electron-builder-yml.ts index c670e1ff..29c88a80 100644 --- a/installation/make-electron-builder-yml.ts +++ b/installation/make-electron-builder-yml.ts @@ -61,6 +61,7 @@ let files = [ "!**/node_modules/*.d.ts", "!**/node_modules/.bin", "!**/*.js.map", + "!**/*.mjs.map", "!**/*.css.map", "!**/*.ilk", "!**/*.lib", diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less index d1a334b8..d7171b97 100644 --- a/packages/eez-studio-ui/_stylesheets/project-editor.less +++ b/packages/eez-studio-ui/_stylesheets/project-editor.less @@ -96,10 +96,11 @@ } .EezStudio_ProjectEditor_ToolbarNav_FlowRuntimeControls { + display: flex; @media (min-width: 1600px) { width: 0; } - justify-content: "flex-end"; + justify-content: flex-end; } } } diff --git a/packages/instrument/bb3/conf.ts b/packages/instrument/bb3/conf.ts index f9a2f9d3..69913bc0 100644 --- a/packages/instrument/bb3/conf.ts +++ b/packages/instrument/bb3/conf.ts @@ -11,7 +11,7 @@ export const FIRMWARE_RELEASES_PAGE = "https://github.com/eez-open/modular-psu-firmware/releases"; export const FIRMWARE_UPGRADE_PAGE = - "https://www.envox.hr/eez/eez-bench-box-3/bb3-user-manual/13-firmware-upgrade.html"; + "https://www.envox.eu/eez-bench-box-3/bb3-user-manual/13-firmware-upgrade/"; export const SCRIPTS_CATALOG_URL = "https://github.com/eez-open/modular-psu-firmware/raw/master/scripts/scripts-catalog.json"; diff --git a/packages/project-editor/flow/debugger/WatchPanel.tsx b/packages/project-editor/flow/debugger/WatchPanel.tsx index 15713513..00bb0893 100644 --- a/packages/project-editor/flow/debugger/WatchPanel.tsx +++ b/packages/project-editor/flow/debugger/WatchPanel.tsx @@ -312,7 +312,9 @@ const WatchTable = observer( ); if (objectVariableType) { - value = objectVariableType.getValue(value); + value = objectVariableType.getValue + ? objectVariableType.getValue(value) + : undefined; const getChildren = ( value: any, diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index 129db029..83b926fb 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit 129db029d6fc4fdd1086fc8f836d72feed469d54 +Subproject commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm index 74f01eb4e6122fcc439f6a535c67b038a62134df..e1c7d0fc8b4e90b51c8d052834340eda16082e98 100644 GIT binary patch delta 120 zcmZ2JPoZm`!iIMuj9WLq7nxnn@|~5DX>#9$YB44aCLSeL4JHj&UIs@7MJ8qkCI*4)gkR`j5;E08caN{ybO*EicHK7Ob!an zK>lX=iKiG@Kr+prCbfT>#JK&_B&NNS7<;yFP-ULR$m+;w#UR`stj-L?EI`Z(#BAGx J)!DZ{2LO^#A`k!o diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm index d4d689357c281c65d7269c3ba6786a3a07f049d9..37faa2887d6963f67755b7995b7d7d87530ce981 100644 GIT binary patch delta 1972 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 E0ZCHhX#fBK diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm index 8e2a40469f32f2fa0e11f1b91c0afe14382ddd57..ec2bc5267723ee0c9216bc7a1057f487209da5e0 100644 GIT binary patch delta 1973 zcmXw(Sxi)C6vywm%usL!y)sykT60e7!-T|`rhtg3Tm?bJePSuc5htJlBzVwny@L9_Kq^vu$;z z$b2;o$pW6w3mhrng6W1Kg&fa?xkiosqah11k1TYgh>N6{i>=3jbdH~H)W{;+kj3_U zk|n%|mxQH6=Sz7pFAd8wF5zWGvK)1-;N`p`EGx}?{o|E|NrtBEkX1Ug%Ia7FYhuG% zJ4eF$yHos{T7gFJ0hF8nm0E{4Jrz84Tr)~i)w07jcv*ngxHd8X8PlNnqVuITOFz6 zI@!kCtf7EM9D8zf`*6avh+BF%R{HK(%?&n7BU~CCY2qenw!6N6`_wBf+{|I#%?;dQ z{hO?DTVd4dNE^3FJAC$FxyO+X?vTCQ&U>vlfpl!|!}dN$A{>$Z#QVt_2&DV`%V~=_BsL#F7hy7xW_W1>%d;D3^#~ zd;3_druEOA&X1s=s9_^Dyu9J5BhVI_L@lE2JBm>0Pi3dnK z9f{cu5)YDfJ%C3aQsW^l+IGBqQZxi2kZ$UjW<&Hk+9U32Jcum87wvgP_Ufd(T zOMDL=!|FPWNFl%BGd?unKJk6B22a<~_41hbFYx@wgt z+VrQyPe{HdeoFF;7?WpIBqJK;Iq?Ybb3_@{x<)_5>5vyFLLU>T7nx+{Od`9%aQ!E8AOt7 zR2;)nihQM7wl`=NNEr^wxs1zmjeswVc~iDo;PygKN~Dr2_1>#=RV>v2 zwc6?n08%e+&PG^l=SvOO%pgNT_WSp7Qk%#jt_{l;`=98c+=R~}V~I;-do0Kf-p)I$ z7pbxnL3U=FdAc2vU9lm|Ve7jz*^N(O1I`;95ZfqC_PbwyxX~uf+{C+pYP0owvfAfK z3t(#H78h6ew8N*}0kM04Ya4f1Z`Oj+};7@s!K1c z+r_FImjzH^)9I21*zkXltZ!4JZ~O_VkyuOX<**y2PQG%-kbp;QVReM8QGH_pa4)#| z@9()WgeN8#?w7)?0qD9lfM1OHz!&7speaDuwm>f+2D^=luuE|h5LU~OBfwWDF=VxG zQL@t%S1*8dVz?@+f4SX@@d_WXdXdmV*n(W|2XHSFupRr7AVoh}!>KR<#olN*IBwDk z{kS1tJ)qUGPO)|KgIa81b#v^20r0@s1H0hr1N-bhU3R@-*AY;AtEVnA2^tSgfGlVt flne!+6lfCkF_a3WL6f0$=o4tlNL}WqyGH*933<%S delta 1910 zcmX|>Sxi)C6vyuw85L)+SBE-CZSp^ohYj!xWUobvmYDdWp_pUNbQRGvhkTS7bhzRh(g&kS#jf z3{5&GmB8H8Fwe=?`HVQ<)dg6f3!R^P(sU6PViD%q-tkP6(PEx2c6AAs=u)aL<8qm+ z%duQnFr{+L#vIJWQmjBZ%I)VNUFmqb3M;XyURN`t3amy&T%*h;%4{5;uAz%HdA{6W zuYd`#mdmxSuERR5M5TQ>q*cyfb>UU%dbk?Hdc-E{2D+-o22{tjhOTPfU#vEDv3Tl6 zbq=(i4(nZQK!a{{+JAWVz^|LI5w(b;4x8+M2b!pjRBCj!2~FBeo6THqc6AH3XbYOr zVm}Re+1%gC{jIKU!#4Hc*%w3EfuICTtQKueK75n5CC8|4e>=8|(^q$JfgR%NPQgym zU6QPAhhUe0zwKh5NS1fE(c4YEJ%T-=dyVZrv$rpic$z+75QES^UGEhf5F9jL`&pv; zMfy+=hb2|fBgWu}n40&`)AWkqikLzhi(I`beC?~!znA6rS;?zK z^_s95u1gHp1lMVD!`R-St7y;)SnmpOQ*cx4OJTib)Nc!J32sYV?+EUgx}~aeS8!MC z%VD!>(tE<@y)U>Y`ap1B^r3*0hf~E-7>Q(C4I}V+&&)C71Ugj#|m+~h%lB97mEPCdDAO}V4Mj4 z(D)_0Fa#WS_;Gzny{U}Vt{8*po8)LSkge^I2zy|yKEUo5WSq;x?T&+c|#+_Hc z{dm4v>j+W|)u^-o9BA~%Xg!;@0rhBbNnC`q`LW3*VvXc$Bbv%zA8(8||h^S59t2p~UgVt*G-)O-^Ndwf3{#SC5?D+!nx zqe`~8m4wXhF?~kBcC*|6`+Hmpu>pOpB*N4#BW}j3)DXw9NcRi&%WxT@2gI?JuqBae z(9Z?@9+ZvxMJi5_e)%@wA;BRr)jBLrmXbt2Npw^Akv->ivSx&jY|-Yhp^$}3{5~Qh z(=${vHl3aj`(~I92%-NSgQtW962A9;JIpa=c;r}VXyh0*EOLvhPD$OE%$<9CV*=SF z=Eec%FUwHrCzq}P^MVYuKIrJo&7kzBn7K_EKp990Q8FnXQU+1Nlq||%N;c&q%8>5P J+>c{D{{sL8%gz7* diff --git a/packages/project-editor/flow/runtime/wasm-runtime.tsx b/packages/project-editor/flow/runtime/wasm-runtime.tsx index 04a06674..16a9e3a6 100644 --- a/packages/project-editor/flow/runtime/wasm-runtime.tsx +++ b/packages/project-editor/flow/runtime/wasm-runtime.tsx @@ -363,9 +363,9 @@ export class WasmRuntime extends RemoteRuntime { arrayValue.valueType ); if (objectVariableType) { - const objectValue = objectVariableType.getValue( - arrayValue.value - ); + const objectValue = objectVariableType.getValue + ? objectVariableType.getValue(arrayValue.value) + : undefined; if (objectValue) { result = objectVariableType.valueFieldDescriptions[ @@ -505,9 +505,11 @@ export class WasmRuntime extends RemoteRuntime { valueType ); if (objectVariableType) { - let value = objectVariableType.getValue( - workerToRenderMessage.freeArrayValue.value - ); + let value = objectVariableType.getValue + ? objectVariableType.getValue( + workerToRenderMessage.freeArrayValue.value + ) + : undefined; if (value) { objectVariableType.destroyValue(value); } @@ -869,10 +871,11 @@ export class WasmRuntime extends RemoteRuntime { ); if (typeof engineValueWithType.value == "object") { - let objectValue = - globalVariable.objectVariableType.getValue( - engineValueWithType.value - ); + let objectValue = globalVariable.objectVariableType.getValue + ? globalVariable.objectVariableType.getValue( + engineValueWithType.value + ) + : undefined; if (objectValue) { globalVariable.objectVariableType.destroyValue( objectValue diff --git a/packages/project-editor/project/ui/Toolbar.tsx b/packages/project-editor/project/ui/Toolbar.tsx index ff993b71..5bcc9137 100644 --- a/packages/project-editor/project/ui/Toolbar.tsx +++ b/packages/project-editor/project/ui/Toolbar.tsx @@ -56,8 +56,9 @@ export const Toolbar = observer( this.context.dataContext.get(variable.fullName); if (objectVariableValue) { - const managedValue = - objectVariableType.getValue(objectVariableValue); + const managedValue = objectVariableType.getValue + ? objectVariableType.getValue(objectVariableValue) + : undefined; if (managedValue) { objectVariableValue = managedValue; } diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 45bff320..0f5fc37f 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ +/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ /* * eez-framework * @@ -3207,7 +3207,7 @@ void executeCallAction(FlowState *flowState, unsigned componentIndex, int flowIn FlowState *actionFlowState = initActionFlowState(flowIndex, flowState, componentIndex, inputValue); if ((int)componentIndex != -1) { auto component = flowState->flow->components[componentIndex]; - for (uint32_t i = 0; i < component->properties.count; i++) { + for (uint32_t i = 0; i < actionFlowState->flow->userPropertiesAssignable.count; i++) { auto isAssignable = actionFlowState->flow->userPropertiesAssignable.items[i]; Value value; if (isAssignable) { @@ -10520,7 +10520,9 @@ void throwError(FlowState *flowState, int componentIndex, const char *errorMessa ) ) { for (FlowState *fs = flowState; fs != catchErrorFlowState; fs = fs->parentFlowState) { - fs->error = true; + if (fs->isAction) { + fs->error = true; + } } auto component = catchErrorFlowState->flow->components[catchErrorComponentIndex]; if (component->type == defs_v3::COMPONENT_TYPE_CATCH_ERROR_ACTION) { diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index 6f7271bd..fd0c4248 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ +/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ /* * eez-framework *