eez-framework update

Author: mvladic

package-lock.json

@@ -17,7 +17,7 @@
         "clean-all": "npx rimraf@^3.0.2 build dist node_modules",
         "build": "npm run clean-build && npm run build-src && npm run build-css && npm run build-dark-css && npm run build-eez-runtime && npm run build-lvgl-runtime-v8.3 && npm run build-lvgl-runtime-v9.0 && npm run build-lz4 && npm run make-electron-builder-yml",
         "build-src": "tsc && node node_modules/gulp-cli/bin/gulp.js release",
-        "build-css": "node node_modules/less/bin/lessc --clean-css packages/eez-studio-ui/_stylesheets/main.less build/eez-studio-ui/_stylesheets/main.css && npm run build-component-doc-css",
+        "build-css": "node node_modules/less/bin/lessc packages/eez-studio-ui/_stylesheets/main.less build/eez-studio-ui/_stylesheets/main.css && npm run build-component-doc-css",
         "build-dark-css": "node node_modules/less/bin/lessc packages/eez-studio-ui/_stylesheets/main-dark.less build/eez-studio-ui/_stylesheets/main-dark.css",
         "build-component-doc-css": "node node_modules/less/bin/lessc --clean-css packages/eez-studio-ui/_stylesheets/component-doc-light.less build/eez-studio-ui/_stylesheets/component-doc.css",
         "build-eez-runtime": "run-script-os",

package.json

@@ -61,4 +61,14 @@ export class Build {
     text(text: string) {
         this.result += text;
     }
+
+    blockStart(line: string) {
+        this.line(line);
+        this.indent();
+    }
+
+    blockEnd(line: string) {
+        this.unindent();
+        this.line(line);
+    }
 }

packages/project-editor/build/helper.ts

@@ -1,4 +1,4 @@
-/* Autogenerated on November 27, 2024 11:49:28 AM from eez-framework commit 4b8ceca59dc6b0b34fefb219390e79e89c719da2 */
+/* Autogenerated on December 3, 2024 1:49:44 PM from eez-framework commit 4d56ee77aa136e9b1b8bdb4c66ce286aece09938 */
 /*
  * eez-framework
  *
@@ -6844,8 +6844,8 @@ void tick() {
         return;
     }
 	uint32_t startTickCount = millis();
-    auto n = getQueueSize();
-    for (size_t i = 0; i < n || g_numContinuousTaskInQueue > 0; i++) {
+    auto queueSizeAtTickStart = getQueueSize();
+    for (size_t i = 0; i < queueSizeAtTickStart || g_numNonContinuousTaskInQueue > 0; i++) {
 		FlowState *flowState;
 		unsigned componentIndex;
         bool continuousTask;
@@ -6861,11 +6861,7 @@ void tick() {
             deallocateComponentExecutionState(flowState, componentIndex);
         } else {
             if (continuousTask) {
-                auto componentExecutionState = (ComponenentExecutionState *)flowState->componenentExecutionStates[componentIndex];
-                if (!componentExecutionState) {
-                    executeComponent(flowState, componentIndex);
-                } else if (componentExecutionState->lastExecutedTime + FLOW_TICK_MAX_DURATION_MS <= startTickCount) {
-                    componentExecutionState->lastExecutedTime = startTickCount;
+                if (i < queueSizeAtTickStart) {
                     executeComponent(flowState, componentIndex);
                 } else {
                     addToQueue(flowState, componentIndex, -1, -1, -1, true);
@@ -10690,13 +10686,13 @@ static unsigned g_queueHead;
 static unsigned g_queueTail;
 static unsigned g_queueMax;
 static bool g_queueIsFull = false;
-unsigned g_numContinuousTaskInQueue;
+unsigned g_numNonContinuousTaskInQueue;
 void queueReset() {
 	g_queueHead = 0;
 	g_queueTail = 0;
 	g_queueMax  = 0;
 	g_queueIsFull = false;
-    g_numContinuousTaskInQueue = 0;
+    g_numNonContinuousTaskInQueue = 0;
 }
 size_t getQueueSize() {
 	if (g_queueHead == g_queueTail) {
@@ -10728,7 +10724,7 @@ bool addToQueue(FlowState *flowState, unsigned componentIndex, int sourceCompone
 	size_t queueSize = getQueueSize();
 	g_queueMax = g_queueMax < queueSize ? queueSize : g_queueMax;
     if (!continuousTask) {
-        ++g_numContinuousTaskInQueue;
+        ++g_numNonContinuousTaskInQueue;
 	    onAddToQueue(flowState, sourceComponentIndex, sourceOutputIndex, componentIndex, targetInputIndex);
     }
     incRefCounterForFlowState(flowState);
@@ -10750,7 +10746,7 @@ void removeNextTaskFromQueue() {
 	g_queueHead = (g_queueHead + 1) % QUEUE_SIZE;
 	g_queueIsFull = false;
     if (!continuousTask) {
-        --g_numContinuousTaskInQueue;
+        --g_numNonContinuousTaskInQueue;
 	    onRemoveFromQueue();
     }
 }

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

@@ -1,4 +1,4 @@
-/* Autogenerated on November 27, 2024 11:49:28 AM from eez-framework commit 4b8ceca59dc6b0b34fefb219390e79e89c719da2 */
+/* Autogenerated on December 3, 2024 1:49:44 PM from eez-framework commit 4d56ee77aa136e9b1b8bdb4c66ce286aece09938 */
 /*
  * eez-framework
  *
@@ -2297,8 +2297,6 @@ static const int NULL_VALUE_INDEX = 1;
         component->type == defs_v3::COMPONENT_TYPE_WATCH_VARIABLE_ACTION \
     )
 struct ComponenentExecutionState {
-    uint32_t lastExecutedTime;
-    ComponenentExecutionState() : lastExecutedTime(millis()) {}
 	virtual ~ComponenentExecutionState() {}
 };
 struct CatchErrorComponenentExecutionState : public ComponenentExecutionState {
@@ -2716,7 +2714,7 @@ namespace flow {
 void queueReset();
 size_t getQueueSize();
 size_t getMaxQueueSize();
-extern unsigned g_numContinuousTaskInQueue;
+extern unsigned g_numNonContinuousTaskInQueue;
 bool addToQueue(FlowState *flowState, unsigned componentIndex,
     int sourceComponentIndex, int sourceOutputIndex, int targetInputIndex,
     bool continuousTask);