Skip to content

Commit 433de13

Browse files
committed
1 parent 99c3c72 commit 433de13

File tree

17 files changed

+656
-480
lines changed

17 files changed

+656
-480
lines changed

packages/project-editor/features/page/page.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,7 @@ export class Page extends Flow {
11001100
build.line(
11011101
`void *flowState = getFlowState(0, ${flowIndex});`
11021102
);
1103+
build.line(`(void)flowState;`);
11031104
});
11041105
}
11051106
}

packages/project-editor/flow/components/actions/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4616,7 +4616,7 @@ export class LabelOutActionComponent extends ActionComponent {
46164616
buildFlowComponentSpecific(assets: Assets, dataBuffer: DataBuffer) {
46174617
// labelInComponentIndex
46184618
const labelInComponent = this.labelInComponent;
4619-
dataBuffer.writeUint16(
4619+
dataBuffer.writeInt16(
46204620
labelInComponent ? assets.getComponentIndex(labelInComponent) : -1
46214621
);
46224622
}
Binary file not shown.

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

+43-43
Large diffs are not rendered by default.
Binary file not shown.

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

+41-41
Large diffs are not rendered by default.
Binary file not shown.

packages/project-editor/lvgl/build.ts

+22
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,7 @@ export class LVGLBuild extends Build {
10541054
build.line(
10551055
`void *flowState = lv_event_get_user_data(e);`
10561056
);
1057+
build.line(`(void)flowState;`);
10571058

10581059
build.line("");
10591060

@@ -1250,12 +1251,15 @@ export class LVGLBuild extends Build {
12501251
page
12511252
)}(lv_obj_t *parent_obj, void *flowState, int startWidgetIndex) {`
12521253
);
1254+
build.line(`(void)flowState;`);
1255+
build.line(`(void)startWidgetIndex;`);
12531256
} else {
12541257
build.blockStart(
12551258
`void ${this.getScreenCreateFunctionName(
12561259
page
12571260
)}(lv_obj_t *parent_obj, int startWidgetIndex) {`
12581261
);
1262+
build.line(`(void)startWidgetIndex;`);
12591263
}
12601264
} else {
12611265
build.blockStart(
@@ -1346,12 +1350,15 @@ export class LVGLBuild extends Build {
13461350
page
13471351
)}(void *flowState, int startWidgetIndex) {`
13481352
);
1353+
build.line(`(void)flowState;`);
1354+
build.line(`(void)startWidgetIndex;`);
13491355
} else {
13501356
build.blockStart(
13511357
`void ${this.getScreenTickFunctionName(
13521358
page
13531359
)}(int startWidgetIndex) {`
13541360
);
1361+
build.line(`(void)startWidgetIndex;`);
13551362
}
13561363
} else {
13571364
build.blockStart(
@@ -2456,6 +2463,21 @@ export async function generateSourceCodeForEezFramework(
24562463
project.settings.build.expressionEvaluatorStackSize
24572464
);
24582465

2466+
eezH = eezH.replace(
2467+
"#include <lvgl/lvgl.h>",
2468+
`#include <${project.settings.build.lvglInclude}>`
2469+
);
2470+
2471+
const lvglFolder = project.settings.build.lvglInclude.substring(
2472+
0,
2473+
project.settings.build.lvglInclude.length - "lvgl.h".length
2474+
);
2475+
2476+
eezH = eezH.replace(
2477+
"#include <lvgl/src/lvgl_private.h>",
2478+
`#include <${lvglFolder}src/lvgl_private.h>`
2479+
);
2480+
24592481
await fs.promises.writeFile(
24602482
destinationFolderPath + "/eez-flow.h",
24612483
eezH,

packages/project-editor/lvgl/widgets/Screen.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export class LVGLScreenWidget extends LVGLWidget {
8080
build.line(
8181
`void *flowState = getFlowState(0, ${flowIndex});`
8282
);
83+
build.line(`(void)flowState;`);
8384
}
8485

8586
code.createScreen();

packages/project-editor/lvgl/widgets/Slider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class LVGLSliderWidget extends LVGLWidget {
155155
}
156156

157157
override toLVGLCode(code: LVGLCode) {
158-
const PREFIX = code.isV9 ? "" : "v8_";
158+
const PREFIX = code.isV9 || code.lvglBuild ? "" : "v8_";
159159

160160
code.createObject(`lv_slider_create`);
161161

0 commit comments

Comments
 (0)