#536

Author: mvladic

packages/main/main.ts

@@ -56,7 +56,6 @@ app.on("ready", async function () {
         const { bringHomeWindowToFocus } =
             require("main/home-window") as typeof HomeWindowModule;
         bringHomeWindowToFocus();
-
         const { openFile } = require("main/menu");
         openFile(commandLine[commandLine.length - 1]);
     });

packages/project-editor/core/object.ts

@@ -50,6 +50,7 @@ export const enum PropertyType {
 
     GUID,
 
+    NumberArrayAsString,
     StringArray,
     ConfigurationReference,
     Any,
@@ -79,6 +80,7 @@ export const TYPE_NAMES: { [key in PropertyType]: string } = {
     [PropertyType.Python]: "Python",
     [PropertyType.CPP]: "CPP",
     [PropertyType.GUID]: "GUID",
+    [PropertyType.NumberArrayAsString]: "NumberArrayAsString",
     [PropertyType.StringArray]: "StringArray",
     [PropertyType.ConfigurationReference]: "ConfigurationReference",
     [PropertyType.Any]: "Any",

packages/project-editor/flow/runtime/cpp/lvgl-runtime/common/main.c

@@ -333,7 +333,7 @@ EM_PORT_API(void) init(uint32_t wasmModuleId, uint32_t debuggerMessageSubsciptio
 
     initialized = true;
 
-    // dump_custom_styles();
+    //dump_custom_styles();
 }
 
 EM_PORT_API(bool) mainLoop() {

packages/project-editor/flow/runtime/cpp/lvgl-runtime/v8.3/lvgl

@@ -780,7 +780,7 @@
 #define LV_USE_MONKEY 0
 
 /*1: Enable grid navigation*/
-#define LV_USE_GRIDNAV 0
+#define LV_USE_GRIDNAV 1
 
 /*1: Enable lv_obj fragment*/
 #define LV_USE_FRAGMENT 0

packages/project-editor/flow/runtime/cpp/lvgl-runtime/v9.0/lv_conf.h

@@ -969,20 +969,20 @@ function dbg(text) {
 // === Body ===
 
 var ASM_CONSTS = {
-  1036472: ($0) => { startToDebuggerMessage($0); },  
- 1036504: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },  
- 1036579: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },  
- 1036654: ($0) => { finishToDebuggerMessage($0); },  
- 1036687: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },  
- 1036740: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },  
- 1036773: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },  
- 1036809: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },  
- 1036915: ($0, $1) => { return eez_mqtt_deinit($0, $1); },  
- 1036951: ($0, $1) => { return eez_mqtt_connect($0, $1); },  
- 1036988: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },  
- 1037028: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },  
- 1037085: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },  
- 1037144: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
+  1036552: ($0) => { startToDebuggerMessage($0); },  
+ 1036584: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },  
+ 1036659: ($0, $1, $2) => { writeDebuggerBuffer($0, new Uint8Array(Module.HEAPU8.buffer, $1, $2)); },  
+ 1036734: ($0) => { finishToDebuggerMessage($0); },  
+ 1036767: ($0, $1) => { return getLvglImageByName($0, UTF8ToString($1)); },  
+ 1036820: ($0, $1, $2) => { lvglObjAddStyle($0, $1, $2); },  
+ 1036853: ($0, $1, $2) => { lvglObjRemoveStyle($0, $1, $2); },  
+ 1036889: ($0, $1, $2, $3, $4, $5) => { return eez_mqtt_init($0, UTF8ToString($1), UTF8ToString($2), $3, UTF8ToString($4), UTF8ToString($5)); },  
+ 1036995: ($0, $1) => { return eez_mqtt_deinit($0, $1); },  
+ 1037031: ($0, $1) => { return eez_mqtt_connect($0, $1); },  
+ 1037068: ($0, $1) => { return eez_mqtt_disconnect($0, $1); },  
+ 1037108: ($0, $1, $2) => { return eez_mqtt_subscribe($0, $1, UTF8ToString($2)); },  
+ 1037165: ($0, $1, $2) => { return eez_mqtt_unsubscribe($0, $1, UTF8ToString($2)); },  
+ 1037224: ($0, $1, $2, $3) => { return eez_mqtt_publish($0, $1, UTF8ToString($2), UTF8ToString($3)); }
 };
 
 

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

@@ -187,6 +187,14 @@ export const LV_FLEX_ALIGN_SPACE_EVENLY = 3;
 export const LV_FLEX_ALIGN_SPACE_AROUND = 4;
 export const LV_FLEX_ALIGN_SPACE_BETWEEN = 5;
 
+export const LV_GRID_ALIGN_START = 0;
+export const LV_GRID_ALIGN_CENTER = 1;
+export const LV_GRID_ALIGN_END = 2;
+export const LV_GRID_ALIGN_STRETCH = 3;
+export const LV_GRID_ALIGN_SPACE_EVENLY = 4;
+export const LV_GRID_ALIGN_SPACE_AROUND = 5;
+export const LV_GRID_ALIGN_SPACE_BETWEEN = 6;
+
 const LV_SCROLLBAR_MODE_OFF = 0;
 const LV_SCROLLBAR_MODE_ON = 1;
 const LV_SCROLLBAR_MODE_ACTIVE = 2;

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

@@ -220,21 +220,30 @@ export abstract class LVGLPageRuntime {
         return cashedFont.fontPtr;
     }
 
-    strings: number[] = [];
+    pointers: number[] = [];
 
     allocateUTF8(str: string, free: boolean) {
         const stringPtr = this.wasm.allocateUTF8(str);
         if (free) {
-            this.strings.push(stringPtr);
+            this.pointers.push(stringPtr);
         }
         return stringPtr;
     }
 
-    freeStrings() {
-        for (const stringPtr of this.strings) {
-            this.wasm._free(stringPtr);
+    allocateInt32Array(arr: number[], free: boolean) {
+        const ptr = this.wasm._malloc(arr.length * 4);
+        if (free) {
+            this.pointers.push(ptr);
         }
-        this.strings = [];
+        this.wasm.HEAP32.set(arr, ptr / 4);
+        return ptr;
+    }
+
+    freePointers() {
+        for (const ptr of this.pointers) {
+            this.wasm._free(ptr);
+        }
+        this.pointers = [];
     }
 
     static detachRuntimeFromPage(page: Page) {
@@ -306,6 +315,7 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
     autorRunDispose: IReactionDisposer | undefined;
     dispose2: IReactionDisposer | undefined;
     requestAnimationFrameId: number | undefined;
+    wasError: boolean = false;
 
     constructor(
         page: Page,
@@ -378,6 +388,17 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
                         return;
                     }
 
+                    this.project._store.lastRevision;
+
+                    if (this.wasError) {
+                        setTimeout(() => {
+                            this.unmount();
+                            this.wasError = false;
+                            this.mount();
+                        });
+                        return;
+                    }
+
                     if (this.dispose2) {
                         this.dispose2();
                         this.dispose2 = undefined;
@@ -393,7 +414,7 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
 
                         this.wasm._lvglClearTimeline();
 
-                        this.freeStrings();
+                        this.freePointers();
 
                         this.createStyles();
 
@@ -460,10 +481,7 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
                         });
                     } catch (e) {
                         console.error(e);
-                        setTimeout(() => {
-                            this.unmount();
-                            this.mount();
-                        });
+                        this.wasError = true;
                     }
                 });
             }
@@ -500,6 +518,10 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
                 this.displayWidth,
                 this.displayHeight
             );
+        } else {
+            if (this.wasError) {
+                this.ctx.clearRect(0, 0, this.displayWidth, this.displayHeight);
+            }
         }
 
         this.requestAnimationFrameId = window.requestAnimationFrame(this.tick);