Skip to content

Commit 97c5222

Browse files
mvladicmvladic
committed
1 parent 461cc16 commit 97c5222

File tree

6 files changed

+55
-48
lines changed

6 files changed

+55
-48
lines changed

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

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

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

971971
var ASM_CONSTS = {
972-
1036736: ($0) => { startToDebuggerMessage($0); },
973-
1036768: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974-
1036843: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975-
1036918: ($0) => { finishToDebuggerMessage($0); },
976-
1036951: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977-
1037005: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978-
1037059: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979-
1037112: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980-
1037165: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981-
1037218: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982-
1037251: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983-
1037287: ($0, $1) => { lvglSetColorTheme($0, UTF8ToString($1)); },
984-
1037332: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
985-
1037438: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
986-
1037474: ($0, $1) => { return eez_mqtt_connect($0, $1); },
987-
1037511: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
988-
1037551: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
989-
1037608: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
990-
1037667: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
972+
1036816: ($0) => { startToDebuggerMessage($0); },
973+
1036848: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
974+
1036923: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },
975+
1036998: ($0) => { finishToDebuggerMessage($0); },
976+
1037031: ($0, $1) => { return getLvglScreenByName($0, UTF8ToString($1)); },
977+
1037085: ($0, $1) => { return getLvglObjectByName($0, UTF8ToString($1)); },
978+
1037139: ($0, $1) => { return getLvglGroupByName($0, UTF8ToString($1)); },
979+
1037192: ($0, $1) => { return getLvglStyleByName($0, UTF8ToString($1)); },
980+
1037245: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },
981+
1037298: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },
982+
1037331: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },
983+
1037367: ($0, $1) => { lvglSetColorTheme($0, UTF8ToString($1)); },
984+
1037412: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },
985+
1037518: ($0, $1) => { return eez_mqtt_deinit($0, $1); },
986+
1037554: ($0, $1) => { return eez_mqtt_connect($0, $1); },
987+
1037591: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },
988+
1037631: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },
989+
1037688: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },
990+
1037747: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
991991
};
992992

993993

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

90 Bytes
Binary file not shown.

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

10 Bytes
Binary file not shown.

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

+30-27
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export function registerAction(actionDefinition: IActionDefinition) {
192192
referencedObjectCollectionPath = "userPages";
193193
} else if (actionProperty.type.startsWith("widget")) {
194194
enumItems = (actionType: LVGLActionType) => {
195-
const lvglIdentifiers = ProjectEditor.getProjectStore(
195+
let lvglIdentifiers = ProjectEditor.getProjectStore(
196196
actionType
197197
).lvglIdentifiers.getIdentifiersVisibleFromFlow(
198198
ProjectEditor.getFlow(actionType)
@@ -202,37 +202,40 @@ export function registerAction(actionDefinition: IActionDefinition) {
202202
"widget:".length
203203
);
204204

205-
return lvglIdentifiers
206-
.filter(lvglIdentifier => {
207-
if (lvglIdentifier.widgets.length > 1) {
208-
return false;
209-
}
205+
lvglIdentifiers = lvglIdentifiers.filter(lvglIdentifier => {
206+
if (lvglIdentifier.widgets.length > 1) {
207+
return false;
208+
}
210209

211-
const widget = lvglIdentifier.widgets[0];
210+
const widget = lvglIdentifier.widgets[0];
212211

213-
if (!widgetType) {
214-
return (
215-
widget instanceof
216-
ProjectEditor.LVGLWidgetClass
217-
);
218-
} else {
219-
const lvglWidgetClassName = `LVGL${widgetType}Widget`;
212+
if (!widgetType) {
213+
return (
214+
widget instanceof ProjectEditor.LVGLWidgetClass
215+
);
216+
} else {
217+
const lvglWidgetClassName = `LVGL${widgetType}Widget`;
220218

221-
const projectStore =
222-
ProjectEditor.getProjectStore(actionType);
219+
const projectStore =
220+
ProjectEditor.getProjectStore(actionType);
223221

224-
const lvglWidgetClass = getClassByName(
225-
projectStore,
226-
lvglWidgetClassName
227-
)!;
222+
const lvglWidgetClass = getClassByName(
223+
projectStore,
224+
lvglWidgetClassName
225+
)!;
228226

229-
return widget instanceof lvglWidgetClass;
230-
}
231-
})
232-
.map(lvglIdentifier => ({
233-
id: lvglIdentifier.identifier,
234-
label: lvglIdentifier.identifier
235-
}));
227+
return widget instanceof lvglWidgetClass;
228+
}
229+
});
230+
231+
lvglIdentifiers.sort((a, b) =>
232+
a.identifier.localeCompare(b.identifier)
233+
);
234+
235+
return lvglIdentifiers.map(lvglIdentifier => ({
236+
id: lvglIdentifier.identifier,
237+
label: lvglIdentifier.identifier
238+
}));
236239
};
237240
referencedObjectCollectionPath = "";
238241
} else if (actionProperty.type == "style") {

‎packages/project-editor/lvgl/identifiers.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ export class LVGLIdentifiers {
9898
let identifierName;
9999

100100
if (widget instanceof ProjectEditor.LVGLScreenWidgetClass) {
101-
identifierName = page.name;
101+
identifierName = getName(
102+
"",
103+
page.name,
104+
NamingConvention.UnderscoreLowerCase
105+
);
102106
} else {
103107
if (!widget.identifier) {
104108
return;

0 commit comments

Comments
 (0)