From e7519b6cce15e88c22cf9454312017c7e759ea9e Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Thu, 28 Oct 2021 06:56:02 +0200
Subject: [PATCH] Extended widgetName to fill up alignment hole

widgetData is aligned on 32bit address, so that its offset was calculated wrong.
---
 radio/src/gui/colorlcd/widgets_container.h                   | 2 +-
 radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp | 2 +-
 radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp  | 2 +-
 radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp | 2 +-
 radio/src/storage/yaml/yaml_datastructs_nv14.cpp             | 2 +-
 radio/src/storage/yaml/yaml_datastructs_x10.cpp              | 2 +-
 radio/src/storage/yaml/yaml_datastructs_x12s.cpp             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/colorlcd/widgets_container.h b/radio/src/gui/colorlcd/widgets_container.h
index 56b1f854e..411c8fbcf 100644
--- a/radio/src/gui/colorlcd/widgets_container.h
+++ b/radio/src/gui/colorlcd/widgets_container.h
@@ -27,7 +27,7 @@
 #include "form.h"
 #include "zone.h"
 
-#define WIDGET_NAME_LEN     10
+#define WIDGET_NAME_LEN     12
 #define MAX_WIDGET_OPTIONS   5 // Name?
 
 #if LCD_W > LCD_H
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
index cd04f3422..1f3f289db 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
@@ -786,7 +786,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
index 92980839e..69c229f8f 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
@@ -803,7 +803,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
index 21d8ccd95..2269671f5 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
@@ -803,7 +803,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index cd04f3422..1f3f289db 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -786,7 +786,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };
diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
index 92980839e..69c229f8f 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -803,7 +803,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };
diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
index 21d8ccd95..2269671f5 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
@@ -803,7 +803,7 @@ static const struct YamlNode struct_WidgetPersistentData[] = {
 };
 static const struct YamlNode struct_ZonePersistentData[] = {
   YAML_IDX,
-  YAML_STRING("widgetName", 10),
+  YAML_STRING("widgetName", 12),
   YAML_STRUCT("widgetData", 480, struct_WidgetPersistentData, NULL),
   YAML_END
 };