Maybe this will work?

EdgeTX · Apr 10, 2023 · 45a5954 · 45a5954
1 parent 5a9b4cc
commit 45a5954
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/companion/src/firmwares/customisation_data.h b/companion/src/firmwares/customisation_data.h
@@ -40,7 +40,7 @@ constexpr int WIDGET_NAME_LEN         {10};
 constexpr int MAX_WIDGET_OPTIONS      {5};
 constexpr int MAX_TOPBAR_ZONES        {4};
 constexpr int MAX_TOPBAR_OPTIONS      {1};
-constexpr int LAYOUT_ID_LEN           {10};
+constexpr int LAYOUT_ID_LEN           {12};
 
 // Common 'ZoneOptionValue's among all layouts
 enum {

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
@@ -85,7 +85,7 @@ static inline void check_struct()
   CHKSIZE(SwashRingData, 8);
   CHKSIZE(ModelHeader, 131);
   CHKSIZE(CurveHeader, 4);
-  CHKSIZE(CustomScreenData, 850);
+  CHKSIZE(CustomScreenData, 852);
   CHKTYPE(TopBarPersistentData, 300);
 #elif defined(PCBNV14)
   // TODO
@@ -140,14 +140,14 @@ static inline void check_struct()
 #elif defined(PCBHORUS)
   #if defined(PCBX10)
     CHKSIZE(RadioData, 950);
-    CHKSIZE(ModelData, 15431);
+    CHKSIZE(ModelData, 15451);
   #else
     CHKSIZE(RadioData, 932);
-    CHKSIZE(ModelData, 15429);
+    CHKSIZE(ModelData, 15449);
   #endif
 #elif defined(PCBNV14)
   CHKSIZE(RadioData, 878);
-  CHKSIZE(ModelData, 15245);
+  CHKSIZE(ModelData, 15265);
 #endif
 
 #undef CHKSIZE

diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
@@ -577,7 +577,7 @@ typedef uint32_t swarnstate_t;
 #elif defined(COLORLCD)
 #include "gui/colorlcd/layout.h"
 #include "gui/colorlcd/topbar.h"
-#define LAYOUT_ID_LEN 10
+#define LAYOUT_ID_LEN 12
 PACK(struct CustomScreenData {
   char LayoutId[LAYOUT_ID_LEN];
   LayoutPersistentData layoutData;

diff --git a/radio/src/gui/colorlcd/layouts/layout4+2b.cpp b/radio/src/gui/colorlcd/layouts/layout4+2b.cpp
@@ -31,6 +31,6 @@ static uint8_t zmap[] = {
     LAYOUT_MAP_HALF, LAYOUT_MAP_3QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR,
 };
 
-BaseLayoutFactory<Layout> layout4P2B("Layout4PB", "4 + 2B",
+BaseLayoutFactory<Layout> layout4P2B("Layout4P2B", "4 + 2B",
                                     defaultZoneOptions,
                                     6, zmap);
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -847,7 +847,7 @@ static const struct YamlNode struct_LayoutPersistentData[] = {
 };
 static const struct YamlNode struct_CustomScreenData[] = {
   YAML_IDX,
-  YAML_STRING("LayoutId", 10),
+  YAML_STRING("LayoutId", 12),
   YAML_STRUCT("layoutData", 6720, struct_LayoutPersistentData, NULL),
   YAML_END
 };
@@ -914,7 +914,7 @@ static const struct YamlNode struct_ModelData[] = {
   YAML_UNSIGNED( "potsWarnEnabled", 16 ),
   YAML_ARRAY("potsWarnPosition", 8, 5, struct_signed_8, NULL),
   YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
-  YAML_ARRAY("screenData", 6800, 10, struct_CustomScreenData, NULL),
+  YAML_ARRAY("screenData", 6816, 10, struct_CustomScreenData, NULL),
   YAML_STRUCT("topbarData", 1248, struct_TopBarPersistentData, NULL),
   YAML_UNSIGNED( "view", 8 ),
   YAML_STRING("modelRegistrationID", 8),

diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -878,7 +878,7 @@ static const struct YamlNode struct_LayoutPersistentData[] = {
 };
 static const struct YamlNode struct_CustomScreenData[] = {
   YAML_IDX,
-  YAML_STRING("LayoutId", 10),
+  YAML_STRING("LayoutId", 12),
   YAML_STRUCT("layoutData", 6720, struct_LayoutPersistentData, NULL),
   YAML_END
 };
@@ -945,7 +945,7 @@ static const struct YamlNode struct_ModelData[] = {
   YAML_UNSIGNED( "potsWarnEnabled", 16 ),
   YAML_ARRAY("potsWarnPosition", 8, 11, struct_signed_8, NULL),
   YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
-  YAML_ARRAY("screenData", 6800, 10, struct_CustomScreenData, NULL),
+  YAML_ARRAY("screenData", 6816, 10, struct_CustomScreenData, NULL),
   YAML_STRUCT("topbarData", 2400, struct_TopBarPersistentData, NULL),
   YAML_UNSIGNED( "view", 8 ),
   YAML_STRING("modelRegistrationID", 8),

diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
@@ -876,7 +876,7 @@ static const struct YamlNode struct_LayoutPersistentData[] = {
 };
 static const struct YamlNode struct_CustomScreenData[] = {
   YAML_IDX,
-  YAML_STRING("LayoutId", 10),
+  YAML_STRING("LayoutId", 12),
   YAML_STRUCT("layoutData", 6720, struct_LayoutPersistentData, NULL),
   YAML_END
 };
@@ -943,7 +943,7 @@ static const struct YamlNode struct_ModelData[] = {
   YAML_UNSIGNED( "potsWarnEnabled", 16 ),
   YAML_ARRAY("potsWarnPosition", 8, 9, struct_signed_8, NULL),
   YAML_ARRAY("telemetrySensors", 112, 60, struct_TelemetrySensor, NULL),
-  YAML_ARRAY("screenData", 6800, 10, struct_CustomScreenData, NULL),
+  YAML_ARRAY("screenData", 6816, 10, struct_CustomScreenData, NULL),
   YAML_STRUCT("topbarData", 2400, struct_TopBarPersistentData, NULL),
   YAML_UNSIGNED( "view", 8 ),
   YAML_STRING("modelRegistrationID", 8),