Skip to content

Commit 89b3b9a

Browse files
mvladicmvladic
committed
1 parent dbdb8cd commit 89b3b9a

File tree

8 files changed

+74
-39
lines changed

8 files changed

+74
-39
lines changed

‎packages/project-editor/flow/runtime/cpp/eez-framework

‎packages/project-editor/flow/runtime/lvgl_runtime_v8.3.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -969,24 +969,24 @@ function dbg(text) {
969969
// === Body ===
970970

971971
var ASM_CONSTS = {
972-
1038920: ($0) => { startToDebuggerMessage($0); },
973-
1038952: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974-
1039027: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975-
1039102: ($0) => { finishToDebuggerMessage($0); },
976-
1039135: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977-
1039189: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978-
1039243: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979-
1039296: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980-
1039349: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981-
1039402: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982-
1039435: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983-
1039471: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
984-
1039577: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
985-
1039613: ($0, $1) => { return eez_mqtt_connect($0, $1); },
986-
1039650: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
987-
1039690: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
988-
1039747: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
989-
1039806: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
972+
1038936: ($0) => { startToDebuggerMessage($0); },
973+
1038968: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974+
1039043: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975+
1039118: ($0) => { finishToDebuggerMessage($0); },
976+
1039151: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977+
1039205: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978+
1039259: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979+
1039312: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980+
1039365: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981+
1039418: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982+
1039451: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983+
1039487: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
984+
1039593: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
985+
1039629: ($0, $1) => { return eez_mqtt_connect($0, $1); },
986+
1039666: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
987+
1039706: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
988+
1039763: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
989+
1039822: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
990990
};
991991

992992

‎packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm

1.68 KB
Binary file not shown.

‎packages/project-editor/flow/runtime/lvgl_runtime_v9.0.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -969,24 +969,24 @@ function dbg(text) {
969969
// === Body ===
970970

971971
var ASM_CONSTS = {
972-
1033784: ($0) => { startToDebuggerMessage($0); },
973-
1033816: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974-
1033891: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975-
1033966: ($0) => { finishToDebuggerMessage($0); },
976-
1033999: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977-
1034053: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978-
1034107: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979-
1034160: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980-
1034213: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981-
1034266: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982-
1034299: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983-
1034335: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
984-
1034441: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
985-
1034477: ($0, $1) => { return eez_mqtt_connect($0, $1); },
986-
1034514: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
987-
1034554: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
988-
1034611: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
989-
1034670: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
972+
1033800: ($0) => { startToDebuggerMessage($0); },
973+
1033832: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974+
1033907: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975+
1033982: ($0) => { finishToDebuggerMessage($0); },
976+
1034015: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977+
1034069: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978+
1034123: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979+
1034176: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980+
1034229: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981+
1034282: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982+
1034315: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983+
1034351: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
984+
1034457: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
985+
1034493: ($0, $1) => { return eez_mqtt_connect($0, $1); },
986+
1034530: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
987+
1034570: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
988+
1034627: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
989+
1034686: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
990990
};
991991

992992

‎packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm

1.65 KB
Binary file not shown.

‎packages/project-editor/lvgl/actions-catalog.tsx

+25
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,31 @@ registerAction({
144144

145145
////////////////////////////////////////////////////////////////////////////////
146146

147+
registerAction({
148+
name: "objGetWidth",
149+
properties: [
150+
{
151+
name: "object",
152+
type: "widget"
153+
},
154+
{
155+
name: "result",
156+
type: "integer",
157+
isAssignable: true
158+
}
159+
],
160+
defaults: {},
161+
label: ([object, width]) => (
162+
<>
163+
{object}
164+
<RightArrow />
165+
{width}
166+
</>
167+
)
168+
});
169+
170+
////////////////////////////////////////////////////////////////////////////////
171+
147172
registerAction({
148173
name: "objSetHeight",
149174
properties: [

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on October 5, 2024 10:39:36 AM from eez-framework commit 1f54d7345540e8962cd3b52f3a7d48b1fc5a5f3d */
1+
/* Autogenerated on October 5, 2024 1:15:05 PM from eez-framework commit 0a0ef0e436676cb8b65d35398a878294623528c6 */
22
/*
33
* eez-framework
44
*
@@ -4307,6 +4307,15 @@ ACTION_START(objSetWidth)
43074307
lv_obj_set_width(obj, (lv_coord_t)width);
43084308
#endif
43094309
ACTION_END
4310+
ACTION_START(objGetWidth)
4311+
WIDGET_PROP(obj);
4312+
#if LVGL_VERSION_MAJOR >= 9
4313+
int32_t width = (int32_t)lv_obj_get_width(obj);
4314+
#else
4315+
int32_t width = lv_obj_get_width(obj);
4316+
#endif
4317+
RESULT(result, Value(width, VALUE_TYPE_INT32));
4318+
ACTION_END
43104319
ACTION_START(objSetHeight)
43114320
WIDGET_PROP(obj);
43124321
INT32_PROP(height);
@@ -4551,6 +4560,7 @@ static ActionType actions[] = {
45514560
&objSetX,
45524561
&objSetY,
45534562
&objSetWidth,
4563+
&objGetWidth,
45544564
&objSetHeight,
45554565
&objSetStyleOpa,
45564566
&objAddStyle,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on October 5, 2024 10:39:36 AM from eez-framework commit 1f54d7345540e8962cd3b52f3a7d48b1fc5a5f3d */
1+
/* Autogenerated on October 5, 2024 1:15:05 PM from eez-framework commit 0a0ef0e436676cb8b65d35398a878294623528c6 */
22
/*
33
* eez-framework
44
*

0 commit comments

Comments
 (0)