From 253783df6af1629929449387e08af6e79a7c5bb8 Mon Sep 17 00:00:00 2001 From: philmoz Date: Thu, 6 Jun 2024 20:08:37 +1000 Subject: [PATCH] feat(radio): increase length of sound/script file name to 8 for SF/GF (#5046) --- .../src/firmwares/opentx/opentxinterface.cpp | 2 +- radio/src/dataconstants.h | 4 ++-- radio/src/datastructs.h | 14 +++++++------- radio/src/datastructs_private.h | 11 ++--------- .../src/gui/128x64/model_special_functions.cpp | 2 ++ .../storage/yaml/yaml_datastructs_128x64.cpp | 4 ++-- .../src/storage/yaml/yaml_datastructs_nv14.cpp | 18 +++++++++--------- .../src/storage/yaml/yaml_datastructs_pl18.cpp | 18 +++++++++--------- .../src/storage/yaml/yaml_datastructs_t20.cpp | 4 ++-- .../src/storage/yaml/yaml_datastructs_tpro.cpp | 4 ++-- .../src/storage/yaml/yaml_datastructs_x10.cpp | 18 +++++++++--------- .../src/storage/yaml/yaml_datastructs_x12s.cpp | 18 +++++++++--------- .../storage/yaml/yaml_datastructs_xlites.cpp | 4 ++-- 13 files changed, 58 insertions(+), 63 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index f8d00c26f57..f56fcac4e1a 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -589,7 +589,7 @@ int OpenTxFirmware::getCapability(::Capability capability) case VoicesAsNumbers: return 0; case VoicesMaxLength: - return (IS_TARANIS_X9(board) ? 8 : 6); + return 8; case MultiLangVoice: return 1; case SoundPitch: diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 70f59a76f23..37c95085f46 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -106,7 +106,7 @@ enum CurveType { #define LEN_CHANNEL_NAME 6 #define LEN_INPUT_NAME 4 #define LEN_CURVE_NAME 3 - #define LEN_FUNCTION_NAME 6 + #define LEN_FUNCTION_NAME 8 #define MAX_CURVES 32 #define MAX_CURVE_POINTS 512 #elif LCD_W == 212 @@ -130,7 +130,7 @@ enum CurveType { #define LEN_CHANNEL_NAME 4 #define LEN_INPUT_NAME 3 #define LEN_CURVE_NAME 3 - #define LEN_FUNCTION_NAME 6 + #define LEN_FUNCTION_NAME 8 #define MAX_CURVES 32 #define MAX_CURVE_POINTS 512 #endif diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index fa8266ceb05..f3bb0f41ff2 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -79,7 +79,7 @@ static inline void check_struct() CHKSIZE(MixData, 20); CHKSIZE(ExpoData, 17); CHKSIZE(LimitData, 13); - CHKSIZE(CustomFunctionData, 9); + CHKSIZE(CustomFunctionData, 11); CHKSIZE(FlightModeData, 44); CHKSIZE(TimerData, 17); CHKSIZE(SwashRingData, 8); @@ -154,15 +154,15 @@ static inline void check_struct() CHKSIZE(ModelData, 6706); #elif defined(PCBHORUS) #if defined(PCBX10) - CHKSIZE(RadioData, 837); - CHKSIZE(ModelData, 15607); + CHKSIZE(RadioData, 965); + CHKSIZE(ModelData, 15735); #else - CHKSIZE(RadioData, 837); - CHKSIZE(ModelData, 15607); + CHKSIZE(RadioData, 965); + CHKSIZE(ModelData, 15735); #endif #elif defined(PCBNV14) - CHKSIZE(RadioData, 837); - CHKSIZE(ModelData, 15463); + CHKSIZE(RadioData, 965); + CHKSIZE(ModelData, 15591); #endif #undef CHKSIZE diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 3c968f8f190..c96757ca7a7 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -146,13 +146,6 @@ PACK(struct LogicalSwitchData { * SpecialFunction structure */ - -#if defined(PCBTARANIS) - #define CFN_SPARE_TYPE int32_t -#else - #define CFN_SPARE_TYPE int16_t -#endif - PACK(struct CustomFunctionData { int16_t swtch:10 CUST(r_swtchSrc,w_swtchSrc); uint16_t func:6 ENUM(Functions); // TODO: 6 bits for Functions? @@ -166,12 +159,12 @@ PACK(struct CustomFunctionData { int16_t val; uint8_t mode; uint8_t param; - NOBACKUP(CFN_SPARE_TYPE spare); + NOBACKUP(int32_t spare); }) all; NOBACKUP(PACK(struct { int32_t val1; - NOBACKUP(CFN_SPARE_TYPE val2); + NOBACKUP(int32_t val2); }) clear); }) NAME(fp) SKIP; uint8_t active : 1 SKIP; diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index 6af90b74967..86c1cc907e4 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -313,6 +313,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF if (func == FUNC_PLAY_SCRIPT) x = x - 5 * FW; else if (func == FUNC_PLAY_TRACK) + x = x - 3 * FW; + else if (func == FUNC_BACKGND_MUSIC) x = x - 2 * FW; if (ZEXIST(cfn->play.name)) lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr); diff --git a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp index 15a4a5c5417..a1274b0482d 100644 --- a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp @@ -230,7 +230,7 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { @@ -246,7 +246,7 @@ static const struct YamlNode struct_anonymous_3[] = { YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), YAML_STRUCT("all", 64, struct_anonymous_2, NULL), YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index c489e23dfc8..48998a4b375 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -248,25 +248,25 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { YAML_SIGNED( "val", 16 ), YAML_UNSIGNED( "mode", 8 ), YAML_UNSIGNED( "param", 8 ), - YAML_SIGNED( "spare", 16 ), + YAML_SIGNED( "spare", 32 ), YAML_END }; static const struct YamlNode struct_anonymous_3[] = { YAML_SIGNED( "val1", 32 ), - YAML_SIGNED( "val2", 16 ), + YAML_SIGNED( "val2", 32 ), YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), - YAML_STRUCT("all", 48, struct_anonymous_2, NULL), - YAML_STRUCT("clear", 48, struct_anonymous_3, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), + YAML_STRUCT("all", 64, struct_anonymous_2, NULL), + YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END }; static const struct YamlNode struct_CustomFunctionData[] = { @@ -274,7 +274,7 @@ static const struct YamlNode struct_CustomFunctionData[] = { YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), YAML_ENUM("func", 6, enum_Functions), YAML_CUSTOM("def",r_customFn,w_customFn), - YAML_PADDING( 48 ), + YAML_PADDING( 64 ), YAML_PADDING( 1 ), YAML_PADDING( 7 ), YAML_END @@ -349,7 +349,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ), YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ), YAML_SIGNED( "varioRepeat", 8 ), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr), YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr), YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr), @@ -834,7 +834,7 @@ static const struct YamlNode struct_ModelData[] = { YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL), YAML_ARRAY("points", 8, 512, struct_signed_8, NULL), YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active), YAML_ARRAY("flightModeData", 352, 9, struct_FlightModeData, fmd_is_active), YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ), diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp index 851060bae7c..ffb509f9779 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp @@ -248,25 +248,25 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { YAML_SIGNED( "val", 16 ), YAML_UNSIGNED( "mode", 8 ), YAML_UNSIGNED( "param", 8 ), - YAML_SIGNED( "spare", 16 ), + YAML_SIGNED( "spare", 32 ), YAML_END }; static const struct YamlNode struct_anonymous_3[] = { YAML_SIGNED( "val1", 32 ), - YAML_SIGNED( "val2", 16 ), + YAML_SIGNED( "val2", 32 ), YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), - YAML_STRUCT("all", 48, struct_anonymous_2, NULL), - YAML_STRUCT("clear", 48, struct_anonymous_3, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), + YAML_STRUCT("all", 64, struct_anonymous_2, NULL), + YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END }; static const struct YamlNode struct_CustomFunctionData[] = { @@ -274,7 +274,7 @@ static const struct YamlNode struct_CustomFunctionData[] = { YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), YAML_ENUM("func", 6, enum_Functions), YAML_CUSTOM("def",r_customFn,w_customFn), - YAML_PADDING( 48 ), + YAML_PADDING( 64 ), YAML_PADDING( 1 ), YAML_PADDING( 7 ), YAML_END @@ -349,7 +349,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ), YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ), YAML_SIGNED( "varioRepeat", 8 ), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr), YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr), YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr), @@ -834,7 +834,7 @@ static const struct YamlNode struct_ModelData[] = { YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL), YAML_ARRAY("points", 8, 512, struct_signed_8, NULL), YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active), YAML_ARRAY("flightModeData", 384, 9, struct_FlightModeData, fmd_is_active), YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t20.cpp b/radio/src/storage/yaml/yaml_datastructs_t20.cpp index a6d48807f46..07f92b0e1d6 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t20.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t20.cpp @@ -230,7 +230,7 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { @@ -246,7 +246,7 @@ static const struct YamlNode struct_anonymous_3[] = { YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), YAML_STRUCT("all", 64, struct_anonymous_2, NULL), YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index 37e6148216a..d32bd2882e7 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -230,7 +230,7 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { @@ -246,7 +246,7 @@ static const struct YamlNode struct_anonymous_3[] = { YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), YAML_STRUCT("all", 64, struct_anonymous_2, NULL), YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 78fa31b540e..1ace8912930 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -249,25 +249,25 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { YAML_SIGNED( "val", 16 ), YAML_UNSIGNED( "mode", 8 ), YAML_UNSIGNED( "param", 8 ), - YAML_SIGNED( "spare", 16 ), + YAML_SIGNED( "spare", 32 ), YAML_END }; static const struct YamlNode struct_anonymous_3[] = { YAML_SIGNED( "val1", 32 ), - YAML_SIGNED( "val2", 16 ), + YAML_SIGNED( "val2", 32 ), YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), - YAML_STRUCT("all", 48, struct_anonymous_2, NULL), - YAML_STRUCT("clear", 48, struct_anonymous_3, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), + YAML_STRUCT("all", 64, struct_anonymous_2, NULL), + YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END }; static const struct YamlNode struct_CustomFunctionData[] = { @@ -275,7 +275,7 @@ static const struct YamlNode struct_CustomFunctionData[] = { YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), YAML_ENUM("func", 6, enum_Functions), YAML_CUSTOM("def",r_customFn,w_customFn), - YAML_PADDING( 48 ), + YAML_PADDING( 64 ), YAML_PADDING( 1 ), YAML_PADDING( 7 ), YAML_END @@ -348,7 +348,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ), YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ), YAML_SIGNED( "varioRepeat", 8 ), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr), YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr), YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr), @@ -835,7 +835,7 @@ static const struct YamlNode struct_ModelData[] = { YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL), YAML_ARRAY("points", 8, 512, struct_signed_8, NULL), YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active), YAML_ARRAY("flightModeData", 352, 9, struct_FlightModeData, fmd_is_active), YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 78fa31b540e..1ace8912930 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -249,25 +249,25 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { YAML_SIGNED( "val", 16 ), YAML_UNSIGNED( "mode", 8 ), YAML_UNSIGNED( "param", 8 ), - YAML_SIGNED( "spare", 16 ), + YAML_SIGNED( "spare", 32 ), YAML_END }; static const struct YamlNode struct_anonymous_3[] = { YAML_SIGNED( "val1", 32 ), - YAML_SIGNED( "val2", 16 ), + YAML_SIGNED( "val2", 32 ), YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), - YAML_STRUCT("all", 48, struct_anonymous_2, NULL), - YAML_STRUCT("clear", 48, struct_anonymous_3, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), + YAML_STRUCT("all", 64, struct_anonymous_2, NULL), + YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END }; static const struct YamlNode struct_CustomFunctionData[] = { @@ -275,7 +275,7 @@ static const struct YamlNode struct_CustomFunctionData[] = { YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), YAML_ENUM("func", 6, enum_Functions), YAML_CUSTOM("def",r_customFn,w_customFn), - YAML_PADDING( 48 ), + YAML_PADDING( 64 ), YAML_PADDING( 1 ), YAML_PADDING( 7 ), YAML_END @@ -348,7 +348,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ), YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ), YAML_SIGNED( "varioRepeat", 8 ), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr), YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr), YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr), @@ -835,7 +835,7 @@ static const struct YamlNode struct_ModelData[] = { YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL), YAML_ARRAY("points", 8, 512, struct_signed_8, NULL), YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL), - YAML_ARRAY("customFn", 72, 64, struct_CustomFunctionData, cfn_is_active), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active), YAML_ARRAY("flightModeData", 352, 9, struct_FlightModeData, fmd_is_active), YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index fd662b74690..c4399f9cedb 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -232,7 +232,7 @@ static const struct YamlNode struct_TrainerData[] = { YAML_END }; static const struct YamlNode struct_anonymous_1[] = { - YAML_STRING("name", 6), + YAML_STRING("name", 8), YAML_END }; static const struct YamlNode struct_anonymous_2[] = { @@ -248,7 +248,7 @@ static const struct YamlNode struct_anonymous_3[] = { YAML_END }; static const struct YamlNode union_anonymous_0_elmts[] = { - YAML_STRUCT("play", 48, struct_anonymous_1, NULL), + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), YAML_STRUCT("all", 64, struct_anonymous_2, NULL), YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), YAML_END