From 0f54a4d9023f5053ce4be180c7d20c4beb9fad65 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Tue, 6 May 2025 19:44:00 +1000
Subject: [PATCH] fix(cpn): 'variable length array' warning (#6205)

---
 companion/src/firmwares/edgetx/yaml_modeldata.cpp |  7 +++----
 radio/src/gui/colorlcd/lv_conf.h                  | 10 ++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
index 617df48b3..666d3facb 100644
--- a/companion/src/firmwares/edgetx/yaml_modeldata.cpp
+++ b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
@@ -616,13 +616,12 @@ Node EncodeFMData(const FlightModeData& rhs, int phaseIdx)
     Node node;
 
     size_t n_trims = Boards::getCapability(getCurrentBoard(), Board::NumTrims);
-    YamlTrim yt[n_trims];
 
     Node trims;
     for (size_t i=0; i<n_trims; i++) {
-      yt[i] = { rhs.trimMode[i], rhs.trimRef[i], rhs.trim[i] };
-      if (!yt[i].isEmpty()) {
-        trims[std::to_string(i)] = yt[i];
+      YamlTrim yt = { rhs.trimMode[i], rhs.trimRef[i], rhs.trim[i] };
+      if (!yt.isEmpty()) {
+        trims[std::to_string(i)] = yt;
       }
     }
     if (trims && trims.IsMap()) {
diff --git a/radio/src/gui/colorlcd/lv_conf.h b/radio/src/gui/colorlcd/lv_conf.h
index 0b5d2be51..e77693771 100644
--- a/radio/src/gui/colorlcd/lv_conf.h
+++ b/radio/src/gui/colorlcd/lv_conf.h
@@ -65,8 +65,14 @@
     #if LV_MEM_ADR == 0
         //#define LV_MEM_POOL_INCLUDE your_alloc_library  /* Uncomment if using an external allocator*/
         //#define LV_MEM_POOL_ALLOC   your_alloc          /* Uncomment if using an external allocator*/
-        #define LV_MEM_POOL_INCLUDE <unistd.h>
-        #define LV_MEM_POOL_ALLOC sbrk
+        #if defined(SIMU)
+            // 'sbrk' does not exist on Windows :(
+            #define LV_MEM_POOL_INCLUDE <stdlib.h>
+            #define LV_MEM_POOL_ALLOC malloc
+        #else
+            #define LV_MEM_POOL_INCLUDE <unistd.h>
+            #define LV_MEM_POOL_ALLOC sbrk
+        #endif
     #endif
 
 #else       /*LV_MEM_CUSTOM*/