From b05fb4a43951dbbcd440a3d2fa14c9a6eabdc1a2 Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 28 Nov 2025 13:57:42 +1100 Subject: [PATCH] fix(color): shortcut override and quick menu favorites not saved to YAML files (#6833) --- radio/src/storage/yaml/yaml_datastructs_f16.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_nb4p.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_nv14.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_pa01.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_pl18.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_pl18u.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_st16.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_t15.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_t15pro.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_tx15.cpp | 4 ++-- radio/src/storage/yaml/yaml_datastructs_x10.cpp | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/radio/src/storage/yaml/yaml_datastructs_f16.cpp b/radio/src/storage/yaml/yaml_datastructs_f16.cpp index 34ab7ef7a..3d6ee52e4 100644 --- a/radio/src/storage/yaml/yaml_datastructs_f16.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_f16.cpp @@ -447,8 +447,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp index 522e53b26..8db206445 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp @@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 32920543f..20a04c459 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp index 49ec3819a..5f3392a05 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp @@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp index 4710850b8..6c3bb5fc7 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp @@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp index a55311fdd..8dfd18c66 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp @@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_st16.cpp b/radio/src/storage/yaml/yaml_datastructs_st16.cpp index 57ab249a2..a59adaa6a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_st16.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_st16.cpp @@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t15.cpp b/radio/src/storage/yaml/yaml_datastructs_t15.cpp index 3d3662040..bab90cd29 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t15.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t15.cpp @@ -455,8 +455,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp index 57ab249a2..a59adaa6a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp @@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp index 57ab249a2..a59adaa6a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp @@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 158a8911b..2a219413e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -446,8 +446,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), - YAML_PADDING( 48 ), - YAML_PADDING( 96 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL), YAML_END }; static const struct YamlNode struct_unsigned_8[] = {