fixes

eez-open · Aug 9, 2024 · 057cdb4 · 057cdb4
1 parent afa442f
commit 057cdb4
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/packages/home/index.html b/packages/home/index.html
@@ -111,7 +111,6 @@
             href="../eez-studio-ui/_stylesheets/Roboto-Regular.ttf"
             as="font"
             type="font/ttf"
-            crossorigin
         />
         <link
             rel="preload"

diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework
diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm
diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp
@@ -1,4 +1,4 @@
-/* Autogenerated on August 8, 2024 4:34:17 PM from eez-framework commit 7dfc0cd5eaa79e69ba8d7d9f0ba279c7d0f40700 */
+/* Autogenerated on August 9, 2024 1:39:47 PM from eez-framework commit 36b85e72231dcf70de13b888940c233e8eb718d6 */
 /*
  * eez-framework
  *
@@ -2662,9 +2662,17 @@ Value Value::toString(uint32_t id) const {
     } else if (type == VALUE_TYPE_UINT32) {
         snprintf(tempStr, sizeof(tempStr), "%" PRIu32 "", uint32Value);
     } else if (type == VALUE_TYPE_INT64) {
+#ifdef PRId64
         snprintf(tempStr, sizeof(tempStr), "%" PRId64 "", int64Value);
+#else
+        snprintf(tempStr, sizeof(tempStr), "%" PRId32 "", (int32_t)int64Value);
+#endif
     } else if (type == VALUE_TYPE_UINT64) {
+#ifdef PRIu64
         snprintf(tempStr, sizeof(tempStr), "%" PRIu64 "", uint64Value);
+#else
+        snprintf(tempStr, sizeof(tempStr), "%" PRIu32 "", (uint32_t)uint64Value);
+#endif
     } else {
         toText(tempStr, sizeof(tempStr));
     }
@@ -3889,7 +3897,6 @@ LVGLUserWidgetExecutionState *createUserWidgetFlowState(FlowState *flowState, un
     return userWidgetWidgetExecutionState;
 }
 void executeLVGLUserWidgetComponent(FlowState *flowState, unsigned componentIndex) {
-    auto component = (LVGLUserWidgetComponent *)flowState->flow->components[componentIndex];
     auto userWidgetWidgetExecutionState = (LVGLUserWidgetExecutionState *)flowState->componenentExecutionStates[componentIndex];
     if (!userWidgetWidgetExecutionState) {
         userWidgetWidgetExecutionState = createUserWidgetFlowState(flowState, componentIndex);
@@ -5315,10 +5322,18 @@ void writeValue(const Value &value) {
 		snprintf(tempStr, sizeof(tempStr) - 1, "%" PRIu32 "", value.uint32Value);
 		break;
 	case VALUE_TYPE_INT64:
+#ifdef PRId64
 		snprintf(tempStr, sizeof(tempStr) - 1, "%" PRId64 "", value.int64Value);
+#else
+		snprintf(tempStr, sizeof(tempStr) - 1, "%" PRId32 "", (int32_t)value.int64Value);
+#endif
 		break;
 	case VALUE_TYPE_UINT64:
+#ifdef PRIu64
 		snprintf(tempStr, sizeof(tempStr) - 1, "%" PRIu64 "", value.uint64Value);
+#else
+		snprintf(tempStr, sizeof(tempStr) - 1, "%" PRIu32 "", (uint32_t)value.uint64Value);
+#endif
 		break;
 	case VALUE_TYPE_DOUBLE:
         writeHex(tempStr, (uint8_t *)&value.doubleValue, sizeof(double));
@@ -5350,7 +5365,11 @@ void writeValue(const Value &value) {
 		writeHex(tempStr + 1, (uint8_t *)&value.doubleValue, sizeof(double));
 		break;
     case VALUE_TYPE_POINTER:
+#ifdef PRIu64
         snprintf(tempStr, sizeof(tempStr) - 1, "%" PRIu64 "", (uint64_t)value.getVoidPointer());
+#else
+        snprintf(tempStr, sizeof(tempStr) - 1, "%" PRIu32 "", (uint32_t)value.getVoidPointer());
+#endif
 		break;
 	default:
 		tempStr[0] = 0;
@@ -6621,11 +6640,11 @@ bool compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *
     }
     auto n = strlen(new_val);
 #if LVGL_VERSION_MAJOR >= 9
-    int numPages = roller->inf_page_cnt;
+    size_t numPages = roller->inf_page_cnt;
 #else
-    int numPages = LV_ROLLER_INF_PAGES;
+    size_t numPages = LV_ROLLER_INF_PAGES;
 #endif
-    for (int i = 0; i < numPages * (n + 1); i += n + 1) {
+    for (size_t i = 0; i < numPages * (n + 1); i += n + 1) {
         if (strncmp(new_val, cur_val + i, n) != 0) {
             return true;
         }

diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h
@@ -1,4 +1,4 @@
-/* Autogenerated on August 8, 2024 4:34:17 PM from eez-framework commit 7dfc0cd5eaa79e69ba8d7d9f0ba279c7d0f40700 */
+/* Autogenerated on August 9, 2024 1:39:47 PM from eez-framework commit 36b85e72231dcf70de13b888940c233e8eb718d6 */
 /*
  * eez-framework
  *
+8 −0		src/eez/core/value.cpp
+1 −1		src/eez/flow/components/lvgl_user_widget.cpp
+12 −0		src/eez/flow/debugger.cpp
+3 −3		src/eez/flow/lvgl_api.cpp